Cosmetics for cmake and java.

git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@7653 48e7efb5-ca39-0410-a469-dd3cf9ba447f

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 01e7aae..a8a8819 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -54,6 +54,11 @@ include(${PROJECT_DIRECTORY}/buildtools/Cmake/src/CMakeFlags.txt)
 ### Make Libs and Exes
 include(${PROJECT_DIRECTORY}/buildtools/Cmake/src/CMakeMakeExeLib.txt)
 
+### Make Simgrid.jar and Java examples
+if(HAVE_JAVA)
+       include(${PROJECT_DIRECTORY}/buildtools/Cmake/src/CMakeJarAndClass.txt)
+endif(HAVE_JAVA)
+
 ### Make tests
 include(${PROJECT_DIRECTORY}/buildtools/Cmake/src/CMakeTest.txt)
 include(${PROJECT_DIRECTORY}/buildtools/Cmake/src/CTestConfig.cmake)

diff --git a/buildtools/Cmake/src/CMakeJarAndClass.txt b/buildtools/Cmake/src/CMakeJarAndClass.txt
new file mode 100644 (file)
index 0000000..4f317d7
--- /dev/null
+++ b/buildtools/Cmake/src/CMakeJarAndClass.txt
@@ -0,0 +1,63 @@
+       foreach(file ${JMSG_JAVA_SRC})
+               set(java_src_to_compile "${java_src_to_compile}${file}\t")      
+       endforeach(file ${JMSG_JAVA_SRC})
+       string(REPLACE ".java" ".class" java_output "${JMSG_JAVA_SRC}")  
+       
+       # build .jar file from .class files
+       ADD_CUSTOM_TARGET(simgrid.jar
+       COMMAND rm -rf ${PROJECT_DIRECTORY}/src/.classes
+       COMMAND mkdir -p ${PROJECT_DIRECTORY}/src/.classes
+       COMMAND mkdir -p ${PROJECT_DIRECTORY}/src/.classes/surf
+       COMMAND cp ${PROJECT_DIRECTORY}/src/surf/simgrid.dtd ${PROJECT_DIRECTORY}/src/.classes/surf/simgrid.dtd
+       COMMAND ${JAVA_COMPILE} -d ${PROJECT_DIRECTORY}/src/.classes -cp ${PROJECT_DIRECTORY}/src/.classes ${java_src_to_compile}
+       )
+       
+       ADD_CUSTOM_COMMAND(
+       TARGET simgrid
+       POST_BUILD
+       COMMAND make simgrid.jar
+       )
+       
+       ADD_CUSTOM_COMMAND(
+       TARGET simgrid.jar
+       POST_BUILD 
+       COMMAND ${CMAKE_COMMAND}
+       ARGS -E chdir ${PROJECT_DIRECTORY}
+       ${JAVA_ARCHIVE} -cvf ${PROJECT_DIRECTORY}/src/simgrid.jar -C ${PROJECT_DIRECTORY}/src/.classes .
+       )
+       
+       ADD_CUSTOM_COMMAND(
+       TARGET simgrid.jar
+       POST_BUILD 
+       COMMAND rm -f ${PROJECT_DIRECTORY}/examples/java/basic/*.class
+       COMMAND ${JAVA_COMPILE}
+       ARGS -d ${PROJECT_DIRECTORY}/examples/java/basic -cp ${PROJECT_DIRECTORY}/src/simgrid.jar
+       ${PROJECT_DIRECTORY}/examples/java/basic/*.java
+       )
+       
+       ADD_CUSTOM_COMMAND(
+       TARGET simgrid.jar
+       POST_BUILD
+       COMMAND rm -f ${PROJECT_DIRECTORY}/examples/java/ping_pong/*.class
+       COMMAND ${JAVA_COMPILE}
+       ARGS -d ${PROJECT_DIRECTORY}/examples/java/ping_pong -cp ${PROJECT_DIRECTORY}/src/simgrid.jar
+       ${PROJECT_DIRECTORY}/examples/java/ping_pong/*.java
+       )
+       
+       ADD_CUSTOM_COMMAND(
+       TARGET simgrid.jar
+       POST_BUILD 
+       COMMAND rm -f ${PROJECT_DIRECTORY}/examples/java/comm_time/*.class
+       COMMAND ${JAVA_COMPILE}
+       ARGS -d ${PROJECT_DIRECTORY}/examples/java/comm_time -cp ${PROJECT_DIRECTORY}/src/simgrid.jar
+       ${PROJECT_DIRECTORY}/examples/java/comm_time/*.java
+       )
+       
+       ADD_CUSTOM_COMMAND(
+       TARGET simgrid.jar
+       POST_BUILD 
+       COMMAND rm -f ${PROJECT_DIRECTORY}/examples/java/suspend/*.class
+       COMMAND ${JAVA_COMPILE}
+       ARGS -d ${PROJECT_DIRECTORY}/examples/java/suspend -cp ${PROJECT_DIRECTORY}/src/simgrid.jar
+       ${PROJECT_DIRECTORY}/examples/java/suspend/*.java
+       )
\ No newline at end of file

diff --git a/buildtools/Cmake/src/CMakeMakeExeLib.txt b/buildtools/Cmake/src/CMakeMakeExeLib.txt
index accba92..89210a0 100644 (file)
--- a/buildtools/Cmake/src/CMakeMakeExeLib.txt
+++ b/buildtools/Cmake/src/CMakeMakeExeLib.txt
@@ -131,74 +131,6 @@ add_subdirectory(${PROJECT_DIRECTORY}/examples/simdag/metaxml)
 add_subdirectory(${PROJECT_DIRECTORY}/examples/simdag/properties)
 add_subdirectory(${PROJECT_DIRECTORY}/examples/smpi)
 
-if(HAVE_JAVA)
-       foreach(file ${JMSG_JAVA_SRC})
-               set(java_src_to_compile "${java_src_to_compile}${file} ")       
-       endforeach(file ${JMSG_JAVA_SRC})
-       
-       string(REPLACE ".java" ".class" java_output "${JMSG_JAVA_SRC}")
-       
-#      message("\n\njava_src:\n${JMSG_JAVA_SRC}")
-#      message("\n\njava_src_to_compile:\n${java_src_to_compile}")
-#      message("\n\njava_output:\n${java_output}")     
-
-file(REMOVE_RECURSE ${PROJECT_DIRECTORY}/src/.classes)
-file(REMOVE ${PROJECT_DIRECTORY}/src/simgrid.jar)
-file(MAKE_DIRECTORY ${PROJECT_DIRECTORY}/src/.classes)
-file(MAKE_DIRECTORY ${PROJECT_DIRECTORY}/src/.classes/surf)
-configure_file(${PROJECT_DIRECTORY}/src/surf/simgrid.dtd ${PROJECT_DIRECTORY}/src/.classes/surf/simgrid.dtd COPYONLY)  
-
-# build .jar file from .class files
-ADD_CUSTOM_TARGET(simgrid.jar ALL
-COMMAND ${JAVA_COMPILE} -d ${PROJECT_DIRECTORY}/src/.classes -cp ${PROJECT_DIRECTORY}/src/.classes ${PROJECT_DIRECTORY}/src/java/simgrid/msg/*.java
-)
-
-ADD_CUSTOM_COMMAND(
-TARGET simgrid.jar
-POST_BUILD 
-COMMAND ${CMAKE_COMMAND}
-ARGS -E chdir ${PROJECT_DIRECTORY}
-${JAVA_ARCHIVE} -cvf ${PROJECT_DIRECTORY}/src/simgrid.jar -C ${PROJECT_DIRECTORY}/src/.classes .
-)
-
-ADD_CUSTOM_COMMAND(
-TARGET simgrid.jar
-POST_BUILD 
-COMMAND rm -f ${PROJECT_DIRECTORY}/examples/java/basic/*.class
-COMMAND ${JAVA_COMPILE}
-ARGS -d ${PROJECT_DIRECTORY}/examples/java/basic -cp ${PROJECT_DIRECTORY}/src/simgrid.jar
-${PROJECT_DIRECTORY}/examples/java/basic/*.java
-)
-
-ADD_CUSTOM_COMMAND(
-TARGET simgrid.jar
-POST_BUILD
-COMMAND rm -f ${PROJECT_DIRECTORY}/examples/java/ping_pong/*.class
-COMMAND ${JAVA_COMPILE}
-ARGS -d ${PROJECT_DIRECTORY}/examples/java/ping_pong -cp ${PROJECT_DIRECTORY}/src/simgrid.jar
-${PROJECT_DIRECTORY}/examples/java/ping_pong/*.java
-)
-
-ADD_CUSTOM_COMMAND(
-TARGET simgrid.jar
-POST_BUILD 
-COMMAND rm -f ${PROJECT_DIRECTORY}/examples/java/comm_time/*.class
-COMMAND ${JAVA_COMPILE}
-ARGS -d ${PROJECT_DIRECTORY}/examples/java/comm_time -cp ${PROJECT_DIRECTORY}/src/simgrid.jar
-${PROJECT_DIRECTORY}/examples/java/comm_time/*.java
-)
-
-ADD_CUSTOM_COMMAND(
-TARGET simgrid.jar
-POST_BUILD 
-COMMAND rm -f ${PROJECT_DIRECTORY}/examples/java/suspend/*.class
-COMMAND ${JAVA_COMPILE}
-ARGS -d ${PROJECT_DIRECTORY}/examples/java/suspend -cp ${PROJECT_DIRECTORY}/src/simgrid.jar
-${PROJECT_DIRECTORY}/examples/java/suspend/*.java
-)
-
-endif(HAVE_JAVA)
-
 set(targets_depended_of_gras_stub_generator
 ping_client
 ping_server