From bf30156c2370398b33f5c3e3a073265e7a3ef1de Mon Sep 17 00:00:00 2001 From: Martin Quinson Date: Mon, 29 Feb 2016 13:01:56 +0100 Subject: [PATCH 1/1] No Ruby anymore --- doc/doxygen/FAQ.doc | 23 +++++----- tools/cmake/DefinePackages.cmake | 1 - tools/cmake/Modules/FindRubySimgrid.cmake | 54 ----------------------- 3 files changed, 10 insertions(+), 68 deletions(-) delete mode 100644 tools/cmake/Modules/FindRubySimgrid.cmake diff --git a/doc/doxygen/FAQ.doc b/doc/doxygen/FAQ.doc index 11b7ba90f3..0cdd751436 100644 --- a/doc/doxygen/FAQ.doc +++ b/doc/doxygen/FAQ.doc @@ -49,19 +49,16 @@ We also have a more graphical output. Have a look at section \ref options_tracin \subsection faq_C Argh! Do I really have to code in C? -Currently bindings on top of MSG are supported for Java, Ruby and Lua. You can find a few -documentation about them on the doc page. Note that bindings are released separately from the main dist -and so have their own version numbers. - -Moreover If you use C++, -you should be able to use the SimGrid library as a standard C library -and everything should work fine (simply link against this -library; recompiling SimGrid with a C++ compiler won't work and it -wouldn't help if you could). - -For now, -we do not feel a real demand for any other language. But if you think there is one, - please speak up! +We provide Java bindings of the MSG interface, which is the main +SimGrid user API. + +Moreover If you use C++, you should be able to use the SimGrid library +as a standard C library and everything should work fine (simply +link against this library; recompiling SimGrid with a C++ +compiler won't work and it wouldn't help if you could). + +For now, we do not feel a real demand for any other language. But if +you think there is one, please speak up! \section faq_howto Feature related questions diff --git a/tools/cmake/DefinePackages.cmake b/tools/cmake/DefinePackages.cmake index a02f7d3a37..a46d075f52 100644 --- a/tools/cmake/DefinePackages.cmake +++ b/tools/cmake/DefinePackages.cmake @@ -1144,7 +1144,6 @@ set(CMAKE_SOURCE_FILES tools/cmake/Modules/FindLuaSimgrid.cmake tools/cmake/Modules/FindNS3.cmake tools/cmake/Modules/FindRngStream.cmake - tools/cmake/Modules/FindRubySimgrid.cmake tools/cmake/Modules/FindSimGrid.cmake tools/cmake/Modules/FindValgrind.cmake tools/cmake/Option.cmake diff --git a/tools/cmake/Modules/FindRubySimgrid.cmake b/tools/cmake/Modules/FindRubySimgrid.cmake deleted file mode 100644 index 9228fd8637..0000000000 --- a/tools/cmake/Modules/FindRubySimgrid.cmake +++ /dev/null @@ -1,54 +0,0 @@ -include(FindRuby) - -if(RUBY_EXECUTABLE) - message(STATUS "Found ruby: ${RUBY_EXECUTABLE}") -endif() - -message(STATUS "Looking for ruby.h") -if(RUBY_INCLUDE_DIR) - message(STATUS "Looking for ruby.h - found") -else() - message(STATUS "Looking for ruby.h - not found") -endif() - -message(STATUS "Looking for confi.h") -if(RUBY_CONFIG_INCLUDE_DIR) - message(STATUS "Looking for config.h - found") -else() - message(STATUS "Looking for config.h - not found") -endif() - -message(STATUS "Looking for lib ruby") -if(RUBY_LIBRARY) - message(STATUS "Looking for lib ruby - found") -else() - message(STATUS "Looking for lib ruby - not found") -endif() - -if(RUBY_LIBRARY) - set(LIB_RUBY_VERSION "${RUBY_VERSION_MAJOR}.${RUBY_VERSION_MINOR}.${RUBY_VERSION_PATCH}") - message(STATUS "Lib ruby version: ${LIB_RUBY_VERSION}") - if(RUBY_VERSION_MAJOR MATCHES "1" AND RUBY_VERSION_MINOR MATCHES "9") - string(REGEX MATCH "ruby.*[0-9]" RUBY_LIBRARY_NAME ${RUBY_LIBRARY}) - if(NOT RUBY_LIBRARY_NAME) - set(RUBY_LIBRARY_NAME ruby) - endif() - string(REGEX REPLACE "/libruby.*$" "" RUBY_LIBRARY ${RUBY_LIBRARY}) - SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS}-I${RUBY_CONFIG_INCLUDE_DIR} ") #path to config.h - string(COMPARE EQUAL "${RUBY_INCLUDE_DIR}" "${RUBY_CONFIG_INCLUDE_DIR}" operation) - if(NOT operation) - SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS}-I${RUBY_INCLUDE_DIR} ") #path to ruby.h - endif() - ADD_DEFINITIONS("-I${CMAKE_HOME_DIRECTORY}/src/bindings/ruby -I${CMAKE_HOME_DIRECTORY}/src/simix") - SET(HAVE_RUBY 1) - else() - message(STATUS "Warning: Ruby bindings need version 1.9.x, but found version ${RUBY_VERSION_MAJOR}.${RUBY_VERSION_MINOR}.x") - SET(HAVE_RUBY 0) - endif() -else() - SET(HAVE_RUBY 0) -endif() - -if(NOT RUBY_EXECUTABLE) - message(STATUS "Warning: you are missing the ruby executable, so you can compile and build examples but can't execute them!") -endif() \ No newline at end of file -- 2.20.1