Now generate simgrid.jar with libsimgrid and not at all builds.

[simgrid.git] / buildtools / Cmake / src / CMakeMakeExeLib.txt

diff --git a/buildtools/Cmake/src/CMakeMakeExeLib.txt b/buildtools/Cmake/src/CMakeMakeExeLib.txt
index 9f031af..2f076e4 100644 (file)
--- a/buildtools/Cmake/src/CMakeMakeExeLib.txt
+++ b/buildtools/Cmake/src/CMakeMakeExeLib.txt
@@ -9,15 +9,13 @@ else(enable_supernovae)
        add_library(smpi STATIC ${SMPI_SRC})
 endif(enable_supernovae)
 
-set(GRAS_DEP "pthread")
-set(SIMGRID_DEP ${libruby})
+set(GRAS_DEP "-lm -lpthread")
+set(SIMGRID_DEP "-lm")
 set(SMPI_DEP "")
 
 if(HAVE_RUBY)
-       add_library(simgrid_ruby SHARED ${PROJECT_DIRECTORY}/src/bindings/ruby/simgrid_ruby.c)
-       set(RUBY_DEP "-lm -module")
-       target_link_libraries(simgrid_ruby      simgrid ${RUBY_DEP} -fprofile-arcs)
-       exec_program("ln -sf ${PROJECT_DIRECTORY}/src/.libs/libsimgrid_ruby.so ${PROJECT_DIRECTORY}/examples/ruby/simgrid_ruby.so" "${PROJECT_DIRECTORY}"  OUTPUT_VARIABLE LIEN_OK)
+       set(SIMGRID_DEP "${SIMGRID_DEP} -l${libruby} -module")
+       exec_program("ln -sf ${PROJECT_DIRECTORY}/src/.libs/libsimgrid.so ${PROJECT_DIRECTORY}/src/bindings/ruby/libsimgrid.so" "${PROJECT_DIRECTORY}"  OUTPUT_VARIABLE LIEN_OK)
 endif(HAVE_RUBY)
 
 if(CMAKE_SYSTEM_NAME MATCHES "Darwin")
@@ -49,11 +47,6 @@ if(HAVE_POSIX_GETTIME)
        SET(GRAS_DEP "${GRAS_DEP} -lrt")
 endif(HAVE_POSIX_GETTIME)
 
-if(NOT HAVE_RUBY)
-       string(REPLACE "${libruby} -l" "" SIMGRID_DEP ${SIMGRID_DEP})
-       string(REPLACE "${libruby}" "" SIMGRID_DEP ${SIMGRID_DEP})
-endif(NOT HAVE_RUBY)
-
 target_link_libraries(simgrid  ${SIMGRID_DEP} -fprofile-arcs)
 target_link_libraries(simgrid_static   ${SIMGRID_DEP} -fprofile-arcs)
 target_link_libraries(gras     ${GRAS_DEP} -fprofile-arcs)
@@ -65,12 +58,9 @@ target_link_libraries(smpi   simgrid ${SMPI_DEP} -fprofile-arcs)
 
 ### Make EXEs
 
-if(enable_maintainer_mode)
-#src
+#src/testall
 add_subdirectory(${PROJECT_DIRECTORY}/src)
-endif(enable_maintainer_mode)
 
-#tools
 #tools/gras
 add_subdirectory(${PROJECT_DIRECTORY}/tools/gras)
 
@@ -137,19 +127,15 @@ add_subdirectory(${PROJECT_DIRECTORY}/examples/simdag/properties)
 add_subdirectory(${PROJECT_DIRECTORY}/examples/smpi)
 
 if(HAVE_JAVA)
+       foreach(file ${JMSG_JAVA_SRC})
+               set(java_src_to_compile "${java_src_to_compile} ${file}")       
+       endforeach(file ${JMSG_JAVA_SRC})
 
        add_custom_command(TARGET simgrid
-       POST_BUILD
-       COMMAND echo "[  0%] Building JAR object src/simgrid.jar"
        COMMAND /bin/sh ${PROJECT_DIRECTORY}/make_simgrid_java.sh
-       COMMAND echo "[100%] Building JAR object src/simgrid.jar"
        WORKING_DIRECTORY "${PROJECT_DIRECTORY}"
        )
 
-       foreach(file ${JMSG_JAVA_SRC})
-               set(java_src_to_compile "${java_src_to_compile} ${file}")       
-       endforeach(file ${JMSG_JAVA_SRC})
-
 file(WRITE     ${PROJECT_DIRECTORY}/make_simgrid_java.sh 
 "\#! /bin/sh\n\n")
 
@@ -167,9 +153,6 @@ file(APPEND ${PROJECT_DIRECTORY}/make_simgrid_java.sh "cp ${PROJECT_DIRECTORY}/s
 file(APPEND    ${PROJECT_DIRECTORY}/make_simgrid_java.sh  "\n")
 file(APPEND    ${PROJECT_DIRECTORY}/make_simgrid_java.sh "${JAVA_ARCHIVE} cvf ./src/simgrid.jar -C ${PROJECT_DIRECTORY}/src/.classes . &>/dev/null\n")
 
-file(APPEND    ${PROJECT_DIRECTORY}/make_simgrid_java.sh  "\n")
-file(APPEND    ${PROJECT_DIRECTORY}/make_simgrid_java.sh "echo \"[ 50%] Building JAR object src/simgrid.jar\"\n")
-
 file(APPEND    ${PROJECT_DIRECTORY}/make_simgrid_java.sh  "\n")
 file(APPEND    ${PROJECT_DIRECTORY}/make_simgrid_java.sh "rm -f ${PROJECT_DIRECTORY}/examples/java/basic/*.class\n")
 file(APPEND    ${PROJECT_DIRECTORY}/make_simgrid_java.sh "${JAVA_COMPILE} -d ${PROJECT_DIRECTORY}/examples/java/basic -cp ${PROJECT_DIRECTORY}/src/simgrid.jar ${PROJECT_DIRECTORY}/examples/java/basic/*.java\n")