From a711adeffa407b15d22600c0e77d1636e5d77c90 Mon Sep 17 00:00:00 2001
From: navarrop <navarrop@48e7efb5-ca39-0410-a469-dd3cf9ba447f>
Date: Thu, 14 Oct 2010 14:48:41 +0000
Subject: [PATCH] Change way for cleaning generated files.

git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@8424 48e7efb5-ca39-0410-a469-dd3cf9ba447f
---
 buildtools/Cmake/Distrib.cmake    | 107 ++++++++++++------------------
 buildtools/Cmake/MakeExeLib.cmake |  27 +++++---
 buildtools/Cmake/MakeJava.cmake   |  70 +++++++++++++------
 3 files changed, 107 insertions(+), 97 deletions(-)

diff --git a/buildtools/Cmake/Distrib.cmake b/buildtools/Cmake/Distrib.cmake
index 2508f976e2..b2af267ef0 100755
--- a/buildtools/Cmake/Distrib.cmake
+++ b/buildtools/Cmake/Distrib.cmake
@@ -65,9 +65,13 @@ endif(HAVE_JAVA)
 if(HAVE_LUA)
 	file(MAKE_DIRECTORY "${CMAKE_BINARY_DIR}/lib/lua/5.1")
 	add_custom_target(simgrid_lua ALL
-  		COMMAND ${CMAKE_COMMAND} -E create_symlink ../../libsimgrid.${LIB_EXE} ${CMAKE_BINARY_DIR}/lib/lua/5.1/simgrid.${LIB_EXE}
-  		DEPENDS simgrid
+  		DEPENDS simgrid 
+  				${CMAKE_BINARY_DIR}/lib/lua/5.1/simgrid.${LIB_EXE}
 		)
+	add_custom_command(
+		OUTPUT ${CMAKE_BINARY_DIR}/lib/lua/5.1/simgrid.${LIB_EXE}
+		COMMAND ${CMAKE_COMMAND} -E create_symlink ../../libsimgrid.${LIB_EXE} ${CMAKE_BINARY_DIR}/lib/lua/5.1/simgrid.${LIB_EXE}
+	)
 	install(FILES ${CMAKE_BINARY_DIR}/lib/lua/5.1/simgrid.${LIB_EXE}
 		DESTINATION $ENV{DESTDIR}${prefix}/lib/lua/5.1
 		)
@@ -77,8 +81,12 @@ if(HAVE_RUBY)
 	string(REGEX REPLACE "^.*ruby/" "" install_link_ruby "${RUBY_ARCH_DIR}")
 	file(MAKE_DIRECTORY "${CMAKE_BINARY_DIR}/lib/ruby/${install_link_ruby}")
 	add_custom_target(ruby_simgrid ALL
-	COMMAND ${CMAKE_COMMAND} -E create_symlink ../../../libsimgrid.${LIB_EXE} ${CMAKE_BINARY_DIR}/lib/ruby/${install_link_ruby}/libsimgrid.${LIB_EXE}
-	DEPENDS simgrid
+		DEPENDS simgrid
+				${CMAKE_BINARY_DIR}/lib/ruby/${install_link_ruby}/libsimgrid.${LIB_EXE}
+	)
+	add_custom_command(
+		OUTPUT ${CMAKE_BINARY_DIR}/lib/ruby/${install_link_ruby}/libsimgrid.${LIB_EXE}
+		COMMAND ${CMAKE_COMMAND} -E create_symlink ../../../libsimgrid.${LIB_EXE} ${CMAKE_BINARY_DIR}/lib/ruby/${install_link_ruby}/libsimgrid.${LIB_EXE}
 	)
 	install(FILES ${CMAKE_BINARY_DIR}/lib/ruby/${install_link_ruby}/libsimgrid.${LIB_EXE}
 		DESTINATION $ENV{DESTDIR}${prefix}/lib/ruby/${install_link_ruby}/
@@ -151,7 +159,7 @@ endif(HAVE_RUBY)
 ######################################
 
 add_custom_target(html
-COMMAND ${CMAKE_COMMAND} -E echo "Make the html doc"
+DEPENDS ${PROJECT_DIRECTORY}/doc/all_bib.html
 COMMAND ${CMAKE_COMMAND} -E echo "cmake -DBIBTEX2HTML=${BIBTEX2HTML} ./"
 COMMAND ${CMAKE_COMMAND} -DBIBTEX2HTML=${BIBTEX2HTML} ./
 COMMAND ${CMAKE_COMMAND} -E remove_directory ${PROJECT_DIRECTORY}/buildtools/Cmake/doc/CMakeFiles
@@ -161,6 +169,33 @@ COMMAND ${CMAKE_COMMAND} -E remove -f ${PROJECT_DIRECTORY}/buildtools/Cmake/doc/
 WORKING_DIRECTORY "${PROJECT_DIRECTORY}/buildtools/Cmake/doc"
 )
 
+add_custom_command(
+OUTPUT 	${PROJECT_DIRECTORY}/doc/all_bib.html
+		${PROJECT_DIRECTORY}/doc/all_bib.latin1.html
+		${PROJECT_DIRECTORY}/doc/all_bib.latin1.html.tmp
+		${PROJECT_DIRECTORY}/doc/logcategories.sh
+		${PROJECT_DIRECTORY}/doc/publis_core.bib
+		${PROJECT_DIRECTORY}/doc/publis_core_bib.html
+		${PROJECT_DIRECTORY}/doc/publis_core_bib.latin1.html
+		${PROJECT_DIRECTORY}/doc/publis_core_bib.latin1.html.tmp
+		${PROJECT_DIRECTORY}/doc/publis_count.html
+		${PROJECT_DIRECTORY}/doc/publis_extern.bib
+		${PROJECT_DIRECTORY}/doc/publis_extern_bib.html
+		${PROJECT_DIRECTORY}/doc/publis_extern_bib.latin1.html
+		${PROJECT_DIRECTORY}/doc/publis_extern_bib.latin1.html.tmp
+		${PROJECT_DIRECTORY}/doc/publis_intra.bib
+		${PROJECT_DIRECTORY}/doc/publis_intra_bib.html
+		${PROJECT_DIRECTORY}/doc/publis_intra_bib.latin1.html
+		${PROJECT_DIRECTORY}/doc/publis_intra_bib.latin1.html.tmp
+		${PROJECT_DIRECTORY}/doc/tmp.realtoc
+		${PROJECT_DIRECTORY}/doc/using_bib.html
+		${PROJECT_DIRECTORY}/doc/using_bib.latin1.html
+		${PROJECT_DIRECTORY}/doc/using_bib.latin1.html.tmp
+		${PROJECT_DIRECTORY}/doc/realtoc.sh
+		${PROJECT_DIRECTORY}/doc/html
+COMMAND ${CMAKE_COMMAND} -E echo "Make the html doc"
+)
+
 ################################################################
 ## Build a sain "make dist" target to build a source package ###
 ##   containing only the files that I explicitely state      ###
@@ -262,7 +297,7 @@ else(enable_memcheck)
 endif(enable_memcheck)
 
 #######################################
-### Fill in the "make all-clean" target ###
+### Fill in the "make xxx-clean" target ###
 #######################################
 
 add_custom_target(maintainer-clean
@@ -288,66 +323,6 @@ COMMAND ${CMAKE_COMMAND} -E remove -f src/supernovae_smpi.c
 WORKING_DIRECTORY "${PROJECT_DIRECTORY}"
 )
 
-add_custom_target(doc-clean
-COMMAND ${CMAKE_COMMAND} -E remove -f doc/all_bib.html
-COMMAND ${CMAKE_COMMAND} -E remove -f doc/all_bib.latin1.html
-COMMAND ${CMAKE_COMMAND} -E remove -f doc/all_bib.latin1.html.tmp
-COMMAND ${CMAKE_COMMAND} -E remove -f doc/logcategories.sh
-COMMAND ${CMAKE_COMMAND} -E remove -f doc/publis_core.bib
-COMMAND ${CMAKE_COMMAND} -E remove -f doc/publis_core_bib.html
-COMMAND ${CMAKE_COMMAND} -E remove -f doc/publis_core_bib.latin1.html
-COMMAND ${CMAKE_COMMAND} -E remove -f doc/publis_core_bib.latin1.html.tmp
-COMMAND ${CMAKE_COMMAND} -E remove -f doc/publis_count.html
-COMMAND ${CMAKE_COMMAND} -E remove -f doc/publis_extern.bib
-COMMAND ${CMAKE_COMMAND} -E remove -f doc/publis_extern_bib.html
-COMMAND ${CMAKE_COMMAND} -E remove -f doc/publis_extern_bib.latin1.html
-COMMAND ${CMAKE_COMMAND} -E remove -f doc/publis_extern_bib.latin1.html.tmp
-COMMAND ${CMAKE_COMMAND} -E remove -f doc/publis_intra.bib
-COMMAND ${CMAKE_COMMAND} -E remove -f doc/publis_intra_bib.html
-COMMAND ${CMAKE_COMMAND} -E remove -f doc/publis_intra_bib.latin1.html
-COMMAND ${CMAKE_COMMAND} -E remove -f doc/publis_intra_bib.latin1.html.tmp
-COMMAND ${CMAKE_COMMAND} -E remove -f doc/tmp.realtoc
-COMMAND ${CMAKE_COMMAND} -E remove -f doc/using_bib.html
-COMMAND ${CMAKE_COMMAND} -E remove -f doc/using_bib.latin1.html
-COMMAND ${CMAKE_COMMAND} -E remove -f doc/using_bib.latin1.html.tmp
-COMMAND ${CMAKE_COMMAND} -E remove -f doc/realtoc.sh
-WORKING_DIRECTORY "${PROJECT_DIRECTORY}"
-)
-
-add_custom_target(java-clean
-COMMAND ${CMAKE_COMMAND} -E remove -f src/simgrid.jar
-COMMAND ${CMAKE_COMMAND} -E remove_directory src/.classes
-COMMAND ${CMAKE_COMMAND} -E remove -f examples/java/basic/BasicTest.class
-COMMAND ${CMAKE_COMMAND} -E remove -f examples/java/basic/FinalizeTask.class
-COMMAND ${CMAKE_COMMAND} -E remove -f examples/java/basic/Forwarder.class
-COMMAND ${CMAKE_COMMAND} -E remove -f examples/java/basic/Master.class
-COMMAND ${CMAKE_COMMAND} -E remove -f examples/java/basic/Slave.class
-COMMAND ${CMAKE_COMMAND} -E remove -f examples/java/comm_time/CommTimeTest.class
-COMMAND ${CMAKE_COMMAND} -E remove -f examples/java/comm_time/FinalizeTask.class
-COMMAND ${CMAKE_COMMAND} -E remove -f examples/java/comm_time/Master.class
-COMMAND ${CMAKE_COMMAND} -E remove -f examples/java/comm_time/Slave.class
-COMMAND ${CMAKE_COMMAND} -E remove -f examples/java/ping_pong/PingPongTask.class
-COMMAND ${CMAKE_COMMAND} -E remove -f examples/java/ping_pong/PingPongTest.class
-COMMAND ${CMAKE_COMMAND} -E remove -f examples/java/ping_pong/Receiver.class
-COMMAND ${CMAKE_COMMAND} -E remove -f examples/java/ping_pong/Sender.class
-COMMAND ${CMAKE_COMMAND} -E remove -f examples/java/suspend/DreamMaster.class
-COMMAND ${CMAKE_COMMAND} -E remove -f examples/java/suspend/LazyGuy.class
-COMMAND ${CMAKE_COMMAND} -E remove -f examples/java/suspend/SuspendTest.class
-WORKING_DIRECTORY "${PROJECT_DIRECTORY}"
-)
-
-add_custom_target(all-clean
-COMMAND make clean
-COMMAND make java-clean
-COMMAND make doc-clean
-COMMAND make supernovae-clean
-)
-if(enable_maintainer_mode)
-	add_custom_command(TARGET all-clean
-	COMMAND make maintainer-clean
-	)
-endif(enable_maintainer_mode)
-
 #############################################
 ### Fill in the "make sync-gforge" target ###
 #############################################
diff --git a/buildtools/Cmake/MakeExeLib.cmake b/buildtools/Cmake/MakeExeLib.cmake
index 2e5bc00c54..498a9fa7ae 100644
--- a/buildtools/Cmake/MakeExeLib.cmake
+++ b/buildtools/Cmake/MakeExeLib.cmake
@@ -30,11 +30,12 @@ endif(HAVE_PCRE_LIB)
 if(HAVE_RUBY)
 	set(SIMGRID_DEP "${SIMGRID_DEP} -l${RUBY_LIBRARY_NAME} -module")
 	ADD_CUSTOM_TARGET(link_simgrid_ruby ALL
-	  DEPENDS simgrid
-	  COMMAND ${CMAKE_COMMAND} -E create_symlink ${CMAKE_BINARY_DIR}/lib/libsimgrid.${LIB_EXE} ${PROJECT_DIRECTORY}/src/bindings/ruby/libsimgrid.${LIB_EXE}
-	  COMMENT "Generating libsimgrid.${LIB_EXE} link for binding ruby..."
+	  DEPENDS simgrid ${PROJECT_DIRECTORY}/src/bindings/ruby/libsimgrid.${LIB_EXE}
 	  )
-	
+	add_custom_command(
+		OUTPUT ${PROJECT_DIRECTORY}/src/bindings/ruby/libsimgrid.${LIB_EXE}
+		COMMAND ${CMAKE_COMMAND} -E create_symlink ${CMAKE_BINARY_DIR}/lib/libsimgrid.${LIB_EXE} ${PROJECT_DIRECTORY}/src/bindings/ruby/libsimgrid.${LIB_EXE}
+	)
 endif(HAVE_RUBY)
 
 if(CMAKE_SYSTEM_NAME MATCHES "Darwin")
@@ -55,13 +56,19 @@ if(HAVE_LUA)
 	SET(SIMGRID_DEP "${SIMGRID_DEP} -ldl -l${liblua}")   
 	  
     ADD_CUSTOM_TARGET(link_simgrid_lua ALL
-      DEPENDS simgrid
-	  COMMAND ${CMAKE_COMMAND} -E create_symlink ${CMAKE_BINARY_DIR}/lib/libsimgrid.${LIB_EXE} ${PROJECT_DIRECTORY}/examples/lua/simgrid.${LIB_EXE} #for test
-	  COMMAND ${CMAKE_COMMAND} -E create_symlink ${CMAKE_BINARY_DIR}/lib/libsimgrid.${LIB_EXE} ${PROJECT_DIRECTORY}/examples/msg/masterslave/simgrid.${LIB_EXE} #for test
-	  COMMAND ${CMAKE_COMMAND} -E create_symlink ${CMAKE_BINARY_DIR}/lib/libsimgrid.${LIB_EXE} ${PROJECT_DIRECTORY}/examples/simdag/simgrid.${LIB_EXE} #for test
-	  COMMENT "Generating libsimgrid.${LIB_EXE} link for binding lua..."
+      DEPENDS 	simgrid
+      			${PROJECT_DIRECTORY}/examples/lua/simgrid.${LIB_EXE}
+				${PROJECT_DIRECTORY}/examples/msg/masterslave/simgrid.${LIB_EXE}
+				${PROJECT_DIRECTORY}/examples/simdag/simgrid.${LIB_EXE}
+	)
+	add_custom_command(
+		OUTPUT 	${PROJECT_DIRECTORY}/examples/lua/simgrid.${LIB_EXE}
+				${PROJECT_DIRECTORY}/examples/msg/masterslave/simgrid.${LIB_EXE}
+				${PROJECT_DIRECTORY}/examples/simdag/simgrid.${LIB_EXE}
+		COMMAND ${CMAKE_COMMAND} -E create_symlink ${CMAKE_BINARY_DIR}/lib/libsimgrid.${LIB_EXE} ${PROJECT_DIRECTORY}/examples/lua/simgrid.${LIB_EXE} #for test
+	  	COMMAND ${CMAKE_COMMAND} -E create_symlink ${CMAKE_BINARY_DIR}/lib/libsimgrid.${LIB_EXE} ${PROJECT_DIRECTORY}/examples/msg/masterslave/simgrid.${LIB_EXE} #for test
+	  	COMMAND ${CMAKE_COMMAND} -E create_symlink ${CMAKE_BINARY_DIR}/lib/libsimgrid.${LIB_EXE} ${PROJECT_DIRECTORY}/examples/simdag/simgrid.${LIB_EXE} #for test			
 	)
-	
 endif(HAVE_LUA)
 
 if(HAVE_CGRAPH_LIB AND HAVE_CGRAPH_H)
diff --git a/buildtools/Cmake/MakeJava.cmake b/buildtools/Cmake/MakeJava.cmake
index 32b12ef1ca..5302183287 100644
--- a/buildtools/Cmake/MakeJava.cmake
+++ b/buildtools/Cmake/MakeJava.cmake
@@ -14,10 +14,6 @@ add_custom_command(
   OUTPUT  ${CMAKE_CURRENT_BINARY_DIR}/classes/
   COMMAND ${CMAKE_COMMAND} -E make_directory "${CMAKE_CURRENT_BINARY_DIR}/classes/")
   
-ADD_CUSTOM_COMMAND(
-  TARGET clean
-  COMMAND ${CMAKE_COMMAND} -E remove_directory ${CMAKE_CURRENT_BINARY_DIR}/classes/)
-
 # compile all .java files with javac to .class
 ADD_CUSTOM_COMMAND(
   OUTPUT ${JAVA_CLASSES}
@@ -39,22 +35,54 @@ ADD_CUSTOM_COMMAND(
   COMMENT "Building simgrid.jar..."
 )
 
-ADD_CUSTOM_TARGET(java_basic ALL
-  COMMAND ${JAVA_COMPILE} -d ${PROJECT_DIRECTORY}/examples/java/basic -cp ${CMAKE_CURRENT_BINARY_DIR}/simgrid.jar ${PROJECT_DIRECTORY}/examples/java/basic/*.java
-  DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/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 ${CMAKE_CURRENT_BINARY_DIR}/simgrid.jar ${PROJECT_DIRECTORY}/examples/java/ping_pong/*.java
-  DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/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 ${CMAKE_CURRENT_BINARY_DIR}/simgrid.jar ${PROJECT_DIRECTORY}/examples/java/comm_time/*.java
-  DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/simgrid.jar ${PROJECT_DIRECTORY}/examples/java/comm_time/*.java
-)
+ADD_CUSTOM_COMMAND(
+	OUTPUT  ${PROJECT_DIRECTORY}/examples/java/basic/BasicTest.class
+			${PROJECT_DIRECTORY}/examples/java/basic/FinalizeTask.class
+			${PROJECT_DIRECTORY}/examples/java/basic/Forwarder.class
+			${PROJECT_DIRECTORY}/examples/java/basic/Slave.class
+			${PROJECT_DIRECTORY}/examples/java/basic/Master.class
+			${PROJECT_DIRECTORY}/examples/java/ping_pong/PingPongTest.class
+			${PROJECT_DIRECTORY}/examples/java/ping_pong/Sender.class
+			${PROJECT_DIRECTORY}/examples/java/ping_pong/PingPongTask.class
+			${PROJECT_DIRECTORY}/examples/java/ping_pong/Receiver.class
+			${PROJECT_DIRECTORY}/examples/java/comm_time/FinalizeTask.class
+			${PROJECT_DIRECTORY}/examples/java/comm_time/CommTimeTest.class
+			${PROJECT_DIRECTORY}/examples/java/comm_time/Slave.class
+			${PROJECT_DIRECTORY}/examples/java/comm_time/Master.class
+			${PROJECT_DIRECTORY}/examples/java/suspend/SuspendTest.class
+			${PROJECT_DIRECTORY}/examples/java/suspend/LazyGuy.class
+			${PROJECT_DIRECTORY}/examples/java/suspend/DreamMaster.class
+			
+	DEPENDS simgrid
+            ${CMAKE_CURRENT_BINARY_DIR}/simgrid.jar
+			${PROJECT_DIRECTORY}/examples/java/basic/*.java
+			${PROJECT_DIRECTORY}/examples/java/ping_pong/*.java
+			${PROJECT_DIRECTORY}/examples/java/comm_time/*.java
+			${PROJECT_DIRECTORY}/examples/java/suspend/*.java
+			
+	COMMENT "Build examples for java"	
 	
-ADD_CUSTOM_TARGET(java_suspend ALL
-  COMMAND ${JAVA_COMPILE} -d ${PROJECT_DIRECTORY}/examples/java/suspend -cp ${CMAKE_CURRENT_BINARY_DIR}/simgrid.jar ${PROJECT_DIRECTORY}/examples/java/suspend/*.java
-  DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/simgrid.jar ${PROJECT_DIRECTORY}/examples/java/suspend/*.java
+  	COMMAND ${JAVA_COMPILE} -d ${PROJECT_DIRECTORY}/examples/java/basic -cp ${CMAKE_CURRENT_BINARY_DIR}/simgrid.jar ${PROJECT_DIRECTORY}/examples/java/basic/*.java  
+ 	COMMAND ${JAVA_COMPILE} -d ${PROJECT_DIRECTORY}/examples/java/ping_pong -cp ${CMAKE_CURRENT_BINARY_DIR}/simgrid.jar ${PROJECT_DIRECTORY}/examples/java/ping_pong/*.java
+  	COMMAND ${JAVA_COMPILE} -d ${PROJECT_DIRECTORY}/examples/java/comm_time -cp ${CMAKE_CURRENT_BINARY_DIR}/simgrid.jar ${PROJECT_DIRECTORY}/examples/java/comm_time/*.java
+  	COMMAND ${JAVA_COMPILE} -d ${PROJECT_DIRECTORY}/examples/java/suspend -cp ${CMAKE_CURRENT_BINARY_DIR}/simgrid.jar ${PROJECT_DIRECTORY}/examples/java/suspend/*.java
 )
+
+ADD_CUSTOM_TARGET(simgrid_java_examples ALL
+                  DEPENDS 	${PROJECT_DIRECTORY}/examples/java/basic/BasicTest.class
+							${PROJECT_DIRECTORY}/examples/java/basic/FinalizeTask.class
+							${PROJECT_DIRECTORY}/examples/java/basic/Forwarder.class
+							${PROJECT_DIRECTORY}/examples/java/basic/Slave.class
+							${PROJECT_DIRECTORY}/examples/java/basic/Master.class
+							${PROJECT_DIRECTORY}/examples/java/ping_pong/PingPongTest.class
+							${PROJECT_DIRECTORY}/examples/java/ping_pong/Sender.class
+							${PROJECT_DIRECTORY}/examples/java/ping_pong/PingPongTask.class
+							${PROJECT_DIRECTORY}/examples/java/ping_pong/Receiver.class
+							${PROJECT_DIRECTORY}/examples/java/comm_time/FinalizeTask.class
+							${PROJECT_DIRECTORY}/examples/java/comm_time/CommTimeTest.class
+							${PROJECT_DIRECTORY}/examples/java/comm_time/Slave.class
+							${PROJECT_DIRECTORY}/examples/java/comm_time/Master.class
+							${PROJECT_DIRECTORY}/examples/java/suspend/SuspendTest.class
+							${PROJECT_DIRECTORY}/examples/java/suspend/LazyGuy.class
+							${PROJECT_DIRECTORY}/examples/java/suspend/DreamMaster.class
+)
\ No newline at end of file
-- 
2.20.1