)
set(JTRACE_C_SRC
- src/jtrace.c
- src/jtrace.h
+ ${CMAKE_HOME_DIRECTORY}/src/jtrace.c
+ ${CMAKE_HOME_DIRECTORY}/src/jtrace.h
)
set(JMSG_JAVA_SRC
${CMAKE_HOME_DIRECTORY}/org/simgrid/msg/VM.java
)
set(JTRACE_JAVA_SRC
- org/simgrid/trace/Trace.java
+ ${CMAKE_HOME_DIRECTORY}/org/simgrid/trace/Trace.java
)
set(JAVA_EXAMPLES
${CMAKE_HOME_DIRECTORY}/examples/chord/FindSuccessorTask.java
${CMAKE_HOME_DIRECTORY}/examples/chord/GetPredecessorAnswerTask.java
${CMAKE_HOME_DIRECTORY}/examples/chord/NotifyTask.java
+ ${CMAKE_HOME_DIRECTORY}/examples/cloud/Cloud.java
+ ${CMAKE_HOME_DIRECTORY}/examples/cloud/FinalizeTask.java
+ ${CMAKE_HOME_DIRECTORY}/examples/cloud/Master.java
+ ${CMAKE_HOME_DIRECTORY}/examples/cloud/Slave.java
${CMAKE_HOME_DIRECTORY}/examples/commTime/FinalizeTask.java
${CMAKE_HOME_DIRECTORY}/examples/commTime/Master.java
${CMAKE_HOME_DIRECTORY}/examples/commTime/Slave.java
${CMAKE_HOME_DIRECTORY}/examples/commTime/CommTimeTest.java
+ ${CMAKE_HOME_DIRECTORY}/examples/kademlia/Answer.java
+ ${CMAKE_HOME_DIRECTORY}/examples/kademlia/Bucket.java
+ ${CMAKE_HOME_DIRECTORY}/examples/kademlia/Common.java
+ ${CMAKE_HOME_DIRECTORY}/examples/kademlia/Contact.java
+ ${CMAKE_HOME_DIRECTORY}/examples/kademlia/Kademlia.java
+ ${CMAKE_HOME_DIRECTORY}/examples/kademlia/Node.java
+ ${CMAKE_HOME_DIRECTORY}/examples/kademlia/RoutingTable.java
+ ${CMAKE_HOME_DIRECTORY}/examples/kademlia/FindNodeAnswerTask.java
+ ${CMAKE_HOME_DIRECTORY}/examples/kademlia/FindNodeTask.java
+ ${CMAKE_HOME_DIRECTORY}/examples/kademlia/KademliaTask.java
+ ${CMAKE_HOME_DIRECTORY}/examples/kademlia/PingAnswerTask.java
+ ${CMAKE_HOME_DIRECTORY}/examples/kademlia/PingTask.java
${CMAKE_HOME_DIRECTORY}/examples/io/IO.java
${CMAKE_HOME_DIRECTORY}/examples/io/Node.java
${CMAKE_HOME_DIRECTORY}/examples/masterslave/FinalizeTask.java
${CMAKE_HOME_DIRECTORY}/examples/startKillTime/Master.java
${CMAKE_HOME_DIRECTORY}/examples/startKillTime/Slave.java
${CMAKE_HOME_DIRECTORY}/examples/startKillTime/StartKillTime.java
- ${CMAKE_HOME_DIRECTORY}/examples/tracing/PingPongTask.java
${CMAKE_HOME_DIRECTORY}/examples/suspend/DreamMaster.java
${CMAKE_HOME_DIRECTORY}/examples/suspend/LazyGuy.java
${CMAKE_HOME_DIRECTORY}/examples/suspend/Suspend.java
+)
+set(JAVA_TRACING_EXAMPLES
+ ${CMAKE_HOME_DIRECTORY}/examples/tracing/PingPongTask.java
${CMAKE_HOME_DIRECTORY}/examples/tracing/Sender.java
${CMAKE_HOME_DIRECTORY}/examples/tracing/Receiver.java
${CMAKE_HOME_DIRECTORY}/examples/tracing/TracingTest.java
-
)
set(CMAKE_SRC
${CMAKE_HOME_DIRECTORY}/examples/chord/chord10000.xml
${CMAKE_HOME_DIRECTORY}/examples/chord/chord1000.xml
${CMAKE_HOME_DIRECTORY}/examples/chord/chord90.xml
- ${CMAKE_HOME_DIRECTORY}/examples/suspend/suspendDeployment.xml
+ ${CMAKE_HOME_DIRECTORY}/examples/kademlia/kademlia.xml
${CMAKE_HOME_DIRECTORY}/examples/master_slave_kill/platform.xml
${CMAKE_HOME_DIRECTORY}/examples/mutualExclusion/centralized/mutex_centralized_deployment.xml
${CMAKE_HOME_DIRECTORY}/examples/mutualExclusion/ring3.xml
${CMAKE_HOME_DIRECTORY}/examples/startKillTime/deployment_start.xml
${CMAKE_HOME_DIRECTORY}/examples/startKillTime/deployment_start_kill.xml
${CMAKE_HOME_DIRECTORY}/examples/startKillTime/deployment.xml
+ ${CMAKE_HOME_DIRECTORY}/examples/suspend/suspendDeployment.xml
${CMAKE_HOME_DIRECTORY}/examples/io/storage.xml
${CMAKE_HOME_DIRECTORY}/examples/tracing/tracingPingPongDeployment.xml
)
${CMAKE_HOME_DIRECTORY}/examples/migration/migration.tesh
${CMAKE_HOME_DIRECTORY}/examples/masterslave/masterslave.tesh
${CMAKE_HOME_DIRECTORY}/examples/chord/chord.tesh
+ ${CMAKE_HOME_DIRECTORY}/examples/cloud/cloud.tesh
${CMAKE_HOME_DIRECTORY}/examples/suspend/suspend.tesh
${CMAKE_HOME_DIRECTORY}/examples/master_slave_kill/kill.tesh
${CMAKE_HOME_DIRECTORY}/examples/mutualExclusion/mutualexclusion.tesh
${JMSG_JAVA_SRC}
${JTRACE_JAVA_SRC}
${JAVA_EXAMPLES}
+ ${JAVA_TRACING_EXAMPLES}
${XML_FILES}
${CMAKE_DOC_SRC}
${TESH_FILES}
string(REPLACE ".java" ".class" JTRACE_JAVA_SRC_CLASS "${JTRACE_JAVA_SRC_CLASS}")
string(REPLACE ".java" ".class" JAVA_EXAMPLES_CLASS "${JAVA_EXAMPLES}")
+string(REPLACE ".java" ".class" JAVA_TRACING_EXAMPLES_CLASS "${JAVA_TRACING_EXAMPLES}")
#########
# FLAGS #
endif(WIN32)
endif(HAVE_TRACING)
+set(JAVA_SRC
+ ${JMSG_JAVA_SRC}
+)
+set(JAVA_SRC_CLASS
+ ${JMSG_JAVA_SRC_CLASS}
+)
+if(HAVE_TRACING)
+ set(JAVA_SRC
+ ${JAVA_SRC}
+ ${JTRACE_JAVA_SRC}
+ )
+ set(JAVA_SRC_CLASS
+ ${JAVA_SRC_CLASS}
+ ${JTRACE_JAVA_SRC_CLASS}
+ )
+endif(HAVE_TRACING)
+
# java_classes
add_custom_command(
- OUTPUT ${JMSG_JAVA_SRC_CLASS}
- DEPENDS ${JMSG_JAVA_SRC}
+ OUTPUT ${JAVA_SRC_CLASS}
+ DEPENDS ${JAVA_SRC}
COMMAND ${CMAKE_COMMAND} -E make_directory "${CMAKE_HOME_DIRECTORY}/classes/"
COMMAND ${JAVA_COMPILE} -d ${CMAKE_HOME_DIRECTORY}/classes/
- -cp ${CMAKE_HOME_DIRECTORY}/classes/ ${JMSG_JAVA_SRC}
+ -cp ${CMAKE_HOME_DIRECTORY}/classes/ ${JAVA_SRC}
COMMENT "Compiling java sources of core library..."
)
+
add_custom_target(java_classes ALL
- DEPENDS ${JMSG_JAVA_SRC_CLASS}
+ DEPENDS ${JAVA_SRC_CLASS}
)
-if(HAVE_TRACING)
- add_custom_command(
- OUTPUT ${JTRACE_JAVA_SRC_CLASS}
- DEPENDS ${JTRACE_JAVA_SRC}
- COMMAND ${CMAKE_COMMAND} -E make_directory "${CMAKE_HOME_DIRECTORY}/classes/"
- COMMAND ${JAVA_COMPILE} -d ${CMAKE_HOME_DIRECTORY}/classes/
- -cp ${CMAKE_HOME_DIRECTORY}/classes/ ${JAVA_FILES_TRACE}
- COMMENT "Compiling java sources of core libraries..."
- )
- add_custom_command(TARGET java_classes
- DEPENDS ${JTRACE_JAVA_SRC_CLASS}
- )
-endif(HAVE_TRACING)
-
# simgrid_jar
add_custom_target(simgrid_jar ALL
COMMAND ${JAVA_ARCHIVE} -cvf ${CMAKE_HOME_DIRECTORY}/simgrid.jar .
COMMAND ${JAVA_COMPILE} -d ${CMAKE_HOME_DIRECTORY}/examples -cp ${CMAKE_HOME_DIRECTORY}/simgrid.jar ${CMAKE_HOME_DIRECTORY}/examples/async/*.java
COMMAND ${JAVA_COMPILE} -d ${CMAKE_HOME_DIRECTORY}/examples -cp ${CMAKE_HOME_DIRECTORY}/simgrid.jar ${CMAKE_HOME_DIRECTORY}/examples/bittorrent/*.java
COMMAND ${JAVA_COMPILE} -d ${CMAKE_HOME_DIRECTORY}/examples -cp ${CMAKE_HOME_DIRECTORY}/simgrid.jar ${CMAKE_HOME_DIRECTORY}/examples/chord/*.java
+ COMMAND ${JAVA_COMPILE} -d ${CMAKE_HOME_DIRECTORY}/examples -cp ${CMAKE_HOME_DIRECTORY}/simgrid.jar ${CMAKE_HOME_DIRECTORY}/examples/cloud/*.java
COMMAND ${JAVA_COMPILE} -d ${CMAKE_HOME_DIRECTORY}/examples -cp ${CMAKE_HOME_DIRECTORY}/simgrid.jar ${CMAKE_HOME_DIRECTORY}/examples/commTime/*.java
+ COMMAND ${JAVA_COMPILE} -d ${CMAKE_HOME_DIRECTORY}/examples -cp ${CMAKE_HOME_DIRECTORY}/simgrid.jar ${CMAKE_HOME_DIRECTORY}/examples/kademlia/*.java
COMMAND ${JAVA_COMPILE} -d ${CMAKE_HOME_DIRECTORY}/examples -cp ${CMAKE_HOME_DIRECTORY}/simgrid.jar ${CMAKE_HOME_DIRECTORY}/examples/io/*.java
COMMAND ${JAVA_COMPILE} -d ${CMAKE_HOME_DIRECTORY}/examples -cp ${CMAKE_HOME_DIRECTORY}/simgrid.jar ${CMAKE_HOME_DIRECTORY}/examples/masterslave/*.java
COMMAND ${JAVA_COMPILE} -d ${CMAKE_HOME_DIRECTORY}/examples -cp ${CMAKE_HOME_DIRECTORY}/simgrid.jar ${CMAKE_HOME_DIRECTORY}/examples/master_slave_bypass/*.java
COMMAND ${JAVA_COMPILE} -d ${CMAKE_HOME_DIRECTORY}/examples -cp ${CMAKE_HOME_DIRECTORY}/simgrid.jar ${CMAKE_HOME_DIRECTORY}/examples/suspend/*.java
)
if(HAVE_TRACING)
- add_custom_command(
- DEPENDS ${JAVA_EXAMPLES}
- COMMAND ${JAVA_COMPILE} -d ${CMAKE_HOME_DIRECTORY}/examples -cp ${CMAKE_HOME_DIRECTORY}/simgrid.jar ${CMAKE_HOME_DIRECTORY}/examples/tracing/*.java
-)
+ add_custom_command(
+ COMMENT "Build examples for tracing java"
+ OUTPUT ${JAVA_TRACING_EXAMPLES_CLASS}
+ DEPENDS ${JAVA_TRACING_EXAMPLES} ${JAVA_EXAMPLES_CLASS}
+ COMMAND ${JAVA_COMPILE} -d ${CMAKE_HOME_DIRECTORY}/examples -cp ${CMAKE_HOME_DIRECTORY}/simgrid.jar ${CMAKE_HOME_DIRECTORY}/examples/tracing/*.java
+ )
+ add_custom_target(simgrid_java_examples ALL
+ DEPENDS ${JAVA_EXAMPLES_CLASS} ${JAVA_TRACING_EXAMPLES_CLASS}
+ )
+else(HAVE_TRACING)
+ add_custom_target(simgrid_java_examples ALL
+ DEPENDS ${JAVA_EXAMPLES_CLASS}
+ )
endif(HAVE_TRACING)
-add_custom_target(simgrid_java_examples ALL
- DEPENDS ${JAVA_EXAMPLES_CLASS}
-)
########################
# Declare dependencies #
add_dependencies(simgrid_jar java_classes)
add_dependencies(simgrid_java_examples simgrid_jar SG_java)
if(HAVE_TRACING)
- add_dependencies(SG_java_tracing)
+ add_dependencies(simgrid_java_examples SG_java_tracing)
endif(HAVE_TRACING)
#####################
ADD_TEST(bypass ${TESH_BIN_PATH} ${TESH_OPTION} --setenv srcdir=${CMAKE_HOME_DIRECTORY} ${CMAKE_HOME_DIRECTORY}/examples/master_slave_bypass/bypass.tesh)
ADD_TEST(commTime ${TESH_BIN_PATH} ${TESH_OPTION} --setenv srcdir=${CMAKE_HOME_DIRECTORY} ${CMAKE_HOME_DIRECTORY}/examples/commTime/commtime.tesh)
ADD_TEST(chord ${TESH_BIN_PATH} ${TESH_OPTION} --setenv srcdir=${CMAKE_HOME_DIRECTORY} ${CMAKE_HOME_DIRECTORY}/examples/chord/chord.tesh)
+ADD_TEST(cloud ${TESH_BIN_PATH} ${TESH_OPTION} --setenv srcdir=${CMAKE_HOME_DIRECTORY} ${CMAKE_HOME_DIRECTORY}/examples/cloud/cloud.tesh)
+ADD_TEST(kademlia ${TESH_BIN_PATH} ${TESH_OPTION} --setenv srcdir=${CMAKE_HOME_DIRECTORY} ${CMAKE_HOME_DIRECTORY}/examples/kademlia/kademlia.tesh)
ADD_TEST(kill ${TESH_BIN_PATH} ${TESH_OPTION} --setenv srcdir=${CMAKE_HOME_DIRECTORY} ${CMAKE_HOME_DIRECTORY}/examples/master_slave_kill/kill.tesh)
ADD_TEST(masterslave ${TESH_BIN_PATH} ${TESH_OPTION} --setenv srcdir=${CMAKE_HOME_DIRECTORY} ${CMAKE_HOME_DIRECTORY}/examples/masterslave/masterslave.tesh)
ADD_TEST(migration ${TESH_BIN_PATH} ${TESH_OPTION} --setenv srcdir=${CMAKE_HOME_DIRECTORY} ${CMAKE_HOME_DIRECTORY}/examples/migration/migration.tesh)
ADD_TEST(startKillTime ${TESH_BIN_PATH} ${TESH_OPTION} --setenv srcdir=${CMAKE_HOME_DIRECTORY} ${CMAKE_HOME_DIRECTORY}/examples/startKillTime/startKillTime.tesh)
ADD_TEST(suspend ${TESH_BIN_PATH} ${TESH_OPTION} --setenv srcdir=${CMAKE_HOME_DIRECTORY} ${CMAKE_HOME_DIRECTORY}/examples/suspend/suspend.tesh)
#Don't forget to put new test in this list!!!
-set(test_list async bittorrent bypass chord commTime kill masterslave migration mutualExclusion pingPong priority startKillTime)
+set(test_list async bittorrent bypass chord cloud commTime kademlia kill masterslave migration mutualExclusion pingPong priority startKillTime suspend)
if(HAVE_TRACING)
ADD_TEST(tracing ${TESH_BIN_PATH} ${TESH_OPTION} --setenv srcdir=${CMAKE_HOME_DIRECTORY} ${CMAKE_HOME_DIRECTORY}/examples/tracing/tracingPingPong.tesh)
- set(test_list "${test_list} tracing")
+ set(test_list ${test_list} tracing)
endif(HAVE_TRACING)
##########################################
# Set the DYLD_LIBRARY_PATH for mac #
SET_DIRECTORY_PROPERTIES(PROPERTIES ADDITIONAL_MAKE_CLEAN_FILES
${CMAKE_HOME_DIRECTORY}/simgrid.jar
)
+SET_DIRECTORY_PROPERTIES(PROPERTIES ADDITIONAL_MAKE_CLEAN_FILES
+ ${CMAKE_BINARY_DIR}/simulation.trace
+)
########
# NOTE #