X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/681590a8d8c991eaa83c40e356c44ef014d90f29..9a8394275cc43d5fbaf74bbfc0d87fb2862f766b:/CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2e8f9690df..e1cf067d75 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -7,9 +7,9 @@ set(CMAKE_LIBRARY_OUTPUT_DIRECTORY "${CMAKE_HOME_DIRECTORY}/lib")
 set(soversion 1)
 
 set(SIMGRID_JAVA_VERSION_MAJOR "3")
-set(SIMGRID_JAVA_VERSION_MINOR "7")
-set(SIMGRID_JAVA_VERSION_PATCH "1")
-set(DIST_NAME ${PROJECT_NAME}-${SIMGRID_JAVA_VERSION_MAJOR}.${SIMGRID_JAVA_VERSION_MINOR})
+set(SIMGRID_JAVA_VERSION_MINOR "9")
+set(SIMGRID_JAVA_VERSION_PATCH "0")
+set(DIST_NAME ${PROJECT_NAME}-${SIMGRID_JAVA_VERSION_MAJOR}.${SIMGRID_JAVA_VERSION_MINOR}.${SIMGRID_JAVA_VERSION_PATCH})
 
 ########
 ## GCC #
@@ -68,10 +68,22 @@ message(STATUS "BUILDNAME   : ${BUILDNAME}")
 include(FindSimGrid.cmake)
 include(FindJavaSG.cmake)
 
+# Check for option tracing in SimGrid
+include(CheckLibraryExists)
+CHECK_LIBRARY_EXISTS(${SIMGRID_LIB} TRACE_start "" HAVE_TRACING)
+if(NOT HAVE_TRACING)
+  message(STATUS "Warning: SimGrid-java must be linked with library Simgrid included trace option to enable tracing.")
+  message(STATUS "Warning: See http://simgrid.gforge.inria.fr/simgrid/3.8/doc/tracing.html to see how compile SimGrid library with this option.")
+endif(NOT HAVE_TRACING)
+
 ###############################
 # Declare our package content #
 ###############################
 set(JMSG_C_SRC
+  ${CMAKE_HOME_DIRECTORY}/src/smx_context_cojava.h
+  ${CMAKE_HOME_DIRECTORY}/src/smx_context_cojava.c
+  ${CMAKE_HOME_DIRECTORY}/src/jmsg_file.c
+  ${CMAKE_HOME_DIRECTORY}/src/jmsg_file.h
   ${CMAKE_HOME_DIRECTORY}/src/smx_context_java.h
   ${CMAKE_HOME_DIRECTORY}/src/smx_context_java.c
   ${CMAKE_HOME_DIRECTORY}/src/jxbt_utilities.c
@@ -90,12 +102,20 @@ set(JMSG_C_SRC
   ${CMAKE_HOME_DIRECTORY}/src/jmsg_synchro.h
   ${CMAKE_HOME_DIRECTORY}/src/jmsg_rngstream.c
   ${CMAKE_HOME_DIRECTORY}/src/jmsg_rngstream.h
+  ${CMAKE_HOME_DIRECTORY}/src/jmsg_vm.c
+  ${CMAKE_HOME_DIRECTORY}/src/jmsg_vm.h
 )
 
+set(JTRACE_C_SRC
+  ${CMAKE_HOME_DIRECTORY}/src/jtrace.c
+  ${CMAKE_HOME_DIRECTORY}/src/jtrace.h
+)	
+
 set(JMSG_JAVA_SRC
   ${CMAKE_HOME_DIRECTORY}/org/simgrid/msg/Host.java
   ${CMAKE_HOME_DIRECTORY}/org/simgrid/msg/HostFailureException.java	
-  ${CMAKE_HOME_DIRECTORY}/org/simgrid/msg/HostNotFoundException.java	
+  ${CMAKE_HOME_DIRECTORY}/org/simgrid/msg/HostNotFoundException.java
+  ${CMAKE_HOME_DIRECTORY}/org/simgrid/msg/File.java
   ${CMAKE_HOME_DIRECTORY}/org/simgrid/msg/JniException.java
   ${CMAKE_HOME_DIRECTORY}/org/simgrid/msg/Msg.java
   ${CMAKE_HOME_DIRECTORY}/org/simgrid/msg/MsgException.java
@@ -110,6 +130,10 @@ set(JMSG_JAVA_SRC
   ${CMAKE_HOME_DIRECTORY}/org/simgrid/msg/Mutex.java
   ${CMAKE_HOME_DIRECTORY}/org/simgrid/msg/Comm.java
   ${CMAKE_HOME_DIRECTORY}/org/simgrid/msg/RngStream.java
+  ${CMAKE_HOME_DIRECTORY}/org/simgrid/msg/VM.java
+)
+set(JTRACE_JAVA_SRC
+  ${CMAKE_HOME_DIRECTORY}/org/simgrid/trace/Trace.java
 )
 
 set(JAVA_EXAMPLES
@@ -132,11 +156,30 @@ set(JAVA_EXAMPLES
   ${CMAKE_HOME_DIRECTORY}/examples/chord/FindSuccessorAnswerTask.java
   ${CMAKE_HOME_DIRECTORY}/examples/chord/FindSuccessorTask.java
   ${CMAKE_HOME_DIRECTORY}/examples/chord/GetPredecessorAnswerTask.java
+  ${CMAKE_HOME_DIRECTORY}/examples/chord/GetPredecessorTask.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/masterslave/Forwarder.java
   ${CMAKE_HOME_DIRECTORY}/examples/masterslave/Master.java
@@ -170,12 +213,30 @@ set(JAVA_EXAMPLES
   ${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}/ChangeLog
+  ${CMAKE_HOME_DIRECTORY}/MANIFEST.MF
+  ${CMAKE_HOME_DIRECTORY}/COPYING
   ${CMAKE_HOME_DIRECTORY}/CMakeLists.txt
+  ${CMAKE_HOME_DIRECTORY}/doxygen_postprocesser.pl
   ${CMAKE_HOME_DIRECTORY}/FindJavaSG.cmake
   ${CMAKE_HOME_DIRECTORY}/FindSimGrid.cmake
+  ${CMAKE_HOME_DIRECTORY}/GenerateDoc.cmake
+  ${CMAKE_HOME_DIRECTORY}/README
+)
+
+set(CMAKE_DOC_SRC
+  ${CMAKE_HOME_DIRECTORY}/doc/Doxyfile.in
+  ${CMAKE_HOME_DIRECTORY}/doc/footer.html.in
+  ${CMAKE_HOME_DIRECTORY}/doc/index.doc
+  ${CMAKE_HOME_DIRECTORY}/doc/install.doc
 )
 
 set(XML_FILES
@@ -193,7 +254,7 @@ set(XML_FILES
   ${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
@@ -203,21 +264,50 @@ set(XML_FILES
   ${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
+)
+
+set(TESH_FILES
+  ${CMAKE_HOME_DIRECTORY}/examples/master_slave_bypass/bypass.tesh
+  ${CMAKE_HOME_DIRECTORY}/examples/bittorrent/bittorrent.tesh
+  ${CMAKE_HOME_DIRECTORY}/examples/commTime/commtime.tesh
+  ${CMAKE_HOME_DIRECTORY}/examples/async/async.tesh
+  ${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
+  ${CMAKE_HOME_DIRECTORY}/examples/priority/priority.tesh
+  ${CMAKE_HOME_DIRECTORY}/examples/pingPong/pingpong.tesh
+  ${CMAKE_HOME_DIRECTORY}/examples/startKillTime/startKillTime.tesh
+  ${CMAKE_HOME_DIRECTORY}/examples/tracing/tracingPingPong.tesh
 )
 
 set(source_to_pack
   ${CMAKE_SRC}
   ${JMSG_C_SRC}
+  ${JTRACE_C_SRC}
   ${JMSG_JAVA_SRC}
+  ${JTRACE_JAVA_SRC}
   ${JAVA_EXAMPLES}
+  ${JAVA_TRACING_EXAMPLES}
   ${XML_FILES}
+  ${CMAKE_DOC_SRC}
+  ${TESH_FILES}
 )
 
-string(REPLACE "org/" "${CMAKE_HOME_DIRECTORY}/org/" JAVA_FILES "${JMSG_JAVA_SRC}") 
-string(REPLACE "org/" "${CMAKE_HOME_DIRECTORY}/classes/org/" JMSG_JAVA_SRC_CLASS "${JMSG_JAVA_SRC}")
+string(REPLACE "org/" "classes/org/" JMSG_JAVA_SRC_CLASS "${JMSG_JAVA_SRC}")
 string(REPLACE ".java" ".class" JMSG_JAVA_SRC_CLASS "${JMSG_JAVA_SRC_CLASS}")
-string(REPLACE "examples/" "${CMAKE_HOME_DIRECTORY}/examples/" JAVA_EXAMPLES_CLASS "${JAVA_EXAMPLES}") 
-string(REPLACE ".java" ".class" JAVA_EXAMPLES_CLASS "${JAVA_EXAMPLES_CLASS}")
+
+string(REPLACE "org/" "classes/org/" JTRACE_JAVA_SRC_CLASS "${JTRACE_JAVA_SRC}")
+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 #
@@ -249,35 +339,101 @@ else(WIN32)
   set_target_properties(SG_java PROPERTIES LINK_FLAGS "-L${SIMGRID_LIB_PATH}")
 endif(WIN32)
 
+if(HAVE_TRACING)
+# SG_java_tracing
+add_library(SG_java_tracing SHARED ${JTRACE_C_SRC})
+  if(WIN32)
+    set_target_properties(SG_java_tracing PROPERTIES LINK_FLAGS "-Wl,--subsystem,windows,--kill-at ${SIMGRID_LIB}" PREFIX "")
+    find_path(PEXPORTS_PATH NAMES pexports.exe PATHS NO_DEFAULT_PATHS)
+    message(STATUS "pexports: ${PEXPORTS_PATH}")
+    if(PEXPORTS_PATH)
+      add_custom_command(TARGET SG_java_tracing POST_BUILD
+      COMMAND ${PEXPORTS_PATH}/pexports.exe ${CMAKE_BINARY_DIR}/SG_java_tracing.dll > ${CMAKE_BINARY_DIR}/SG_java_tracing.def)
+    endif(PEXPORTS_PATH)
+  else(WIN32)
+    target_link_libraries(SG_java_tracing pcre pthread simgrid)
+    set_target_properties(SG_java_tracing PROPERTIES LINK_FLAGS "-L${SIMGRID_LIB_PATH}")
+  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)
+
+IF(CMAKE_SYSTEM_PROCESSOR MATCHES ".86")
+  IF(${ARCH_32_BITS})
+      set(JSG_BUNDLE NATIVE/${CMAKE_SYSTEM_NAME}/x86/)
+  ELSE()
+      set(JSG_BUNDLE NATIVE/${CMAKE_SYSTEM_NAME}/amd64/)
+  ENDIF()
+ELSE() 
+  error("Unknown system type. Processor: ${CMAKE_SYSTEM_PROCESSOR}; System: ${CMAKE_SYSTEM_NAME}")
+ENDIF()
+message("Native libraries bundeled into: ${JSG_BUNDLE}")
+
 # 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/ ${JAVA_FILES}
+    -cp ${CMAKE_HOME_DIRECTORY}/classes/ ${JAVA_SRC}
+  COMMAND ${CMAKE_COMMAND} -E make_directory ${CMAKE_HOME_DIRECTORY}/classes/${JSG_BUNDLE}
+  COMMAND ${CMAKE_COMMAND} -E copy ${SIMGRID_LIB_PATH}/libsimgrid.so ${CMAKE_HOME_DIRECTORY}/classes/${JSG_BUNDLE}
+  COMMAND strip --strip-debug ${CMAKE_HOME_DIRECTORY}/classes/${JSG_BUNDLE}/libsimgrid.so
+  COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_HOME_DIRECTORY}/lib/libSG_java.so ${CMAKE_HOME_DIRECTORY}/classes/${JSG_BUNDLE}
+  COMMAND strip --strip-debug ${CMAKE_HOME_DIRECTORY}/classes/${JSG_BUNDLE}/libSG_java.so
+  COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_HOME_DIRECTORY}/ChangeLog ${CMAKE_HOME_DIRECTORY}/classes/${JSG_BUNDLE}
+  COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_HOME_DIRECTORY}/COPYING ${CMAKE_HOME_DIRECTORY}/classes/${JSG_BUNDLE}
   COMMENT "Compiling java sources of core library..."					
 )
+
 add_custom_target(java_classes ALL
-  DEPENDS ${JMSG_JAVA_SRC_CLASS}
+  DEPENDS ${JAVA_SRC_CLASS}
 )
 
 # simgrid_jar
 add_custom_target(simgrid_jar ALL
-  COMMAND ${JAVA_ARCHIVE} -cvf ${CMAKE_HOME_DIRECTORY}/simgrid.jar .
+  COMMAND ${JAVA_ARCHIVE} -cmvf ${CMAKE_HOME_DIRECTORY}/MANIFEST.MF ${CMAKE_HOME_DIRECTORY}/simgrid.jar .
   COMMENT "Building simgrid.jar..."
   WORKING_DIRECTORY ${CMAKE_HOME_DIRECTORY}/classes 
 )
 
 # simgrid_java_examples
+set(JAVA_EXAMPLES_CLASS
+  ${JAVA_EXAMPLES_CLASS}
+  ${CMAKE_HOME_DIRECTORY}/examples/bittorrent/MessageTask$Type.class
+  ${CMAKE_HOME_DIRECTORY}/examples/bittorrent/Peer$1.class
+  ${CMAKE_HOME_DIRECTORY}/examples/bittorrent/TrackerTask$Type.class
+  ${CMAKE_HOME_DIRECTORY}/examples/chord/GetPredecessorTask.class
+  ${CMAKE_HOME_DIRECTORY}/examples/priority/Test.class
+  ${CMAKE_HOME_DIRECTORY}/examples/priority/Priority.class
+)
+
 add_custom_command(
   COMMENT "Build examples for java"
-  OUTPUT	${JAVA_EXAMPLES_CLASS}
+  OUTPUT  ${JAVA_EXAMPLES_CLASS}
   DEPENDS ${JAVA_EXAMPLES}
   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/master_slave_kill/*.java
@@ -288,20 +444,31 @@ add_custom_command(
   COMMAND ${JAVA_COMPILE} -d ${CMAKE_HOME_DIRECTORY}/examples -cp ${CMAKE_HOME_DIRECTORY}/simgrid.jar ${CMAKE_HOME_DIRECTORY}/examples/startKillTime/*.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(
+      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)
-
-SET_DIRECTORY_PROPERTIES(PROPERTIES ADDITIONAL_MAKE_CLEAN_FILES
-  ${CMAKE_HOME_DIRECTORY}/simgrid.jar
-)
+if(HAVE_TRACING)
+  add_dependencies(simgrid_java_examples SG_java_tracing)
+endif(HAVE_TRACING)
 
 #####################
 # Declare our tests #
@@ -314,6 +481,8 @@ ADD_TEST(bittorrent      ${TESH_BIN_PATH} ${TESH_OPTION} --setenv srcdir=${CMAKE
 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)
@@ -323,8 +492,11 @@ ADD_TEST(priority        ${TESH_BIN_PATH} ${TESH_OPTION} --setenv srcdir=${CMAKE
 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)
+endif(HAVE_TRACING)
 ##########################################
 # Set the  DYLD_LIBRARY_PATH for mac     #
 ##########################################
@@ -356,6 +528,12 @@ endif(APPLE)
 ###########
 install(TARGETS SG_java
   DESTINATION $ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/java/)
+
+if(HAVE_TRACING)
+  install(TARGETS SG_java_tracing
+    DESTINATION $ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/java/)
+endif(HAVE_TRACING)
+ 
 install(FILES ${CMAKE_HOME_DIRECTORY}/simgrid.jar
   DESTINATION $ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/java/)
 
@@ -363,12 +541,13 @@ install(FILES ${CMAKE_HOME_DIRECTORY}/simgrid.jar
 #########
 # Dist  #
 #########
-
 add_custom_target(dist-dir
   COMMENT "Generating the distribution directory"
   COMMAND test -e ${DIST_NAME}/ && chmod -R a+w ${DIST_NAME}/ || true
   COMMAND ${CMAKE_COMMAND} -E remove_directory ${DIST_NAME}/
   COMMAND ${CMAKE_COMMAND} -E make_directory ${DIST_NAME}
+  COMMAND ${CMAKE_COMMAND} -E make_directory ${DIST_NAME}/doc/html/
+  COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_HOME_DIRECTORY}/doc/html/ ${DIST_NAME}/doc/html/
 )
 
 set(dirs_in_tarball "")
@@ -408,6 +587,16 @@ add_custom_command(
 )
 add_dependencies(dist dist-dir)
 
+##########################
+# Extra make clean files #
+##########################
+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 #
 ########