Delete init step.

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

diff --git a/buildtools/CPACK/src/CMakeMakeExeLib.txt b/buildtools/CPACK/src/CMakeMakeExeLib.txt
index de2d47b..21098a4 100644 (file)
--- a/buildtools/CPACK/src/CMakeMakeExeLib.txt
+++ b/buildtools/CPACK/src/CMakeMakeExeLib.txt
@@ -58,89 +58,86 @@ target_link_libraries(smpi  simgrid ${SMPI_DEP} -fprofile-arcs)
 #tools/gras
 add_subdirectory(${PROJECT_DIRECTORY}/tools/gras)
 
-if(NOT init)
-       #tools/tesh
-       add_subdirectory(${PROJECT_DIRECTORY}/tools/tesh)
-
-       #testsuite/xbt
-       add_subdirectory(${PROJECT_DIRECTORY}/testsuite/xbt)
-
-       #testsuite/surf
-       add_subdirectory(${PROJECT_DIRECTORY}/testsuite/surf)
-
-       #testsuite/simdag
-       add_subdirectory(${PROJECT_DIRECTORY}/testsuite/simdag)
-
-       #teshsuite
-       add_subdirectory(${PROJECT_DIRECTORY}/teshsuite/xbt)
-       add_subdirectory(${PROJECT_DIRECTORY}/teshsuite/gras/datadesc)
-       add_subdirectory(${PROJECT_DIRECTORY}/teshsuite/gras/msg_handle)
-       add_subdirectory(${PROJECT_DIRECTORY}/teshsuite/gras/empty_main)
-       add_subdirectory(${PROJECT_DIRECTORY}/teshsuite/gras/small_sleep)
-       add_subdirectory(${PROJECT_DIRECTORY}/teshsuite/simdag)
-       add_subdirectory(${PROJECT_DIRECTORY}/teshsuite/simdag/network)
-       add_subdirectory(${PROJECT_DIRECTORY}/teshsuite/simdag/network/p2p)
-       add_subdirectory(${PROJECT_DIRECTORY}/teshsuite/simdag/network/mxn)
-       add_subdirectory(${PROJECT_DIRECTORY}/teshsuite/simdag/partask)
-       add_subdirectory(${PROJECT_DIRECTORY}/teshsuite/simdag/platforms)
-       add_subdirectory(${PROJECT_DIRECTORY}/teshsuite/msg)
-
-       #examples
-       add_subdirectory(${PROJECT_DIRECTORY}/examples/gras/ping)
-       add_subdirectory(${PROJECT_DIRECTORY}/examples/gras/rpc)
-       add_subdirectory(${PROJECT_DIRECTORY}/examples/gras/spawn)
-       add_subdirectory(${PROJECT_DIRECTORY}/examples/gras/timer)
-       add_subdirectory(${PROJECT_DIRECTORY}/examples/gras/chrono)
-       add_subdirectory(${PROJECT_DIRECTORY}/examples/gras/mutual_exclusion/simple_token)
-       add_subdirectory(${PROJECT_DIRECTORY}/examples/gras/mmrpc)
-       add_subdirectory(${PROJECT_DIRECTORY}/examples/gras/all2all)
-       add_subdirectory(${PROJECT_DIRECTORY}/examples/gras/pmm)
-       add_subdirectory(${PROJECT_DIRECTORY}/examples/gras/synchro)
-       add_subdirectory(${PROJECT_DIRECTORY}/examples/gras/properties)
-
-       add_subdirectory(${PROJECT_DIRECTORY}/examples/msg/properties)
-       add_subdirectory(${PROJECT_DIRECTORY}/examples/msg/actions)
-       add_subdirectory(${PROJECT_DIRECTORY}/examples/msg/migration)
-       add_subdirectory(${PROJECT_DIRECTORY}/examples/msg/sendrecv)
-       add_subdirectory(${PROJECT_DIRECTORY}/examples/msg/suspend)
-       add_subdirectory(${PROJECT_DIRECTORY}/examples/msg/parallel_task)
-       add_subdirectory(${PROJECT_DIRECTORY}/examples/msg/priority)
-       add_subdirectory(${PROJECT_DIRECTORY}/examples/msg/masterslave)
-       add_subdirectory(${PROJECT_DIRECTORY}/examples/msg/trace)
-       if(HAVE_GTNETS)
-               add_definitions("-lgtnets -L${gtnets_path}/lib -I${gtnets_path}/include/gtnets")
-               add_subdirectory(${PROJECT_DIRECTORY}/examples/msg/gtnets)
-       endif(HAVE_GTNETS)
-
-       add_subdirectory(${PROJECT_DIRECTORY}/examples/amok/bandwidth)
-       add_subdirectory(${PROJECT_DIRECTORY}/examples/amok/saturate)
-
-       add_subdirectory(${PROJECT_DIRECTORY}/examples/simdag)
-       add_subdirectory(${PROJECT_DIRECTORY}/examples/simdag/dax)
-       add_subdirectory(${PROJECT_DIRECTORY}/examples/simdag/metaxml)
-       add_subdirectory(${PROJECT_DIRECTORY}/examples/simdag/properties)
-       add_subdirectory(${PROJECT_DIRECTORY}/examples/smpi)
-
-       if(HAVE_JAVA AND NOT init)
-               message("Make : src/simgrid.jar with : ${JAVA_COMPILE}")
-               exec_program("rm -rf ${PROJECT_DIRECTORY}/src/.classes" OUTPUT_VARIABLE "SIM_JAR_OK")
-               exec_program("rm ${PROJECT_DIRECTORY}/src/simgrid.jar" OUTPUT_VARIABLE "SIM_JAR_OK")
-               exec_program("mkdir ${PROJECT_DIRECTORY}/src/.classes" OUTPUT_VARIABLE "SIM_JAR_OK")
-               exec_program("${JAVA_COMPILE}" ARGS "-d ${PROJECT_DIRECTORY}/src/.classes -cp ${PROJECT_DIRECTORY}/src/.classes ${PROJECT_DIRECTORY}/src/java/simgrid/msg/*.java" OUTPUT_VARIABLE "SIM_JAR_OK")
-               exec_program("mkdir ${PROJECT_DIRECTORY}/src/.classes/surf" OUTPUT_VARIABLE "SIM_JAR_OK")
-               exec_program("cp ${PROJECT_DIRECTORY}/src/surf/simgrid.dtd ${PROJECT_DIRECTORY}/src/.classes/surf/simgrid.dtd" OUTPUT_VARIABLE "SIM_JAR_OK")
-               exec_program("${JAVA_ARCHIVE}" ARGS "cvf ./src/simgrid.jar -C ${PROJECT_DIRECTORY}/src/.classes ." OUTPUT_VARIABLE "SIM_JAR_OK")
-
-               message("Make examples/java with : ${JAVA_COMPILE}")
-               exec_program("rm ${PROJECT_DIRECTORY}/examples/java/basic/*.class" OUTPUT_VARIABLE "SIM_JAR_OK")
-               exec_program("${JAVA_COMPILE}" ARGS "-d ${PROJECT_DIRECTORY}/examples/java/basic -cp ${PROJECT_DIRECTORY}/src/simgrid.jar ${PROJECT_DIRECTORY}/examples/java/basic/*.java"  OUTPUT_VARIABLE "SIM_JAR_OK")
-               exec_program("rm ${PROJECT_DIRECTORY}/examples/java/ping_pong/*.class" OUTPUT_VARIABLE "SIM_JAR_OK")
-               exec_program("${JAVA_COMPILE}" ARGS "-d ${PROJECT_DIRECTORY}/examples/java/ping_pong -cp ${PROJECT_DIRECTORY}/src/simgrid.jar ${PROJECT_DIRECTORY}/examples/java/ping_pong/*.java"  OUTPUT_VARIABLE "SIM_JAR_OK")
-               exec_program("rm ${PROJECT_DIRECTORY}/examples/java/comm_time/*.class" OUTPUT_VARIABLE "SIM_JAR_OK")
-               exec_program("${JAVA_COMPILE}" ARGS "-d ${PROJECT_DIRECTORY}/examples/java/comm_time -cp ${PROJECT_DIRECTORY}/src/simgrid.jar ${PROJECT_DIRECTORY}/examples/java/comm_time/*.java"  OUTPUT_VARIABLE "SIM_JAR_OK")
-               exec_program("rm ${PROJECT_DIRECTORY}/examples/java/suspend/*.class" OUTPUT_VARIABLE "SIM_JAR_OK")
-               exec_program("${JAVA_COMPILE}" ARGS "-d ${PROJECT_DIRECTORY}/examples/java/suspend -cp ${PROJECT_DIRECTORY}/src/simgrid.jar ${PROJECT_DIRECTORY}/examples/java/suspend/*.java"  OUTPUT_VARIABLE "SIM_JAR_OK")
-
-       endif(HAVE_JAVA AND NOT init)
-
-endif(NOT init)
+#tools/tesh
+add_subdirectory(${PROJECT_DIRECTORY}/tools/tesh)
+
+#testsuite/xbt
+add_subdirectory(${PROJECT_DIRECTORY}/testsuite/xbt)
+
+#testsuite/surf
+add_subdirectory(${PROJECT_DIRECTORY}/testsuite/surf)
+
+#testsuite/simdag
+add_subdirectory(${PROJECT_DIRECTORY}/testsuite/simdag)
+
+#teshsuite
+add_subdirectory(${PROJECT_DIRECTORY}/teshsuite/xbt)
+add_subdirectory(${PROJECT_DIRECTORY}/teshsuite/gras/datadesc)
+add_subdirectory(${PROJECT_DIRECTORY}/teshsuite/gras/msg_handle)
+add_subdirectory(${PROJECT_DIRECTORY}/teshsuite/gras/empty_main)
+add_subdirectory(${PROJECT_DIRECTORY}/teshsuite/gras/small_sleep)
+add_subdirectory(${PROJECT_DIRECTORY}/teshsuite/simdag)
+add_subdirectory(${PROJECT_DIRECTORY}/teshsuite/simdag/network)
+add_subdirectory(${PROJECT_DIRECTORY}/teshsuite/simdag/network/p2p)
+add_subdirectory(${PROJECT_DIRECTORY}/teshsuite/simdag/network/mxn)
+add_subdirectory(${PROJECT_DIRECTORY}/teshsuite/simdag/partask)
+add_subdirectory(${PROJECT_DIRECTORY}/teshsuite/simdag/platforms)
+add_subdirectory(${PROJECT_DIRECTORY}/teshsuite/msg)
+
+#examples
+add_subdirectory(${PROJECT_DIRECTORY}/examples/gras/ping)
+add_subdirectory(${PROJECT_DIRECTORY}/examples/gras/rpc)
+add_subdirectory(${PROJECT_DIRECTORY}/examples/gras/spawn)
+add_subdirectory(${PROJECT_DIRECTORY}/examples/gras/timer)
+add_subdirectory(${PROJECT_DIRECTORY}/examples/gras/chrono)
+add_subdirectory(${PROJECT_DIRECTORY}/examples/gras/mutual_exclusion/simple_token)
+add_subdirectory(${PROJECT_DIRECTORY}/examples/gras/mmrpc)
+add_subdirectory(${PROJECT_DIRECTORY}/examples/gras/all2all)
+add_subdirectory(${PROJECT_DIRECTORY}/examples/gras/pmm)
+add_subdirectory(${PROJECT_DIRECTORY}/examples/gras/synchro)
+add_subdirectory(${PROJECT_DIRECTORY}/examples/gras/properties)
+
+add_subdirectory(${PROJECT_DIRECTORY}/examples/msg/properties)
+add_subdirectory(${PROJECT_DIRECTORY}/examples/msg/actions)
+add_subdirectory(${PROJECT_DIRECTORY}/examples/msg/migration)
+add_subdirectory(${PROJECT_DIRECTORY}/examples/msg/sendrecv)
+add_subdirectory(${PROJECT_DIRECTORY}/examples/msg/suspend)
+add_subdirectory(${PROJECT_DIRECTORY}/examples/msg/parallel_task)
+add_subdirectory(${PROJECT_DIRECTORY}/examples/msg/priority)
+add_subdirectory(${PROJECT_DIRECTORY}/examples/msg/masterslave)
+add_subdirectory(${PROJECT_DIRECTORY}/examples/msg/trace)
+if(HAVE_GTNETS)
+       add_definitions("-lgtnets -L${gtnets_path}/lib -I${gtnets_path}/include/gtnets")
+       add_subdirectory(${PROJECT_DIRECTORY}/examples/msg/gtnets)
+endif(HAVE_GTNETS)
+
+add_subdirectory(${PROJECT_DIRECTORY}/examples/amok/bandwidth)
+add_subdirectory(${PROJECT_DIRECTORY}/examples/amok/saturate)
+
+add_subdirectory(${PROJECT_DIRECTORY}/examples/simdag)
+add_subdirectory(${PROJECT_DIRECTORY}/examples/simdag/dax)
+add_subdirectory(${PROJECT_DIRECTORY}/examples/simdag/metaxml)
+add_subdirectory(${PROJECT_DIRECTORY}/examples/simdag/properties)
+add_subdirectory(${PROJECT_DIRECTORY}/examples/smpi)
+
+if(HAVE_JAVA AND NOT init)
+       message("Make : src/simgrid.jar with : ${JAVA_COMPILE}")
+       exec_program("rm -rf ${PROJECT_DIRECTORY}/src/.classes" OUTPUT_VARIABLE "SIM_JAR_OK")
+       exec_program("rm ${PROJECT_DIRECTORY}/src/simgrid.jar" OUTPUT_VARIABLE "SIM_JAR_OK")
+       exec_program("mkdir ${PROJECT_DIRECTORY}/src/.classes" OUTPUT_VARIABLE "SIM_JAR_OK")
+       exec_program("${JAVA_COMPILE}" ARGS "-d ${PROJECT_DIRECTORY}/src/.classes -cp ${PROJECT_DIRECTORY}/src/.classes ${PROJECT_DIRECTORY}/src/java/simgrid/msg/*.java" OUTPUT_VARIABLE "SIM_JAR_OK")
+       exec_program("mkdir ${PROJECT_DIRECTORY}/src/.classes/surf" OUTPUT_VARIABLE "SIM_JAR_OK")
+       exec_program("cp ${PROJECT_DIRECTORY}/src/surf/simgrid.dtd ${PROJECT_DIRECTORY}/src/.classes/surf/simgrid.dtd" OUTPUT_VARIABLE "SIM_JAR_OK")
+       exec_program("${JAVA_ARCHIVE}" ARGS "cvf ./src/simgrid.jar -C ${PROJECT_DIRECTORY}/src/.classes ." OUTPUT_VARIABLE "SIM_JAR_OK")
+
+       message("Make examples/java with : ${JAVA_COMPILE}")
+       exec_program("rm ${PROJECT_DIRECTORY}/examples/java/basic/*.class" OUTPUT_VARIABLE "SIM_JAR_OK")
+       exec_program("${JAVA_COMPILE}" ARGS "-d ${PROJECT_DIRECTORY}/examples/java/basic -cp ${PROJECT_DIRECTORY}/src/simgrid.jar ${PROJECT_DIRECTORY}/examples/java/basic/*.java"  OUTPUT_VARIABLE "SIM_JAR_OK")
+       exec_program("rm ${PROJECT_DIRECTORY}/examples/java/ping_pong/*.class" OUTPUT_VARIABLE "SIM_JAR_OK")
+       exec_program("${JAVA_COMPILE}" ARGS "-d ${PROJECT_DIRECTORY}/examples/java/ping_pong -cp ${PROJECT_DIRECTORY}/src/simgrid.jar ${PROJECT_DIRECTORY}/examples/java/ping_pong/*.java"  OUTPUT_VARIABLE "SIM_JAR_OK")
+       exec_program("rm ${PROJECT_DIRECTORY}/examples/java/comm_time/*.class" OUTPUT_VARIABLE "SIM_JAR_OK")
+       exec_program("${JAVA_COMPILE}" ARGS "-d ${PROJECT_DIRECTORY}/examples/java/comm_time -cp ${PROJECT_DIRECTORY}/src/simgrid.jar ${PROJECT_DIRECTORY}/examples/java/comm_time/*.java"  OUTPUT_VARIABLE "SIM_JAR_OK")
+       exec_program("rm ${PROJECT_DIRECTORY}/examples/java/suspend/*.class" OUTPUT_VARIABLE "SIM_JAR_OK")
+       exec_program("${JAVA_COMPILE}" ARGS "-d ${PROJECT_DIRECTORY}/examples/java/suspend -cp ${PROJECT_DIRECTORY}/src/simgrid.jar ${PROJECT_DIRECTORY}/examples/java/suspend/*.java"  OUTPUT_VARIABLE "SIM_JAR_OK")
+
+endif(HAVE_JAVA AND NOT init)

diff --git a/buildtools/CPACK/src/CMakeOption.txt b/buildtools/CPACK/src/CMakeOption.txt
index 4d82547..4ce5671 100644 (file)
--- a/buildtools/CPACK/src/CMakeOption.txt
+++ b/buildtools/CPACK/src/CMakeOption.txt
@@ -9,7 +9,6 @@ if(NOT with_context)
        set(with_context "auto" CACHE TYPE INTERNAL FORCE)
 endif(NOT with_context)
 
-option(init "Set ON for make _*.c with gras_stub_generator" off)
 option(enable_maintainer_mode "Permit to make flex and flexml files." off)
 option(supernovae "Supernovae mode." off)
 option(disable_java "This variable set the java context." off)

diff --git a/buildtools/CPACK/src/CMakePrintArgs.txt b/buildtools/CPACK/src/CMakePrintArgs.txt
index b7e81a4..bd09dfa 100644 (file)
--- a/buildtools/CPACK/src/CMakePrintArgs.txt
+++ b/buildtools/CPACK/src/CMakePrintArgs.txt
@@ -21,7 +21,6 @@ message("     Compile Java:           ${HAVE_JAVA}")
 message("      Compile Lua:            ${HAVE_LUA}")
 message("      Compile Ruby:           ${HAVE_RUBY_H}")
 message("")
-message("            Init mode:        ${init}")
 message("      Maintainer mode:        ${enable_maintainer_mode}")
 message("      Supernovae mode:        ${supernovae}")
 message("")