X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/62e8c6c400739e02fa44461fb9e59f3f2d904590..256187ac5f830a60ae79f441078c20c32be037b2:/buildtools/Cmake/Distrib.cmake

diff --git a/buildtools/Cmake/Distrib.cmake b/buildtools/Cmake/Distrib.cmake
index 5d23b004df..41b88fd142 100644
--- a/buildtools/Cmake/Distrib.cmake
+++ b/buildtools/Cmake/Distrib.cmake
@@ -3,18 +3,16 @@
 #########################################
 	  
 # doc
-if(enable_doc)
-	if(NOT EXISTS ${PROJECT_DIRECTORY}/doc/html/)
-		file(MAKE_DIRECTORY ${PROJECT_DIRECTORY}/doc/html/)
-	endif(NOT EXISTS ${PROJECT_DIRECTORY}/doc/html/)
-		install(DIRECTORY "${PROJECT_DIRECTORY}/doc/html/"
-		  DESTINATION "$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/doc/simgrid/html/"
-		  PATTERN ".svn" EXCLUDE 
-		  PATTERN ".git" EXCLUDE 
-		  PATTERN "*.o" EXCLUDE
-		  PATTERN "*~" EXCLUDE
-		)
-endif(enable_doc)
+if(NOT EXISTS ${CMAKE_HOME_DIRECTORY}/doc/html/)
+	file(MAKE_DIRECTORY ${CMAKE_HOME_DIRECTORY}/doc/html/)
+endif(NOT EXISTS ${CMAKE_HOME_DIRECTORY}/doc/html/)
+install(DIRECTORY "${CMAKE_HOME_DIRECTORY}/doc/html/"
+  DESTINATION "$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/doc/simgrid/html/"
+  PATTERN ".svn" EXCLUDE 
+  PATTERN ".git" EXCLUDE 
+  PATTERN "*.o" EXCLUDE
+  PATTERN "*~" EXCLUDE
+)
 
 # binaries
 install(PROGRAMS ${CMAKE_BINARY_DIR}/bin/smpicc
@@ -24,18 +22,36 @@ install(PROGRAMS ${CMAKE_BINARY_DIR}/bin/smpicc
 		DESTINATION $ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/bin/)
 if(WIN32)
 	install(PROGRAMS ${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/tesh.pl
-	DESTINATION $ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/bin/)
+	DESTINATION $ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/bin/
+	RENAME tesh)
+	add_custom_target(tesh
+	COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/tesh.pl ${CMAKE_BINARY_DIR}/bin/tesh
+	)
 else(WIN32)
 	install(PROGRAMS ${CMAKE_BINARY_DIR}/bin/tesh
 	DESTINATION $ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/bin/)
 endif(WIN32)  
 	
-install(PROGRAMS tools/MSG_visualization/colorize.pl
+install(PROGRAMS ${CMAKE_HOME_DIRECTORY}/tools/MSG_visualization/colorize.pl
         DESTINATION $ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/bin/
 		RENAME simgrid-colorizer)
 		
-install(PROGRAMS tools/simgrid_update_xml.pl
-		DESTINATION $ENV{DESTDIR}${prefix}/bin/)
+add_custom_target(simgrid-colorizer ALL
+COMMENT "Install ${CMAKE_BINARY_DIR}/bin/colorize"
+COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_HOME_DIRECTORY}/tools/MSG_visualization/colorize.pl ${CMAKE_BINARY_DIR}/bin/colorize
+)
+				
+install(PROGRAMS ${CMAKE_HOME_DIRECTORY}/tools/simgrid_update_xml.pl
+		DESTINATION $ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/bin/
+		RENAME simgrid_update_xml)
+		
+add_custom_target(simgrid_update_xml ALL
+COMMENT "Install ${CMAKE_BINARY_DIR}/bin/simgrid_update_xml"
+COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_HOME_DIRECTORY}/tools/simgrid_update_xml.pl ${CMAKE_BINARY_DIR}/bin/simgrid_update_xml
+)
+		
+install(PROGRAMS ${CMAKE_BINARY_DIR}/bin/gras_stub_generator
+		DESTINATION $ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/bin/)
 
 # libraries
 install(TARGETS simgrid gras 
@@ -65,17 +81,21 @@ endforeach(file ${install_HEADERS})
 
 # example files
 foreach(file ${examples_to_install_in_doc})
-  string(REPLACE "${PROJECT_DIRECTORY}/examples/" "" file ${file})
+  string(REPLACE "${CMAKE_HOME_DIRECTORY}/examples/" "" file ${file})
   get_filename_component(location ${file} PATH)
   install(FILES "examples/${file}"
           DESTINATION $ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/doc/simgrid/examples/${location})
 endforeach(file ${examples_to_install_in_doc})
 
+# example README
+foreach(file ${README_examples_files})
+  string(REPLACE "${CMAKE_HOME_DIRECTORY}/examples/" "" file ${file})
+  get_filename_component(location ${file} PATH)
+  install(FILES "examples/${file}"
+          DESTINATION $ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/doc/simgrid/examples/${location})
+endforeach(file ${README_examples_files})
+
 # bindings cruft
-if(HAVE_JAVA)
-  install(FILES ${CMAKE_BINARY_DIR}/simgrid.jar
-          DESTINATION $ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/share/)
-endif(HAVE_JAVA)
 
 if(HAVE_LUA)
 	file(MAKE_DIRECTORY "${CMAKE_BINARY_DIR}/lib/lua/5.1")
@@ -106,7 +126,7 @@ if(HAVE_RUBY)
 	install(FILES ${CMAKE_BINARY_DIR}/lib/ruby/${install_link_ruby}/libsimgrid.${LIB_EXE}
 		DESTINATION $ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/lib/ruby/${install_link_ruby}/
 	)
-	install(FILES ${PROJECT_DIRECTORY}/src/bindings/ruby/simgrid.rb
+	install(FILES ${CMAKE_HOME_DIRECTORY}/src/bindings/ruby/simgrid.rb
 		DESTINATION $ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/lib/ruby/${install_link_ruby}/)
 
 endif(HAVE_RUBY)
@@ -128,6 +148,8 @@ COMMAND ${CMAKE_COMMAND} -E	remove -f ${CMAKE_INSTALL_PREFIX}/bin/smpiff
 COMMAND ${CMAKE_COMMAND} -E	remove -f ${CMAKE_INSTALL_PREFIX}/bin/smpirun
 COMMAND ${CMAKE_COMMAND} -E	remove -f ${CMAKE_INSTALL_PREFIX}/bin/tesh
 COMMAND ${CMAKE_COMMAND} -E	remove -f ${CMAKE_INSTALL_PREFIX}/bin/simgrid-colorizer
+COMMAND ${CMAKE_COMMAND} -E	remove -f ${CMAKE_INSTALL_PREFIX}/bin/simgrid_update_xml
+COMMAND ${CMAKE_COMMAND} -E	remove -f ${CMAKE_INSTALL_PREFIX}/bin/gras_stub_generator
 COMMAND ${CMAKE_COMMAND} -E	echo "uninstall bin ok"
 COMMAND ${CMAKE_COMMAND} -E	remove_directory ${CMAKE_INSTALL_PREFIX}/include/amok
 COMMAND ${CMAKE_COMMAND} -E	remove_directory ${CMAKE_INSTALL_PREFIX}/include/gras
@@ -141,23 +163,15 @@ COMMAND ${CMAKE_COMMAND} -E	remove_directory ${CMAKE_INSTALL_PREFIX}/include/mc
 COMMAND ${CMAKE_COMMAND} -E	remove -f ${CMAKE_INSTALL_PREFIX}/include/simgrid_config.h
 COMMAND ${CMAKE_COMMAND} -E	remove -f ${CMAKE_INSTALL_PREFIX}/include/gras.h 
 COMMAND ${CMAKE_COMMAND} -E	remove -f ${CMAKE_INSTALL_PREFIX}/include/xbt.h
-COMMAND ${CMAKE_COMMAND} -E	echo "uninstal include ok"
+COMMAND ${CMAKE_COMMAND} -E	echo "uninstall include ok"
 WORKING_DIRECTORY "${CMAKE_INSTALL_PREFIX}"
 )
 
-if(HAVE_JAVA)
-	add_custom_command(TARGET uninstall
-	COMMAND ${CMAKE_COMMAND} -E	remove -f ${CMAKE_INSTALL_PREFIX}/share/simgrid.jar
-	COMMAND ${CMAKE_COMMAND} -E echo "uninstall binding java ok"
-	WORKING_DIRECTORY "${PROJECT_DIRECTORY}/"
-	)	
-endif(HAVE_JAVA)
-
 if(HAVE_LUA)
 	add_custom_command(TARGET uninstall
 	COMMAND ${CMAKE_COMMAND} -E echo "uninstall binding lua ok"
 	COMMAND ${CMAKE_COMMAND} -E remove -f ${CMAKE_INSTALL_PREFIX}/lib/lua/5.1/simgrid.${LIB_EXE}
-	WORKING_DIRECTORY "${PROJECT_DIRECTORY}/"
+	WORKING_DIRECTORY "${CMAKE_HOME_DIRECTORY}/"
 	)
 endif(HAVE_LUA)
 
@@ -167,7 +181,7 @@ if(HAVE_RUBY)
 	COMMAND ${CMAKE_COMMAND} -E echo "uninstall binding ruby ok"
 	COMMAND ${CMAKE_COMMAND} -E remove -f ${CMAKE_INSTALL_PREFIX}/lib/ruby/${install_link_ruby}/libsimgrid.${LIB_EXE}
 	COMMAND ${CMAKE_COMMAND} -E remove -f ${CMAKE_INSTALL_PREFIX}/lib/ruby/${install_link_ruby}/simgrid.rb
-	WORKING_DIRECTORY "${PROJECT_DIRECTORY}/"
+	WORKING_DIRECTORY "${CMAKE_HOME_DIRECTORY}/"
 	)
 endif(HAVE_RUBY)
 
@@ -182,18 +196,20 @@ endif(HAVE_RUBY)
 ##########################################
 
 add_custom_target(dist-dir
+  COMMENT "Generating the distribution directory"
   COMMAND test -e simgrid-${release_version}/ && chmod -R a+w simgrid-${release_version}/ || true
   COMMAND ${CMAKE_COMMAND} -E remove_directory simgrid-${release_version}/
   COMMAND ${CMAKE_COMMAND} -E make_directory simgrid-${release_version}
   COMMAND ${CMAKE_COMMAND} -E make_directory simgrid-${release_version}/doc/html/
-  COMMAND ${CMAKE_COMMAND} -E copy_directory ${PROJECT_DIRECTORY}/doc/html/ simgrid-${release_version}/doc/html/
+  COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_HOME_DIRECTORY}/doc/html/ simgrid-${release_version}/doc/html/
 )
+add_dependencies(dist-dir simgrid_documentation)
 
 set(dirs_in_tarball "")
 foreach(file ${source_to_pack})
   #message(${file})
   # This damn prefix is still set somewhere (seems to be in subdirs)
-  string(REPLACE "${PROJECT_DIRECTORY}/" "" file "${file}")
+  string(REPLACE "${CMAKE_HOME_DIRECTORY}/" "" file "${file}")
   
   # Create the directory on need
   get_filename_component(file_location ${file} PATH)
@@ -209,7 +225,7 @@ foreach(file ${source_to_pack})
    # Actually copy the file
    add_custom_command(
      TARGET dist-dir
-     COMMAND ${CMAKE_COMMAND} -E copy ${PROJECT_DIRECTORY}/${file} simgrid-${release_version}/${file_location}/
+     COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_HOME_DIRECTORY}/${file} simgrid-${release_version}/${file_location}/
    )
 endforeach(file ${source_to_pack})
 
@@ -222,6 +238,7 @@ add_custom_target(dist
 )
 add_custom_command(
 	OUTPUT ${CMAKE_BINARY_DIR}/simgrid-${release_version}.tar.gz	
+	COMMENT "Compressing the archive from the distribution directory"
 	COMMAND ${CMAKE_COMMAND} -E tar cf simgrid-${release_version}.tar simgrid-${release_version}/
   	COMMAND gzip -9v simgrid-${release_version}.tar
   	COMMAND ${CMAKE_COMMAND} -E remove_directory simgrid-${release_version}/
@@ -307,14 +324,14 @@ COMMAND ${CMAKE_COMMAND} -E remove -f src/xbt_sha_unit.c
 COMMAND ${CMAKE_COMMAND} -E remove -f src/xbt_str_unit.c
 COMMAND ${CMAKE_COMMAND} -E remove -f src/xbt_strbuff_unit.c
 COMMAND ${CMAKE_COMMAND} -E remove -f src/xbt_synchro_unit.c
-WORKING_DIRECTORY "${PROJECT_DIRECTORY}"
+WORKING_DIRECTORY "${CMAKE_HOME_DIRECTORY}"
 )
 
 add_custom_target(supernovae-clean
 COMMAND ${CMAKE_COMMAND} -E remove -f src/supernovae_gras.c
 COMMAND ${CMAKE_COMMAND} -E remove -f src/supernovae_sg.c
 COMMAND ${CMAKE_COMMAND} -E remove -f src/supernovae_smpi.c
-WORKING_DIRECTORY "${PROJECT_DIRECTORY}"
+WORKING_DIRECTORY "${CMAKE_HOME_DIRECTORY}"
 )
 
 #############################################
@@ -327,7 +344,7 @@ COMMAND chmod a+rX -R doc/
 COMMAND rsync --verbose --cvs-exclude --compress --delete --delete-excluded --rsh=ssh --ignore-times --recursive --links --perms --times --omit-dir-times doc/html/ scm.gforge.inria.fr:/home/groups/simgrid/htdocs/doc/ || true
 COMMAND scp doc/index.php doc/webcruft/robots.txt scm.gforge.inria.fr:/home/groups/simgrid/htdocs/
 COMMAND scp doc/html/simgrid_modules2.png doc/html/simgrid_modules.png doc/webcruft/simgrid_logo.png doc/webcruft/simgrid_logo_small.png scm.gforge.inria.fr:/home/groups/simgrid/htdocs/
-WORKING_DIRECTORY "${PROJECT_DIRECTORY}"
+WORKING_DIRECTORY "${CMAKE_HOME_DIRECTORY}"
 )
 
 include(CPack)