X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/95f8d2439ede822d33a1d491f53f4e80fc662941..e9b25af6c0445fcf265b803d6ab83e4ef75cdf5e:/CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 35f5892773..96435edf9e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,32 +1,21 @@
-cmake_minimum_required(VERSION 2.6)
+cmake_minimum_required(VERSION 2.8)
 project(simgrid-java C)
-include(FindSimGrid.cmake)
+set(UPDATE_TYPE svn)
+set(CMAKE_C_FLAGS "" CACHE TYPE INTERNAL FORCE)
+set(CMAKE_EXE_LINKER_FLAGS "" CACHE TYPE INTERNAL FORCE)
+set(CMAKE_LIBRARY_OUTPUT_DIRECTORY "${CMAKE_HOME_DIRECTORY}/lib")
+
 
 set(soversion 1)
 ###############################
 # Test the build dependencies #
 ###############################
-SET(HAVE_JAVA 0)
-include(FindJava)
-include(FindJNI)
-if(JAVA_INCLUDE_PATH)
-	set(HAVE_JNI_H 1)
-endif(JAVA_INCLUDE_PATH)	
-if(JAVA_COMPILE AND JAVA_INCLUDE_PATH AND JAVA_INCLUDE_PATH2)
-	SET(HAVE_JAVA 1)
-	SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS}-I${JAVA_INCLUDE_PATH} ")
-	if(NOT JAVA_INCLUDE_PATH STREQUAL JAVA_INCLUDE_PATH2)
-	SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS}-I${JAVA_INCLUDE_PATH2} ")			
-	endif(NOT JAVA_INCLUDE_PATH STREQUAL JAVA_INCLUDE_PATH2)
-else(JAVA_COMPILE AND JAVA_INCLUDE_PATH AND JAVA_INCLUDE_PATH2) 
-	SET(HAVE_JAVA 0)
-endif(JAVA_COMPILE AND JAVA_INCLUDE_PATH AND JAVA_INCLUDE_PATH2)
-
+include(FindSimGrid.cmake)
+include(FindJavaSG.cmake)
 
 ###############################
 # Declare our package content #
 ###############################
-
 set(JMSG_C_SRC
 	src/smx_context_java.h
 	src/smx_context_java.c
@@ -63,152 +52,115 @@ set(JMSG_JAVA_SRC
 	org/simgrid/msg/TransferFailureException.java	
 )
 
-file(GLOB_RECURSE examples_sources
-	"examples/*.java"
-	"examples/*.xml"
-	"examples/*.txt"
-	"examples/java/runtest"
+set(JAVA_EXAMPLES
+	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/basic/FinalizeTask.java
+	examples/basic/Forwarder.java
+	examples/basic/Master.java
+	examples/basic/BasicTest.java
+	examples/basic/Slave.java
+	examples/commTime/FinalizeTask.java
+	examples/commTime/Master.java
+	examples/commTime/Slave.java
+	examples/commTime/CommTimeTest.java
+	examples/pingPong/PingPongTask.java
+	examples/pingPong/Sender.java
+	examples/pingPong/Receiver.java
+	examples/pingPong/PingPongTest.java
 )
 
-###############
-# Build Stuff #
-###############
-set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -I${HAVE_GRAS_H} -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(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 -I$ENV{SIMGRID_ROOT}/src -I$ENV{SIMGRID_ROOT}/src/include")
+set(LIB_PATH "-L$ENV{SIMGRID_ROOT}/lib")
 
-add_library(simgrid-java SHARED ${JMSG_C_SRC})
-set_target_properties(simgrid-java PROPERTIES VERSION ${soversion})
-target_link_libraries(simgrid-java ${HAVE_SIMGRID_LIB})
+SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${INCLUDE_PATH} ${LIB_PATH}")
 
-set(JAVA_FILES ${JMSG_JAVA_SRC})
-set(JAVA_CLASSES ${JAVA_FILES})
+string(REPLACE "org/" "${CMAKE_HOME_DIRECTORY}/org/" JAVA_FILES "${JMSG_JAVA_SRC}") 
 
-string(REPLACE "org/" "${CMAKE_HOME_DIRECTORY}/org/"
-               JAVA_FILES "${JAVA_FILES}")
+string(REPLACE "org/" "${CMAKE_HOME_DIRECTORY}/classes/org/" JMSG_JAVA_SRC_CLASS "${JMSG_JAVA_SRC}")
+string(REPLACE ".java" ".class" JMSG_JAVA_SRC_CLASS "${JMSG_JAVA_SRC_CLASS}")
 
-string(REPLACE "org/simgrid/msg" "${CMAKE_BINARY_DIR}/classes/simgrid/msg"
-               JAVA_CLASSES "${JAVA_CLASSES}")
-string(REPLACE ".java" ".class;" 
-               JAVA_CLASSES "${JAVA_CLASSES}")
-	       
+string(REPLACE "examples/" "${CMAKE_HOME_DIRECTORY}/examples/" JAVA_EXAMPLES_CLASS "${JAVA_EXAMPLES}") 
+string(REPLACE ".java" ".class" JAVA_EXAMPLES_CLASS "${JAVA_EXAMPLES_CLASS}")
 
+# TARGET SG_java
+add_library(SG_java SHARED ${JMSG_C_SRC})
+target_link_libraries(SG_java -lsimgrid)
+set_target_properties(SG_java PROPERTIES VERSION ${soversion})
+  
+# TARGET java_classes
 add_custom_command(
-  OUTPUT  ${CMAKE_BINARY_DIR}/classes/
-  COMMAND ${CMAKE_COMMAND} -E make_directory "${CMAKE_BINARY_DIR}/classes/")
-
-
-# compile all .java files with javac to .class
-ADD_CUSTOM_COMMAND(
-  OUTPUT ${JAVA_CLASSES}
-  DEPENDS ${JAVA_FILES} ${CMAKE_BINARY_DIR}/classes/
-  COMMAND ${JAVA_COMPILE} -d ${CMAKE_BINARY_DIR}/classes/
-                          -cp ${CMAKE_BINARY_DIR}/classes/
-			  ${JAVA_FILES}
-  COMMENT "Compiling java sources of core library..."
+	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}
+	COMMENT "Compiling java sources of core library..."					
+)
+add_custom_target(java_classes ALL
+  DEPENDS ${JMSG_JAVA_SRC_CLASS}		
 )
 
-ADD_CUSTOM_TARGET(simgrid_jar ALL
-                  DEPENDS ${CMAKE_BINARY_DIR}/share/simgrid.jar)
-
-ADD_CUSTOM_COMMAND( 
-  OUTPUT ${CMAKE_BINARY_DIR}/share/simgrid.jar
-  DEPENDS ${JAVA_CLASSES} 
-  WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/classes
-  COMMAND ${CMAKE_COMMAND} -E make_directory ${CMAKE_BINARY_DIR}/share
-  COMMAND ${JAVA_ARCHIVE} -cvf ${CMAKE_BINARY_DIR}/share/simgrid.jar .
+# TARGET simgrid_jar
+add_custom_target(simgrid_jar ALL
+  COMMAND ${JAVA_ARCHIVE} -cvf ${CMAKE_HOME_DIRECTORY}/simgrid.jar .
   COMMENT "Building simgrid.jar..."
+  WORKING_DIRECTORY ${CMAKE_HOME_DIRECTORY}/classes 
 )
 
-ADD_CUSTOM_COMMAND(
-	OUTPUT  ${CMAKE_BINARY_DIR}/examples/basic/BasicTest.class
-			${CMAKE_BINARY_DIR}/examples/basic/FinalizeTask.class
-			${CMAKE_BINARY_DIR}/examples/basic/Forwarder.class
-			${CMAKE_BINARY_DIR}/examples/basic/Slave.class
-			${CMAKE_BINARY_DIR}/examples/basic/Master.class
-			${CMAKE_BINARY_DIR}/examples/pingPong/PingPongTest.class
-			${CMAKE_BINARY_DIR}/examples/pingPong/Sender.class
-			${CMAKE_BINARY_DIR}/examples/pingPong/PingPongTask.class
-			${CMAKE_BINARY_DIR}/examples/pingPong/Receiver.class
-			${CMAKE_BINARY_DIR}/examples/commTime/FinalizeTask.class
-			${CMAKE_BINARY_DIR}/examples/commTime/CommTimeTest.class
-			${CMAKE_BINARY_DIR}/examples/commTime/Slave.class
-			${CMAKE_BINARY_DIR}/examples/commTime/Master.class
-			${CMAKE_BINARY_DIR}/examples/suspend/SuspendTest.class
-			${CMAKE_BINARY_DIR}/examples/suspend/LazyGuy.class
-			${CMAKE_BINARY_DIR}/examples/suspend/DreamMaster.class
-			
-	DEPENDS 
-            ${CMAKE_BINARY_DIR}/share/simgrid.jar
-			${CMAKE_HOME_DIRECTORY}/examples/basic/*.java
-			${CMAKE_HOME_DIRECTORY}/examples/pingPong/*.java
-			${CMAKE_HOME_DIRECTORY}/examples/commTime/*.java
-			${CMAKE_HOME_DIRECTORY}/examples/suspend/*.java
-			
-	COMMENT "Build examples for java"	
-	
-	COMMAND ${CMAKE_COMMAND} -E make_directory ${CMAKE_BINARY_DIR}/examples/basic
-	COMMAND ${CMAKE_COMMAND} -E make_directory ${CMAKE_BINARY_DIR}/examples/ping_pong
-	COMMAND ${CMAKE_COMMAND} -E make_directory ${CMAKE_BINARY_DIR}/examples/comm_time
-	COMMAND ${CMAKE_COMMAND} -E make_directory ${CMAKE_BINARY_DIR}/examples/suspend
+# TARGET simgrid_java_examples
+add_custom_command(
+	COMMENT "Build examples for java"
+	OUTPUT	${JAVA_EXAMPLES_CLASS}
 	
-  	COMMAND ${JAVA_COMPILE} -d ${CMAKE_BINARY_DIR}/examples/basic -cp ${CMAKE_BINARY_DIR}/share/simgrid.jar ${CMAKE_HOME_DIRECTORY}/examples/basic/*.java  
- 	COMMAND ${JAVA_COMPILE} -d ${CMAKE_BINARY_DIR}/examples/ping_pong -cp ${CMAKE_BINARY_DIR}/share/simgrid.jar ${CMAKE_HOME_DIRECTORY}/examples/pingPong/*.java
-  	COMMAND ${JAVA_COMPILE} -d ${CMAKE_BINARY_DIR}/examples/comm_time -cp ${CMAKE_BINARY_DIR}/share/simgrid.jar ${CMAKE_HOME_DIRECTORY}/examples/commTime/*.java
-  	COMMAND ${JAVA_COMPILE} -d ${CMAKE_BINARY_DIR}/examples/suspend -cp ${CMAKE_BINARY_DIR}/share/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/basic/*.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              			
 )
+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)
 
-ADD_CUSTOM_TARGET(examples ALL
-	DEPENDS ${CMAKE_BINARY_DIR}/examples/basic/BasicTest.class
-		${CMAKE_BINARY_DIR}/examples/basic/FinalizeTask.class
-		${CMAKE_BINARY_DIR}/examples/basic/Forwarder.class
-		${CMAKE_BINARY_DIR}/examples/basic/Slave.class
-		${CMAKE_BINARY_DIR}/examples/basic/Master.class
-		${CMAKE_BINARY_DIR}/examples/ping_pong/PingPongTest.class
-		${CMAKE_BINARY_DIR}/examples/ping_pong/Sender.class
-		${CMAKE_BINARY_DIR}/examples/ping_pong/PingPongTask.class
-		${CMAKE_BINARY_DIR}/examples/ping_pong/Receiver.class
-		${CMAKE_BINARY_DIR}/examples/comm_time/FinalizeTask.class
-		${CMAKE_BINARY_DIR}/examples/comm_time/CommTimeTest.class
-		${CMAKE_BINARY_DIR}/examples/comm_time/Slave.class
-		${CMAKE_BINARY_DIR}/examples/comm_time/Master.class
-		${CMAKE_BINARY_DIR}/examples/suspend/SuspendTest.class
-		${CMAKE_BINARY_DIR}/examples/suspend/LazyGuy.class
-		${CMAKE_BINARY_DIR}/examples/suspend/DreamMaster.class
-	COMMENT Compiling the Java examples							
+SET_DIRECTORY_PROPERTIES(PROPERTIES ADDITIONAL_MAKE_CLEAN_FILES
+${CMAKE_HOME_DIRECTORY}/simgrid.jar
 )
 
 #####################
 # Declare our tests #
 #####################
+INCLUDE(CTest)
 ENABLE_TESTING()
 
-set(osname ${CMAKE_SYSTEM_NAME})
-set(cpu ${CMAKE_SYSTEM_PROCESSOR})
-set(DISTRIB2 ${CMAKE_SYSTEM_VERSION})
-
-SET(SITE "${osname}_${DISTRIB2}_${cpu}")
-SET(CTEST_SITE "${osname}_${DISTRIB2}_${cpu}")
-SET(CTEST_PROJECT_NAME "${PROJECT_NAME}")
-SET(CTEST_CUSTOM_MAXIMUM_FAILED_TEST_OUTPUT_SIZE "3000000")
-SET(CTEST_CUSTOM_MAXIMUM_PASSED_TEST_OUTPUT_SIZE "3000000")
-
-
-# java examples
-ADD_TEST(java-basic 	java -cp ${CMAKE_BINARY_DIR}/examples/basic:${CMAKE_BINARY_DIR}/share/simgrid.jar BasicTest examples/platform.xml ${CMAKE_HOME_DIRECTORY}/examples/basic/basic_deployment.xml)
-ADD_TEST(java-pingpong 	java -cp ${CMAKE_BINARY_DIR}/examples/pingpong:${CMAKE_BINARY_DIR}/share/simgrid.jar PingpongTest examples/platform.xml ${CMAKE_HOME_DIRECTORY}/examples/pingpong/pingpong_deployment.xml)
-ADD_TEST(java-pingpong 	java -cp ${CMAKE_BINARY_DIR}/examples/pingpong:${CMAKE_BINARY_DIR}/share/simgrid.jar PingpongTest examples/platform.xml ${CMAKE_HOME_DIRECTORY}/examples/pingpong/pingpong_deployment.xml)
-#ADD_TEST(java-comm_time ${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/test_java.sh ${CMAKE_HOME_DIRECTORY}/examples/java/comm_time CommTimeTest ${simgrid_BINARY_DIR})
-#ADD_TEST(java-suspend 	${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/test_java.sh ${CMAKE_HOME_DIRECTORY}/examples/java/suspend SuspendTest ${simgrid_BINARY_DIR})
-
-######################
-# Install some stuff #
-######################
-install(FILES ${CMAKE_BINARY_DIR}/share/simgrid.jar
-          DESTINATION $ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/share/)
-
-add_custom_target(uninstall
-	COMMAND ${CMAKE_COMMAND} -E	remove -f ${CMAKE_INSTALL_PREFIX}/share/simgrid.jar
-	COMMAND ${CMAKE_COMMAND} -E echo "uninstall binding java ok"
-)	
-
-install(TARGETS simgrid-java
-        DESTINATION $ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/lib/)
+ADD_TEST(java-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(java-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
+)
+
+##########################################
+# Set the  LD_LIBRARY_PATH for our tests #
+##########################################
+message(STATUS "export LD_LIBRARY_PATH=${CMAKE_HOME_DIRECTORY}/lib:$ENV{LD_LIBRARY_PATH}")
+
+set_tests_properties(java-basic java-pingPong
+PROPERTIES ENVIRONMENT "LD_LIBRARY_PATH=${CMAKE_HOME_DIRECTORY}/lib:$ENV{LD_LIBRARY_PATH}")
+
+###########
+# Install #
+###########
+install(TARGETS SG_java
+	DESTINATION $ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/java/)
+install(FILES ${CMAKE_HOME_DIRECTORY}/simgrid.jar
+	DESTINATION $ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/java/)
\ No newline at end of file