Set ruby false by default.

git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@7161 48e7efb5-ca39-0410-a469-dd3cf9ba447f

diff --git a/buildtools/CPACK/src/CMakeDefinePackages.txt b/buildtools/CPACK/src/CMakeDefinePackages.txt
index c4d2b3e..78b4d6b 100644 (file)
--- a/buildtools/CPACK/src/CMakeDefinePackages.txt
+++ b/buildtools/CPACK/src/CMakeDefinePackages.txt
@@ -71,13 +71,6 @@ ${PROJECT_DIRECTORY}/CPACK/src/test_gras_config.h.in
 )
 
 include(${PROJECT_DIRECTORY}/CPACK/src/CMakeFLEXml.txt)
-set(MSG_SRC_bis
-${PROJECT_DIRECTORY}/src/bindings/ruby/rb_application_handler.c
-${PROJECT_DIRECTORY}/src/bindings/ruby/rb_msg_task.c
-${PROJECT_DIRECTORY}/src/bindings/ruby/rb_msg_process.c
-${PROJECT_DIRECTORY}/src/bindings/ruby/rb_msg_host.c
-${PROJECT_DIRECTORY}/src/bindings/ruby/rb_msg.c
-)
 
 set(EXTRA_DIST 
        ${PROJECT_DIRECTORY}/src/portable.h
@@ -369,6 +362,13 @@ set(LUA_SRC
        ${PROJECT_DIRECTORY}/src/bindings/lua/Msglua.c
 )
 
+set(RUBY_SRC
+${PROJECT_DIRECTORY}/src/simix/smx_context_ruby.c
+${PROJECT_DIRECTORY}/src/bindings/ruby/rb_msg_process.c
+${PROJECT_DIRECTORY}/src/bindings/ruby/rb_msg_host.c
+${PROJECT_DIRECTORY}/src/bindings/ruby/rb_msg_task.c
+${PROJECT_DIRECTORY}/src/bindings/ruby/rb_application_handler.c
+)
 ### depend of some variables setted upper
 # -->CONTEXT_THREADS
 if(${CONTEXT_THREADS})
@@ -456,3 +456,15 @@ else(${HAVE_JAVA})
                ${MSG_SRC}
        )
 endif(${HAVE_JAVA})
+
+if(${HAVE_RUBY_H})
+       set(simgrid_sources
+               ${simgrid_sources}
+               ${RUBY_SRC}
+       )
+else(${HAVE_RUBY_H})
+       set(EXTRA_DIST
+               ${EXTRA_DIST}
+               ${RUBY_SRC}
+       )
+endif(${HAVE_RUBY_H})

diff --git a/buildtools/CPACK/src/CMakeMakeExeLib.txt b/buildtools/CPACK/src/CMakeMakeExeLib.txt
index e59cb2a..69583ab 100644 (file)
--- a/buildtools/CPACK/src/CMakeMakeExeLib.txt
+++ b/buildtools/CPACK/src/CMakeMakeExeLib.txt
@@ -2,8 +2,8 @@
 
 if(supernovae)
        include(${PROJECT_DIRECTORY}/CPACK/src/CMakeSupernovae.txt)
-else(supernovae)
-       add_library(msg STATIC ${MSG_SRC_bis})
+else(supernovae)       
+       add_library(msg STATIC ${RUBY_SRC})
        add_library(simgrid STATIC ${simgrid_sources})
        add_library(gras SHARED ${gras_sources})
        add_library(smpi STATIC ${SMPI_SRC})
@@ -42,8 +42,8 @@ endif(HAVE_GTNETS)
 #set(CMAKE_C_FLAGS "-fprofile-arcs -ftest-coverage")
 
 #add_definitions (-fprofile-arcs -ftest-coverage)
-target_link_libraries(simgrid  msg ${SIMGRID_DEP} -fprofile-arcs)
-target_link_libraries(gras     msg ${GRAS_DEP} -fprofile-arcs)
+target_link_libraries(simgrid  ${SIMGRID_DEP} -fprofile-arcs)
+target_link_libraries(gras     ${GRAS_DEP} -fprofile-arcs)
 target_link_libraries(smpi     simgrid ${SMPI_DEP} -fprofile-arcs)
 target_link_libraries(msg      ${MSG_DEP} -fprofile-arcs)
 ### Make EXEs

diff --git a/buildtools/CPACK/src/CMakeOption.txt b/buildtools/CPACK/src/CMakeOption.txt
index 6a410a3..fa50693 100644 (file)
--- a/buildtools/CPACK/src/CMakeOption.txt
+++ b/buildtools/CPACK/src/CMakeOption.txt
@@ -9,18 +9,12 @@ if(NOT with_context)
        set(with_context "auto" CACHE TYPE INTERNAL FORCE)
 endif(NOT with_context)
 
-#SET(disable_java ON) #default value
-#SET(disable_gtnets ON)
-#SET(disable_lua ON)
-#SET(init OFF)
-#SET(MAINTAINER_MODE OFF)
-
 option(init "Set ON for make _*.c with gras_stub_generator" OFF)
 option(MAINTAINER_MODE "Permit to make flex and flexml files." OFF)
 option(supernovae "Supernovae mode." OFF)
-option(disable_java "This variable set the java context." ON)
-option(disable_gtnets "This variable set the gtnets context." ON)
-option(disable_lua "This variable set lua use." ON)
-option(disable_ruby "This variable set ruby use." OFF)
+option(disable_java "This variable set the java context." OFF)
+option(disable_lua "This variable set lua use." OFF)
 option(enable_compile_warnings "" OFF)
 option(enable_compile_optimizations "" OFF)
+option(disable_ruby "This variable set ruby use." ON)
+option(disable_gtnets "This variable set the gtnets context." ON)

diff --git a/buildtools/CPACK/src/CMakeSupernovae.txt b/buildtools/CPACK/src/CMakeSupernovae.txt
index 059b162..1d95d65 100644 (file)
--- a/buildtools/CPACK/src/CMakeSupernovae.txt
+++ b/buildtools/CPACK/src/CMakeSupernovae.txt
@@ -63,4 +63,4 @@ exec_program("${PROJECT_DIRECTORY}/src/mk_supernovae.sh ${PROJECT_DIRECTORY}/src
 add_library(simgrid    STATIC  ${PROJECT_DIRECTORY}/src/supernovae_sg.c ${simgrid_fragile_sources})
 add_library(gras       SHARED  ${PROJECT_DIRECTORY}/src/supernovae_gras.c ${gras_fragile_sources})
 add_library(smpi       STATIC  ${PROJECT_DIRECTORY}/src/supernovae_smpi.c)
-add_library(msg STATIC ${MSG_SRC_bis})
+add_library(msg        STATIC  ${RUBY_SRC})