A
lgorithmique
N
umérique
D
istribuée
Public GIT Repository
projects
/
simgrid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of scm.gforge.inria.fr:/gitroot/simgrid/simgrid-java
[simgrid.git]
/
CMakeLists.txt
diff --git
a/CMakeLists.txt
b/CMakeLists.txt
index
eaadc89
..
1ac692b
100644
(file)
--- a/
CMakeLists.txt
+++ b/
CMakeLists.txt
@@
-7,7
+7,7
@@
set(CMAKE_LIBRARY_OUTPUT_DIRECTORY "${CMAKE_HOME_DIRECTORY}/lib")
set(soversion 1)
set(SIMGRID_JAVA_VERSION_MAJOR "1")
set(soversion 1)
set(SIMGRID_JAVA_VERSION_MAJOR "1")
-set(SIMGRID_JAVA_VERSION_MINOR "
1
")
+set(SIMGRID_JAVA_VERSION_MINOR "
2
")
set(SIMGRID_JAVA_VERSION_PATCH "0")
set(DIST_NAME ${PROJECT_NAME}-${SIMGRID_JAVA_VERSION_MAJOR}.${SIMGRID_JAVA_VERSION_MINOR})
set(SIMGRID_JAVA_VERSION_PATCH "0")
set(DIST_NAME ${PROJECT_NAME}-${SIMGRID_JAVA_VERSION_MAJOR}.${SIMGRID_JAVA_VERSION_MINOR})
@@
-135,6
+135,11
@@
set(JAVA_EXAMPLES
examples/master_slave_kill/MsKill.java
examples/master_slave_kill/Slave.java
examples/master_slave_kill/FinalizeTask.java
examples/master_slave_kill/MsKill.java
examples/master_slave_kill/Slave.java
examples/master_slave_kill/FinalizeTask.java
+ examples/async/AsyncTest.java
+ examples/async/FinalizeTask.java
+ examples/async/Forwarder.java
+ examples/async/Master.java
+ examples/async/Slave.java
)
set(CMAKE_SRC
)
set(CMAKE_SRC
@@
-154,6
+159,7
@@
set(XML_FILES
examples/basic/deploy.xml
examples/master_slave_bypass/platform.xml
examples/master_slave_kill/platform.xml
examples/basic/deploy.xml
examples/master_slave_bypass/platform.xml
examples/master_slave_kill/platform.xml
+ examples/async/asyncDeployment.xml
)
set(source_to_pack
)
set(source_to_pack
@@
-174,7
+180,7
@@
string(REPLACE ".java" ".class" JAVA_EXAMPLES_CLASS "${JAVA_EXAMPLES_CLASS}")
# FLAGS #
#########
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -O0 -g -Wall -Wunused -Wmissing-prototypes -Wmissing-declarations -Wpointer-arith -Wchar-subscripts -Wcomment -Wformat -Wwrite-strings -Wno-unused-function -Wno-unused-parameter -Wno-strict-aliasing -Wno-format-nonliteral -Werror ")
# FLAGS #
#########
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -O0 -g -Wall -Wunused -Wmissing-prototypes -Wmissing-declarations -Wpointer-arith -Wchar-subscripts -Wcomment -Wformat -Wwrite-strings -Wno-unused-function -Wno-unused-parameter -Wno-strict-aliasing -Wno-format-nonliteral -Werror ")
-set(INCLUDE_PATH "-I${CMAKE_HOME_DIRECTORY}/src -I$
ENV{SIMGRID_ROOT}/include
")
+set(INCLUDE_PATH "-I${CMAKE_HOME_DIRECTORY}/src -I$
{SIMGRID_INCLUDES}
")
SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${INCLUDE_PATH}")
if(COMPILER_C_VERSION_MAJOR_MINOR MATCHES "4.6")
SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${INCLUDE_PATH}")
if(COMPILER_C_VERSION_MAJOR_MINOR MATCHES "4.6")
@@
-196,7
+202,7
@@
if(WIN32)
endif(PEXPORTS_PATH)
else(WIN32)
target_link_libraries(SG_java pcre pthread simgrid)
endif(PEXPORTS_PATH)
else(WIN32)
target_link_libraries(SG_java pcre pthread simgrid)
- set_target_properties(SG_java PROPERTIES LINK_FLAGS "-L$
ENV{SIMGRID_ROOT}/lib
-L$ENV{SIMGRID_PCRE_LIBRARY_PATH}/lib")
+ set_target_properties(SG_java PROPERTIES LINK_FLAGS "-L$
{SIMGRID_LIB_PATH}
-L$ENV{SIMGRID_PCRE_LIBRARY_PATH}/lib")
endif(WIN32)
# java_classes
endif(WIN32)
# java_classes
@@
-225,6
+231,7
@@
add_custom_command(
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/basic/*.java
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/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/commTime/*.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/commTime/*.java
COMMAND ${JAVA_COMPILE} -d ${CMAKE_HOME_DIRECTORY}/examples -cp ${CMAKE_HOME_DIRECTORY}/simgrid.jar ${CMAKE_HOME_DIRECTORY}/examples/mutualExclusion/centralized/*.java
@@
-255,6
+262,9
@@
ENABLE_TESTING()
ADD_TEST(basic
java -cp .:${CMAKE_HOME_DIRECTORY}/examples:${CMAKE_HOME_DIRECTORY}/simgrid.jar basic/BasicTest ${CMAKE_HOME_DIRECTORY}/examples/platform.xml ${CMAKE_HOME_DIRECTORY}/examples/basic/basicDeployment.xml
)
ADD_TEST(basic
java -cp .:${CMAKE_HOME_DIRECTORY}/examples:${CMAKE_HOME_DIRECTORY}/simgrid.jar basic/BasicTest ${CMAKE_HOME_DIRECTORY}/examples/platform.xml ${CMAKE_HOME_DIRECTORY}/examples/basic/basicDeployment.xml
)
+ADD_TEST(async
+java -cp .:${CMAKE_HOME_DIRECTORY}/examples:${CMAKE_HOME_DIRECTORY}/simgrid.jar async/AsyncTest ${CMAKE_HOME_DIRECTORY}/examples/platform.xml ${CMAKE_HOME_DIRECTORY}/examples/async/asyncDeployment.xml
+)
ADD_TEST(pingPong
java -cp .:${CMAKE_HOME_DIRECTORY}/examples:${CMAKE_HOME_DIRECTORY}/simgrid.jar pingPong/PingPongTest ${CMAKE_HOME_DIRECTORY}/examples/platform.xml ${CMAKE_HOME_DIRECTORY}/examples/pingPong/pingPongDeployment.xml
)
ADD_TEST(pingPong
java -cp .:${CMAKE_HOME_DIRECTORY}/examples:${CMAKE_HOME_DIRECTORY}/simgrid.jar pingPong/PingPongTest ${CMAKE_HOME_DIRECTORY}/examples/platform.xml ${CMAKE_HOME_DIRECTORY}/examples/pingPong/pingPongDeployment.xml
)
@@
-271,7
+281,7
@@
ADD_TEST(kill
java -cp .:${CMAKE_HOME_DIRECTORY}/examples:${CMAKE_HOME_DIRECTORY}/simgrid.jar master_slave_kill/MsKill ${CMAKE_HOME_DIRECTORY}/examples/master_slave_kill/platform.xml
)
#Don't forget to put new test in this list!!!
java -cp .:${CMAKE_HOME_DIRECTORY}/examples:${CMAKE_HOME_DIRECTORY}/simgrid.jar master_slave_kill/MsKill ${CMAKE_HOME_DIRECTORY}/examples/master_slave_kill/platform.xml
)
#Don't forget to put new test in this list!!!
-set(test_list basic pingPong CommTime mutualExclusion bypass kill)
+set(test_list basic
async
pingPong CommTime mutualExclusion bypass kill)
##########################################
# Set the DYLD_LIBRARY_PATH for mac #
##########################################
# Set the DYLD_LIBRARY_PATH for mac #
@@
-279,10
+289,10
@@
set(test_list basic pingPong CommTime mutualExclusion bypass kill)
if(APPLE)
if($ENV{DYLD_LIBRARY_PATH} STREQUAL "")
set_tests_properties(${test_list}
if(APPLE)
if($ENV{DYLD_LIBRARY_PATH} STREQUAL "")
set_tests_properties(${test_list}
- PROPERTIES ENVIRONMENT "DYLD_LIBRARY_PATH=${CMAKE_HOME_DIRECTORY}/lib:${SIMGRID_LIB}")
+ PROPERTIES ENVIRONMENT "DYLD_LIBRARY_PATH=${CMAKE_HOME_DIRECTORY}/lib:${SIMGRID_LIB
_PATH
}")
else($ENV{DYLD_LIBRARY_PATH} STREQUAL "")
set_tests_properties(${test_list}
else($ENV{DYLD_LIBRARY_PATH} STREQUAL "")
set_tests_properties(${test_list}
- PROPERTIES ENVIRONMENT "DYLD_LIBRARY_PATH=$ENV{DYLD_LIBRARY_PATH}:${CMAKE_HOME_DIRECTORY}/lib:${SIMGRID_LIB}")
+ PROPERTIES ENVIRONMENT "DYLD_LIBRARY_PATH=$ENV{DYLD_LIBRARY_PATH}:${CMAKE_HOME_DIRECTORY}/lib:${SIMGRID_LIB
_PATH
}")
endif($ENV{DYLD_LIBRARY_PATH} STREQUAL "")
endif(APPLE)
endif($ENV{DYLD_LIBRARY_PATH} STREQUAL "")
endif(APPLE)
@@
-292,10
+302,10
@@
endif(APPLE)
if(NOT WIN32)
if($ENV{LD_LIBRARY_PATH} STREQUAL "")
set_tests_properties(${test_list}
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}")
+ PROPERTIES ENVIRONMENT "LD_LIBRARY_PATH=${CMAKE_HOME_DIRECTORY}/lib:${SIMGRID_LIB
_PATH
}")
else($ENV{LD_LIBRARY_PATH} STREQUAL "")
set_tests_properties(${test_list}
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}")
+ 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($ENV{LD_LIBRARY_PATH} STREQUAL "")
endif(NOT WIN32)