X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/cfc0834b7e6f3ce611a7b3991050fb992661538a..1bf4f739c3ed762567482880e49bdc9c62354e5a:/CMakeLists.txt diff --git a/CMakeLists.txt b/CMakeLists.txt index 84080cb7bb..f2d0163c55 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -88,6 +88,8 @@ set(JMSG_C_SRC src/jmsg_task.h src/jmsg_synchro.c src/jmsg_synchro.h + src/jmsg_rngstream.c + src/jmsg_rngstream.h ) set(JMSG_JAVA_SRC @@ -107,9 +109,17 @@ set(JMSG_JAVA_SRC org/simgrid/msg/TransferFailureException.java org/simgrid/msg/Mutex.java org/simgrid/msg/Comm.java + org/simgrid/msg/RngStream.java ) set(JAVA_EXAMPLES + 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 @@ -173,6 +183,7 @@ set(XML_FILES examples/master_slave_bypass/platform.xml examples/master_slave_kill/platform.xml examples/async/asyncDeployment.xml + examples/bittorrent/bittorrent.xml ) set(source_to_pack @@ -196,6 +207,7 @@ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -O0 -g -Wall -Wunused -Wmissing-prototypes - set(INCLUDE_PATH "-I${CMAKE_HOME_DIRECTORY}/src -I${SIMGRID_INCLUDES} ") SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${INCLUDE_PATH}") +set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-error=int-to-pointer-cast -Wno-error=pointer-to-int-cast") if(COMPILER_C_VERSION_MAJOR_MINOR MATCHES "4.6") set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-error=unused-but-set-variable") endif(COMPILER_C_VERSION_MAJOR_MINOR MATCHES "4.6") @@ -215,7 +227,7 @@ 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") + set_target_properties(SG_java PROPERTIES LINK_FLAGS "-L${SIMGRID_LIB_PATH}") endif(WIN32) # java_classes @@ -252,6 +264,8 @@ add_custom_command( 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/startKillTime/*.java + COMMAND ${JAVA_COMPILE} -d ${CMAKE_HOME_DIRECTORY}/examples -cp ${CMAKE_HOME_DIRECTORY}/simgrid.jar ${CMAKE_HOME_DIRECTORY}/examples/bittorrent/*.java + ) add_custom_target(simgrid_java_examples ALL @@ -274,8 +288,10 @@ ${CMAKE_HOME_DIRECTORY}/simgrid.jar INCLUDE(CTest) ENABLE_TESTING() -ADD_TEST(basic ${TESH_BIN_PATH} ${TESH_OPTION} --setenv srcdir=${CMAKE_HOME_DIRECTORY} ${CMAKE_HOME_DIRECTORY}/examples/basic/basic.tesh) ADD_TEST(async ${TESH_BIN_PATH} ${TESH_OPTION} --setenv srcdir=${CMAKE_HOME_DIRECTORY} ${CMAKE_HOME_DIRECTORY}/examples/async/async.tesh) +ADD_TEST(basic ${TESH_BIN_PATH} ${TESH_OPTION} --setenv srcdir=${CMAKE_HOME_DIRECTORY} ${CMAKE_HOME_DIRECTORY}/examples/basic/basic.tesh) +ADD_TEST(bittorrent ${TESH_BIN_PATH} ${TESH_OPTION} --setenv srcdir=${CMAKE_HOME_DIRECTORY} ${CMAKE_HOME_DIRECTORY}/examples/bittorrent/bittorrent.tesh) +ADD_TEST(chord ${TESH_BIN_PATH} ${TESH_OPTION} --setenv srcdir=${CMAKE_HOME_DIRECTORY} ${CMAKE_HOME_DIRECTORY}/examples/chord/chord.tesh) ADD_TEST(pingPong ${TESH_BIN_PATH} ${TESH_OPTION} --setenv srcdir=${CMAKE_HOME_DIRECTORY} ${CMAKE_HOME_DIRECTORY}/examples/pingPong/pingpong.tesh) ADD_TEST(CommTime ${TESH_BIN_PATH} ${TESH_OPTION} --setenv srcdir=${CMAKE_HOME_DIRECTORY} ${CMAKE_HOME_DIRECTORY}/examples/commTime/commtime.tesh) ADD_TEST(mutualExclusion ${TESH_BIN_PATH} ${TESH_OPTION} --setenv srcdir=${CMAKE_HOME_DIRECTORY} ${CMAKE_HOME_DIRECTORY}/examples/mutualExclusion/mutualexclusion.tesh) @@ -283,32 +299,31 @@ ADD_TEST(bypass ${TESH_BIN_PATH} ${TESH_OPTION} --setenv srcdir=${CMAKE 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 startKillTime) +set(test_list basic bittorrent chord async pingPong CommTime mutualExclusion bypass kill startKillTime) ########################################## # Set the DYLD_LIBRARY_PATH for mac # ########################################## if(APPLE) - if($ENV{DYLD_LIBRARY_PATH} STREQUAL "") + if($ENV{DYLD_LIBRARY_PATH}) set_tests_properties(${test_list} PROPERTIES ENVIRONMENT "DYLD_LIBRARY_PATH=${CMAKE_HOME_DIRECTORY}/lib:${SIMGRID_LIB_PATH}") - else($ENV{DYLD_LIBRARY_PATH} STREQUAL "") + else($ENV{DYLD_LIBRARY_PATH}) 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 "") - -elseif(APPLE) + endif($ENV{DYLD_LIBRARY_PATH}) +else(APPLE) ########################################## # Set the LD_LIBRARY_PATH for our tests # ########################################## if(NOT WIN32) - if($ENV{LD_LIBRARY_PATH} STREQUAL "") + if($ENV{LD_LIBRARY_PATH}) set_tests_properties(${test_list} PROPERTIES ENVIRONMENT "LD_LIBRARY_PATH=${CMAKE_HOME_DIRECTORY}/lib:${SIMGRID_LIB_PATH}") - else($ENV{LD_LIBRARY_PATH} STREQUAL "") + else($ENV{LD_LIBRARY_PATH}) 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($ENV{LD_LIBRARY_PATH}) endif(NOT WIN32) endif(APPLE)