X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/e3b238eaf75f5bbe14b203615c1bdc4f4b5247ed..4a1d8dd84611d5d3ec7749f13fa9c33649fc7b78:/CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1f3d7a0778..22b34d639f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -88,12 +88,9 @@ set(JMSG_C_SRC
 	src/jmsg_task.h
 	src/jmsg_synchro.c
 	src/jmsg_synchro.h
-	src/jmsg_application_handler.c
-	src/jmsg_application_handler.h
 )
 
 set(JMSG_JAVA_SRC
-	org/simgrid/msg/ApplicationHandler.java
 	org/simgrid/msg/Host.java
 	org/simgrid/msg/HostFailureException.java	
 	org/simgrid/msg/HostNotFoundException.java	
@@ -102,7 +99,7 @@ set(JMSG_JAVA_SRC
 	org/simgrid/msg/MsgException.java
 	org/simgrid/msg/NativeException.java
 	org/simgrid/msg/Process.java
-	org/simgrid/msg/ProcessKilledException.java
+	org/simgrid/msg/ProcessKilledError.java
 	org/simgrid/msg/ProcessNotFoundException.java
 	org/simgrid/msg/Task.java
 	org/simgrid/msg/TaskCancelledException.java
@@ -113,6 +110,14 @@ set(JMSG_JAVA_SRC
 )
 
 set(JAVA_EXAMPLES
+  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/mutualExclusion/centralized/MutexCentral.java
 	examples/mutualExclusion/centralized/GrantTask.java
 	examples/mutualExclusion/centralized/Coordinator.java
@@ -145,6 +150,9 @@ set(JAVA_EXAMPLES
 	examples/async/Forwarder.java
 	examples/async/Master.java  
 	examples/async/Slave.java
+	examples/startKillTime/Slave.java
+	examples/startKillTime/Master.java
+	examples/startKillTime/StartKillTime.java
 )
 
 set(CMAKE_SRC
@@ -207,7 +215,11 @@ if(WIN32)
     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} -L$ENV{SIMGRID_PCRE_LIBRARY_PATH}/lib")
+    if($ENV{SIMGRID_PCRE_LIBRARY_PATH} STREQUAL "")
+        set_target_properties(SG_java PROPERTIES LINK_FLAGS "-L${SIMGRID_LIB_PATH}")
+    elseif($ENV{SIMGRID_PCRE_LIBRARY_PATH} STREQUAL "")
+        set_target_properties(SG_java PROPERTIES LINK_FLAGS "-L${SIMGRID_LIB_PATH} -L$ENV{SIMGRID_PCRE_LIBRARY_PATH}/lib")
+    endif($ENV{SIMGRID_PCRE_LIBRARY_PATH} STREQUAL "")
 endif(WIN32)
 
 # java_classes
@@ -237,11 +249,13 @@ add_custom_command(
 	DEPENDS ${JAVA_EXAMPLES}
   	COMMAND ${JAVA_COMPILE} -d ${CMAKE_HOME_DIRECTORY}/examples -cp ${CMAKE_HOME_DIRECTORY}/simgrid.jar ${CMAKE_HOME_DIRECTORY}/examples/basic/*.java  
   	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/pingPong/*.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/commTime/*.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/mutualExclusion/centralized/*.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/pingPong/*.java
+	COMMAND ${JAVA_COMPILE} -d ${CMAKE_HOME_DIRECTORY}/examples -cp ${CMAKE_HOME_DIRECTORY}/simgrid.jar ${CMAKE_HOME_DIRECTORY}/examples/startKillTime/*.java
 )
 
 add_custom_target(simgrid_java_examples ALL
@@ -271,8 +285,9 @@ ADD_TEST(CommTime        ${TESH_BIN_PATH} ${TESH_OPTION} --setenv srcdir=${CMAKE
 ADD_TEST(mutualExclusion ${TESH_BIN_PATH} ${TESH_OPTION} --setenv srcdir=${CMAKE_HOME_DIRECTORY} ${CMAKE_HOME_DIRECTORY}/examples/mutualExclusion/mutualexclusion.tesh)
 ADD_TEST(bypass          ${TESH_BIN_PATH} ${TESH_OPTION} --setenv srcdir=${CMAKE_HOME_DIRECTORY} ${CMAKE_HOME_DIRECTORY}/examples/master_slave_bypass/bypass.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(startKillTime            ${TESH_BIN_PATH} ${TESH_OPTION} --setenv srcdir=${CMAKE_HOME_DIRECTORY} ${CMAKE_HOME_DIRECTORY}/examples/startKillTime/startKillTime.tesh)
 #Don't forget to put new test in this list!!!
-set(test_list basic async pingPong CommTime mutualExclusion bypass kill)
+set(test_list basic async pingPong CommTime mutualExclusion bypass kill startKillTime)
 
 ##########################################
 # Set the  DYLD_LIBRARY_PATH for mac     #
@@ -285,20 +300,21 @@ if(APPLE)
         set_tests_properties(${test_list}
         PROPERTIES ENVIRONMENT "DYLD_LIBRARY_PATH=$ENV{DYLD_LIBRARY_PATH}:${CMAKE_HOME_DIRECTORY}/lib:${SIMGRID_LIB_PATH}")
     endif($ENV{DYLD_LIBRARY_PATH} STREQUAL "")
-endif(APPLE)
 
-##########################################
-# Set the  LD_LIBRARY_PATH for our tests #
-##########################################
-if(NOT WIN32)
-if($ENV{LD_LIBRARY_PATH} STREQUAL "")
-    set_tests_properties(${test_list}
-    PROPERTIES ENVIRONMENT "LD_LIBRARY_PATH=${CMAKE_HOME_DIRECTORY}/lib:${SIMGRID_LIB_PATH}")
-else($ENV{LD_LIBRARY_PATH} STREQUAL "")
-    set_tests_properties(${test_list}
-    PROPERTIES ENVIRONMENT "LD_LIBRARY_PATH=$ENV{LD_LIBRARY_PATH}:${CMAKE_HOME_DIRECTORY}/lib:${SIMGRID_LIB_PATH}")
-endif($ENV{LD_LIBRARY_PATH} STREQUAL "")
-endif(NOT WIN32)
+elseif(APPLE)
+    ##########################################
+    # Set the  LD_LIBRARY_PATH for our tests #
+    ##########################################
+    if(NOT WIN32)
+        if($ENV{LD_LIBRARY_PATH} STREQUAL "")
+            set_tests_properties(${test_list}
+            PROPERTIES ENVIRONMENT "LD_LIBRARY_PATH=${CMAKE_HOME_DIRECTORY}/lib:${SIMGRID_LIB_PATH}")
+        else($ENV{LD_LIBRARY_PATH} STREQUAL "")
+            set_tests_properties(${test_list}
+            PROPERTIES ENVIRONMENT "LD_LIBRARY_PATH=$ENV{LD_LIBRARY_PATH}:${CMAKE_HOME_DIRECTORY}/lib:${SIMGRID_LIB_PATH}")
+        endif($ENV{LD_LIBRARY_PATH} STREQUAL "")
+    endif(NOT WIN32)
+endif(APPLE)
 
 ###########
 # Install #