From fd3ed993c66a191cea33f345f97686602e79f5db Mon Sep 17 00:00:00 2001
From: navarrop <navarrop@48e7efb5-ca39-0410-a469-dd3cf9ba447f>
Date: Tue, 4 May 2010 09:45:03 +0000
Subject: [PATCH] Java lang with cmake.

git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@7668 48e7efb5-ca39-0410-a469-dd3cf9ba447f
---
 buildtools/Cmake/src/CMakeDistrib.txt     |  6 +-
 buildtools/Cmake/src/CMakeJarAndClass.txt | 96 ++++++++++-------------
 buildtools/Cmake/src/CMakePrintArgs.txt   |  2 +
 3 files changed, 50 insertions(+), 54 deletions(-)

diff --git a/buildtools/Cmake/src/CMakeDistrib.txt b/buildtools/Cmake/src/CMakeDistrib.txt
index c9fdc498ed..62aa607561 100755
--- a/buildtools/Cmake/src/CMakeDistrib.txt
+++ b/buildtools/Cmake/src/CMakeDistrib.txt
@@ -253,8 +253,12 @@ COMMAND make clean
 COMMAND make java-clean
 COMMAND make doc-clean
 COMMAND make supernovae-clean
-COMMAND make maintainer-clean
 )
+if(enable_maintainer_mode)
+	add_custom_command(TARGET all-clean
+	COMMAND make maintainer-clean
+	)
+endif(enable_maintainer_mode)
 
 add_custom_target(sync-gforge
 COMMAND chmod g+rw -R doc/
diff --git a/buildtools/Cmake/src/CMakeJarAndClass.txt b/buildtools/Cmake/src/CMakeJarAndClass.txt
index 4f317d74db..2a2294b17f 100644
--- a/buildtools/Cmake/src/CMakeJarAndClass.txt
+++ b/buildtools/Cmake/src/CMakeJarAndClass.txt
@@ -1,63 +1,53 @@
-	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}
-	)
+	set(JMSG_JAVA_SRC_CLASS ${JMSG_JAVA_SRC})
+	string(REPLACE "${PROJECT_DIRECTORY}/src/java/simgrid/msg" "${PROJECT_DIRECTORY}/src/.classes/simgrid/msg" JMSG_JAVA_SRC_CLASS ${JMSG_JAVA_SRC_CLASS})
+	string(REPLACE ".java" ".class;" JMSG_JAVA_SRC_CLASS ${JMSG_JAVA_SRC_CLASS})
+	set(java_src_to_compile "")	
 	
-	ADD_CUSTOM_COMMAND(
-	TARGET simgrid
-	POST_BUILD
-	COMMAND make 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" COPY_ONLY)
+	
+	set(CMAKE_JAVA_COMPILER "${JAVA_COMPILE} -d ${PROJECT_DIRECTORY}/src/.classes -cp ${PROJECT_DIRECTORY}/src/.classes")
+	SET(CMAKE_JAVA_LINK_EXECUTABLE "${JAVA_ARCHIVE} -cvf ${PROJECT_DIRECTORY}/src/simgrid.jar -C ${PROJECT_DIRECTORY}/src/.classes .")
+		
+	foreach(file ${JMSG_JAVA_SRC_CLASS})
+		if(NOT EXISTS ${file})
+			string(REPLACE "${PROJECT_DIRECTORY}/src/.classes/simgrid/msg" "${PROJECT_DIRECTORY}/src/java/simgrid/msg" file ${file})
+			string(REPLACE ".class" ".java" file ${file})
+			set(java_src_to_compile "${java_src_to_compile}${file}\t")
+		endif(NOT EXISTS ${file})
+	endforeach(file ${JMSG_JAVA_SRC_CLASS})
+	
+	add_executable(simgrid.jar ${JMSG_JAVA_SRC})
+	set_target_properties(simgrid.jar PROPERTIES LANGUAGE JAVA)
+	set_target_properties(simgrid.jar PROPERTIES LINKER_LANGUAGE JAVA)
+
+	if(java_src_to_compile)	
+		ADD_CUSTOM_COMMAND(TARGET simgrid.jar
+		PRE_BUILD
+		COMMAND ${JAVA_COMPILE}
+		ARGS -d ${PROJECT_DIRECTORY}/src/.classes -cp ${PROJECT_DIRECTORY}/src/.classes ${java_src_to_compile}
+		)
+	endif(java_src_to_compile)
 	
-	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_TARGET(java_basic ALL
+	COMMAND ${JAVA_COMPILE} -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/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_TARGET(java_ping_pong ALL
+	COMMAND ${JAVA_COMPILE} -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/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_TARGET(java_comm_time ALL
+	COMMAND ${JAVA_COMPILE} -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/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_TARGET(java_suspend ALL
+	COMMAND ${JAVA_COMPILE} -d ${PROJECT_DIRECTORY}/examples/java/suspend -cp ${PROJECT_DIRECTORY}/src/simgrid.jar ${PROJECT_DIRECTORY}/examples/java/suspend/*.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
+	add_dependencies(java_basic simgrid.jar)
+	add_dependencies(java_ping_pong simgrid.jar)
+	add_dependencies(java_comm_time simgrid.jar)
+	add_dependencies(java_suspend simgrid.jar)
\ No newline at end of file
diff --git a/buildtools/Cmake/src/CMakePrintArgs.txt b/buildtools/Cmake/src/CMakePrintArgs.txt
index da1ba280dd..3fdb623cc5 100644
--- a/buildtools/Cmake/src/CMakePrintArgs.txt
+++ b/buildtools/Cmake/src/CMakePrintArgs.txt
@@ -76,6 +76,8 @@ if(enable_print_message)
 	message("JNI.H : 			${JAVA_INCLUDE_PATH}")
 	message("JNI_MD.H : 			${JAVA_INCLUDE_PATH2}")
 	message("JAVAC : 			${JAVA_COMPILE}")
+	message("CMAKE_JAVA_COMPILER        :	${CMAKE_JAVA_COMPILER}")
+	message("CMAKE_JAVA_LINK_EXECUTABLE :	${CMAKE_JAVA_LINK_EXECUTABLE}")
 	message("LUALIB.H: 			${HAVE_LUA5_1_LUALIB_H}")
 	message("LAUXLIB.H: 			${HAVE_LUA5_1_LAUXLIB_H}")
 	message("LUA_VERSION : 			${LUA_MAJOR_VERSION}.${LUA_MINOR_VERSION}.${LUA_PATCH_VERSION}")
-- 
2.20.1