Logo AND Algorithmique Numérique Distribuée

Public GIT Repository
Merge branch 'v3_7_1'
authornavarro <navarro@caraja.(none)>
Wed, 13 Jun 2012 07:53:18 +0000 (09:53 +0200)
committernavarro <navarro@caraja.(none)>
Wed, 13 Jun 2012 07:53:18 +0000 (09:53 +0200)
Conflicts:
CMakeLists.txt

1  2 
CMakeLists.txt

diff --cc CMakeLists.txt
@@@ -72,122 -72,106 +72,123 @@@ include(FindJavaSG.cmake
  # Declare our package content #
  ###############################
  set(JMSG_C_SRC
-       src/smx_context_cojava.h
-       src/smx_context_cojava.c
-       src/smx_context_java.h
-       src/smx_context_java.c
-       src/jxbt_utilities.c
-       src/jxbt_utilities.h
-       src/jmsg.c 
-       src/jmsg.h
-       src/jmsg_comm.c
-       src/jmsg_comm.h
-       src/jmsg_file.c
-       src/jmsg_file.h
-       src/jmsg_host.c
-       src/jmsg_host.h
-       src/jmsg_process.c
-       src/jmsg_process.h
-       src/jmsg_rngstream.c
-       src/jmsg_rngstream.h
-       src/jmsg_synchro.c
-       src/jmsg_synchro.h
-       src/jmsg_task.c
-       src/jmsg_task.h
++  ${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
+   ${CMAKE_HOME_DIRECTORY}/src/jxbt_utilities.h
+   ${CMAKE_HOME_DIRECTORY}/src/jmsg.c 
+   ${CMAKE_HOME_DIRECTORY}/src/jmsg.h
+   ${CMAKE_HOME_DIRECTORY}/src/jmsg_comm.c
+   ${CMAKE_HOME_DIRECTORY}/src/jmsg_comm.h
+   ${CMAKE_HOME_DIRECTORY}/src/jmsg_host.c
+   ${CMAKE_HOME_DIRECTORY}/src/jmsg_host.h
+   ${CMAKE_HOME_DIRECTORY}/src/jmsg_process.c
+   ${CMAKE_HOME_DIRECTORY}/src/jmsg_process.h
+   ${CMAKE_HOME_DIRECTORY}/src/jmsg_task.c
+   ${CMAKE_HOME_DIRECTORY}/src/jmsg_task.h
+   ${CMAKE_HOME_DIRECTORY}/src/jmsg_synchro.c
+   ${CMAKE_HOME_DIRECTORY}/src/jmsg_synchro.h
+   ${CMAKE_HOME_DIRECTORY}/src/jmsg_rngstream.c
+   ${CMAKE_HOME_DIRECTORY}/src/jmsg_rngstream.h
  )
  
 +set(JTRACE_C_SRC
 +      src/jtrace.c
 +      src/jtrace.h
 +)     
 +
  set(JMSG_JAVA_SRC
-       org/simgrid/msg/Host.java
-       org/simgrid/msg/HostFailureException.java       
-       org/simgrid/msg/HostNotFoundException.java      
-     org/simgrid/msg/File.java
-       org/simgrid/msg/JniException.java
-       org/simgrid/msg/Msg.java
-       org/simgrid/msg/MsgException.java
-       org/simgrid/msg/NativeException.java
-       org/simgrid/msg/Process.java
-       org/simgrid/msg/ProcessKilledError.java
-       org/simgrid/msg/ProcessNotFoundException.java
-       org/simgrid/msg/Task.java
-       org/simgrid/msg/TaskCancelledException.java
-       org/simgrid/msg/TimeoutException.java
-       org/simgrid/msg/TransferFailureException.java   
-       org/simgrid/msg/Mutex.java
-       org/simgrid/msg/Comm.java
-       org/simgrid/msg/RngStream.java
+   ${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
+   ${CMAKE_HOME_DIRECTORY}/org/simgrid/msg/NativeException.java
+   ${CMAKE_HOME_DIRECTORY}/org/simgrid/msg/Process.java
+   ${CMAKE_HOME_DIRECTORY}/org/simgrid/msg/ProcessKilledError.java
+   ${CMAKE_HOME_DIRECTORY}/org/simgrid/msg/ProcessNotFoundException.java
+   ${CMAKE_HOME_DIRECTORY}/org/simgrid/msg/Task.java
+   ${CMAKE_HOME_DIRECTORY}/org/simgrid/msg/TaskCancelledException.java
+   ${CMAKE_HOME_DIRECTORY}/org/simgrid/msg/TimeoutException.java
+   ${CMAKE_HOME_DIRECTORY}/org/simgrid/msg/TransferFailureException.java       
+   ${CMAKE_HOME_DIRECTORY}/org/simgrid/msg/Mutex.java
+   ${CMAKE_HOME_DIRECTORY}/org/simgrid/msg/Comm.java
+   ${CMAKE_HOME_DIRECTORY}/org/simgrid/msg/RngStream.java
  )
 +set(JTRACE_JAVA_SRC
 +      org/simgrid/trace/Trace.java
 +)
  
  set(JAVA_EXAMPLES
-       examples/async/AsyncTest.java
-       examples/async/FinalizeTask.java  
-       examples/async/Forwarder.java
-       examples/async/Master.java  
-       examples/async/Slave.java
-   examples/bittorrent/Bittorrent.java
-   examples/bittorrent/Common.java
-   examples/bittorrent/Connection.java
-   examples/bittorrent/MessageTask.java
-   examples/bittorrent/Peer.java
-   examples/bittorrent/Tracker.java
-   examples/bittorrent/TrackerTask.java
-   examples/chord/Chord.java
-   examples/chord/Common.java
-   examples/chord/Node.java
-   examples/chord/ChordTask.java
-       examples/chord/FindSuccessorAnswerTask.java
-       examples/chord/FindSuccessorTask.java
-       examples/chord/GetPredecessorAnswerTask.java
-       examples/chord/NotifyTask.java
-       examples/commTime/FinalizeTask.java
-       examples/commTime/Master.java
-       examples/commTime/Slave.java
-       examples/commTime/CommTimeTest.java
-       examples/io/IO.java
-       examples/io/Node.java
-       examples/masterslave/FinalizeTask.java
-       examples/masterslave/Forwarder.java
-       examples/masterslave/Master.java
-       examples/masterslave/Masterslave.java
-       examples/masterslave/Slave.java 
-       examples/master_slave_bypass/Master.java
-       examples/master_slave_bypass/MsBypass.java
-       examples/master_slave_bypass/Slave.java
-       examples/master_slave_bypass/FinalizeTask.java
-       examples/master_slave_kill/Master.java
-       examples/master_slave_kill/MsKill.java
-       examples/master_slave_kill/Slave.java
-       examples/master_slave_kill/FinalizeTask.java
-       examples/migration/Emigrant.java
-       examples/migration/Migration.java
-       examples/migration/Policeman.java
-       examples/mutualExclusion/centralized/MutexCentral.java
-       examples/mutualExclusion/centralized/GrantTask.java
-       examples/mutualExclusion/centralized/Coordinator.java
-       examples/mutualExclusion/centralized/ReleaseTask.java
-       examples/mutualExclusion/centralized/Node.java
-       examples/mutualExclusion/centralized/RequestTask.java
-       examples/pingPong/PingPongTask.java
-       examples/pingPong/Sender.java
-       examples/pingPong/Receiver.java
-       examples/pingPong/PingPongTest.java
-       examples/startKillTime/Master.java
-       examples/startKillTime/Slave.java
-       examples/startKillTime/StartKillTime.java
-       examples/tracing/PingPongTask.java
-       examples/suspend/DreamMaster.java
-       examples/suspend/LazyGuy.java
-       examples/suspend/Suspend.java
-       examples/tracing/Sender.java
-       examples/tracing/Receiver.java
-       examples/tracing/TracingTest.java
+   ${CMAKE_HOME_DIRECTORY}/examples/async/AsyncTest.java
+   ${CMAKE_HOME_DIRECTORY}/examples/async/FinalizeTask.java  
+   ${CMAKE_HOME_DIRECTORY}/examples/async/Forwarder.java
+   ${CMAKE_HOME_DIRECTORY}/examples/async/Master.java  
+   ${CMAKE_HOME_DIRECTORY}/examples/async/Slave.java
+   ${CMAKE_HOME_DIRECTORY}/examples/bittorrent/Bittorrent.java
+   ${CMAKE_HOME_DIRECTORY}/examples/bittorrent/Common.java
+   ${CMAKE_HOME_DIRECTORY}/examples/bittorrent/Connection.java
+   ${CMAKE_HOME_DIRECTORY}/examples/bittorrent/MessageTask.java
+   ${CMAKE_HOME_DIRECTORY}/examples/bittorrent/Peer.java
+   ${CMAKE_HOME_DIRECTORY}/examples/bittorrent/Tracker.java
+   ${CMAKE_HOME_DIRECTORY}/examples/bittorrent/TrackerTask.java
+   ${CMAKE_HOME_DIRECTORY}/examples/chord/Chord.java
+   ${CMAKE_HOME_DIRECTORY}/examples/chord/Common.java
+   ${CMAKE_HOME_DIRECTORY}/examples/chord/Node.java
+   ${CMAKE_HOME_DIRECTORY}/examples/chord/ChordTask.java
+   ${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/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/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
+   ${CMAKE_HOME_DIRECTORY}/examples/masterslave/Masterslave.java
+   ${CMAKE_HOME_DIRECTORY}/examples/masterslave/Slave.java     
+   ${CMAKE_HOME_DIRECTORY}/examples/master_slave_bypass/Master.java
+   ${CMAKE_HOME_DIRECTORY}/examples/master_slave_bypass/MsBypass.java
+   ${CMAKE_HOME_DIRECTORY}/examples/master_slave_bypass/Slave.java
+   ${CMAKE_HOME_DIRECTORY}/examples/master_slave_bypass/FinalizeTask.java
+   ${CMAKE_HOME_DIRECTORY}/examples/master_slave_kill/Master.java
+   ${CMAKE_HOME_DIRECTORY}/examples/master_slave_kill/MsKill.java
+   ${CMAKE_HOME_DIRECTORY}/examples/master_slave_kill/Slave.java
+   ${CMAKE_HOME_DIRECTORY}/examples/master_slave_kill/FinalizeTask.java
+   ${CMAKE_HOME_DIRECTORY}/examples/migration/Emigrant.java
+   ${CMAKE_HOME_DIRECTORY}/examples/migration/Migration.java
+   ${CMAKE_HOME_DIRECTORY}/examples/migration/Policeman.java
+   ${CMAKE_HOME_DIRECTORY}/examples/mutualExclusion/centralized/MutexCentral.java
+   ${CMAKE_HOME_DIRECTORY}/examples/mutualExclusion/centralized/GrantTask.java
+   ${CMAKE_HOME_DIRECTORY}/examples/mutualExclusion/centralized/Coordinator.java
+   ${CMAKE_HOME_DIRECTORY}/examples/mutualExclusion/centralized/ReleaseTask.java
+   ${CMAKE_HOME_DIRECTORY}/examples/mutualExclusion/centralized/Node.java
+   ${CMAKE_HOME_DIRECTORY}/examples/mutualExclusion/centralized/RequestTask.java
+   ${CMAKE_HOME_DIRECTORY}/examples/pingPong/PingPongTask.java
+   ${CMAKE_HOME_DIRECTORY}/examples/pingPong/Sender.java
+   ${CMAKE_HOME_DIRECTORY}/examples/pingPong/Receiver.java
+   ${CMAKE_HOME_DIRECTORY}/examples/pingPong/PingPongTest.java
 -  ${CMAKE_HOME_DIRECTORY}/examples/priority/Priority.java
 -  ${CMAKE_HOME_DIRECTORY}/examples/priority/Test.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
++  ${CMAKE_HOME_DIRECTORY}/examples/tracing/Sender.java
++  ${CMAKE_HOME_DIRECTORY}/examples/tracing/Receiver.java
++  ${CMAKE_HOME_DIRECTORY}/examples/tracing/TracingTest.java
++
  )
  
  set(CMAKE_SRC
@@@ -213,23 -235,18 +252,24 @@@ set(TESH_FILE
  )
  
  set(source_to_pack
- ${CMAKE_SRC}
- ${JMSG_C_SRC}
- ${JTRACE_C_SRC}
- ${JMSG_JAVA_SRC}
- ${JTRACE_JAVA_SRC}
- ${JAVA_EXAMPLES}
- ${XML_FILES}
+   ${CMAKE_SRC}
+   ${JMSG_C_SRC}
++  ${JTRACE_C_SRC}
+   ${JMSG_JAVA_SRC}
++  ${JTRACE_JAVA_SRC}
+   ${JAVA_EXAMPLES}
+   ${XML_FILES}
+   ${CMAKE_DOC_SRC}
+   ${TESH_FILES}
  )
  
- string(REPLACE "org/" "${CMAKE_HOME_DIRECTORY}/org/" JAVA_FILES_MSG "${JMSG_JAVA_SRC}") 
- string(REPLACE "org/" "${CMAKE_HOME_DIRECTORY}/org/" JAVA_FILES_TRACE "${JTRACE_JAVA_SRC}") 
- string(REPLACE "org/" "${CMAKE_HOME_DIRECTORY}/classes/org/" JMSG_JAVA_SRC_CLASS "${JMSG_JAVA_SRC}")
- string(REPLACE "org/" "${CMAKE_HOME_DIRECTORY}/classes/org/" JTRACE_JAVA_SRC_CLASS "${JTRACE_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}")
  
  #########
  # FLAGS #
@@@ -249,55 -266,29 +289,55 @@@ endif(COMPILER_C_VERSION_MAJOR_MINOR MA
  # SG_java
  add_library(SG_java SHARED ${JMSG_C_SRC})
  if(WIN32)
-     set_target_properties(SG_java 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)
+   set_target_properties(SG_java 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 POST_BUILD
      COMMAND ${PEXPORTS_PATH}/pexports.exe ${CMAKE_BINARY_DIR}/SG_java.dll > ${CMAKE_BINARY_DIR}/SG_java.def)
-     endif(PEXPORTS_PATH)
+   endif(PEXPORTS_PATH)
  else(WIN32)
-     target_link_libraries(SG_java pcre pthread simgrid)
-     set_target_properties(SG_java PROPERTIES LINK_FLAGS "-L${SIMGRID_LIB_PATH}")
+   target_link_libraries(SG_java pcre pthread simgrid)
+   set_target_properties(SG_java PROPERTIES LINK_FLAGS "-L${SIMGRID_LIB_PATH}")
  endif(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)
 +# SG_java_tracing
 +add_library(SG_java_tracing SHARED ${JTRACE_C_SRC})
 +if(WIN32)
-     endif(PEXPORTS_PATH)
++  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)
-     target_link_libraries(SG_java_tracing pcre pthread simgrid)
-     set_target_properties(SG_java_tracing PROPERTIES LINK_FLAGS "-L${SIMGRID_LIB_PATH}")
++  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)
 +
 +
  # java_classes
  add_custom_command(
-       OUTPUT  ${JMSG_JAVA_SRC_CLASS}
-       DEPENDS ${JMSG_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_MSG}
-       COMMENT "Compiling java sources of core libraries..."                                   
+   OUTPUT  ${JMSG_JAVA_SRC_CLASS}
+   DEPENDS ${JMSG_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/ ${JMSG_JAVA_SRC}
+   COMMENT "Compiling java sources of core library..."                                 
  )
-       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(
++  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_target(java_classes ALL
-                 DEPENDS ${JMSG_JAVA_SRC_CLASS} ${JTRACE_JAVA_SRC_CLASS}
 -  DEPENDS ${JMSG_JAVA_SRC_CLASS}
++  DEPENDS ${JMSG_JAVA_SRC_CLASS} ${JTRACE_JAVA_SRC_CLASS}
  )
  
  # simgrid_jar
@@@ -320,15 -320,12 +370,13 @@@ add_custom_command
    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
-       COMMAND ${JAVA_COMPILE} -d ${CMAKE_HOME_DIRECTORY}/examples -cp ${CMAKE_HOME_DIRECTORY}/simgrid.jar ${CMAKE_HOME_DIRECTORY}/examples/migration/*.java
+   COMMAND ${JAVA_COMPILE} -d ${CMAKE_HOME_DIRECTORY}/examples -cp ${CMAKE_HOME_DIRECTORY}/simgrid.jar ${CMAKE_HOME_DIRECTORY}/examples/migration/*.java
    COMMAND ${JAVA_COMPILE} -d ${CMAKE_HOME_DIRECTORY}/examples -cp ${CMAKE_HOME_DIRECTORY}/simgrid.jar ${CMAKE_HOME_DIRECTORY}/examples/mutualExclusion/centralized/*.java                                     
-       COMMAND ${JAVA_COMPILE} -d ${CMAKE_HOME_DIRECTORY}/examples -cp ${CMAKE_HOME_DIRECTORY}/simgrid.jar ${CMAKE_HOME_DIRECTORY}/examples/pingPong/*.java
-       COMMAND ${JAVA_COMPILE} -d ${CMAKE_HOME_DIRECTORY}/examples -cp ${CMAKE_HOME_DIRECTORY}/simgrid.jar ${CMAKE_HOME_DIRECTORY}/examples/priority/*.java    
-       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/tracing/*.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/suspend/*.java
++  COMMAND ${JAVA_COMPILE} -d ${CMAKE_HOME_DIRECTORY}/examples -cp ${CMAKE_HOME_DIRECTORY}/simgrid.jar ${CMAKE_HOME_DIRECTORY}/examples/tracing/*.java
+   COMMAND ${JAVA_COMPILE} -d ${CMAKE_HOME_DIRECTORY}/examples -cp ${CMAKE_HOME_DIRECTORY}/simgrid.jar ${CMAKE_HOME_DIRECTORY}/examples/pingPong/*.java
+   COMMAND ${JAVA_COMPILE} -d ${CMAKE_HOME_DIRECTORY}/examples -cp ${CMAKE_HOME_DIRECTORY}/simgrid.jar ${CMAKE_HOME_DIRECTORY}/examples/priority/*.java        
+   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
  )
  
  add_custom_target(simgrid_java_examples ALL
  # Declare dependencies #
  ########################
  add_dependencies(simgrid_jar java_classes)
 -add_dependencies(simgrid_java_examples simgrid_jar SG_java)
 +add_dependencies(simgrid_java_examples simgrid_jar SG_java SG_java_tracing)
  
- SET_DIRECTORY_PROPERTIES(PROPERTIES ADDITIONAL_MAKE_CLEAN_FILES
- ${CMAKE_HOME_DIRECTORY}/simgrid.jar
- )
  #####################
  # Declare our tests #
  #####################
@@@ -364,10 -357,8 +408,9 @@@ ADD_TEST(pingPong        ${TESH_BIN_PAT
  ADD_TEST(priority        ${TESH_BIN_PATH} ${TESH_OPTION} --setenv srcdir=${CMAKE_HOME_DIRECTORY} ${CMAKE_HOME_DIRECTORY}/examples/priority/priority.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)
 +ADD_TEST(tracing         ${TESH_BIN_PATH} ${TESH_OPTION} --setenv srcdir=${CMAKE_HOME_DIRECTORY} ${CMAKE_HOME_DIRECTORY}/examples/tracing/tracingPingPong.tesh)
  #Don't forget to put new test in this list!!!
- #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 commTime kill masterslave migration mutualExclusion pingPong priority startKillTime tracing)
  
  ##########################################
  # Set the  DYLD_LIBRARY_PATH for mac     #
@@@ -398,16 -389,16 +441,19 @@@ endif(APPLE
  ###########
  # Install #
  ###########
- install(TARGETS SG_java SG_java_tracing
-       DESTINATION $ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/java/)
+ install(TARGETS SG_java
+   DESTINATION $ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/java/)
++  
++install(TARGETS SG_java_tracing
++  DESTINATION $ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/java/)
++  
  install(FILES ${CMAKE_HOME_DIRECTORY}/simgrid.jar
-       DESTINATION $ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/java/)
+   DESTINATION $ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/java/)
  
  
  #########
  # Dist  #
  #########
--
  add_custom_target(dist-dir
    COMMENT "Generating the distribution directory"
    COMMAND test -e ${DIST_NAME}/ && chmod -R a+w ${DIST_NAME}/ || true