X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/a711adeffa407b15d22600c0e77d1636e5d77c90..fe39610cd8c7b073a712d1405588512331c4c6d7:/buildtools/Cmake/Distrib.cmake

diff --git a/buildtools/Cmake/Distrib.cmake b/buildtools/Cmake/Distrib.cmake
old mode 100755
new mode 100644
index b2af267ef0..d8de077138
--- a/buildtools/Cmake/Distrib.cmake
+++ b/buildtools/Cmake/Distrib.cmake
@@ -5,21 +5,30 @@ set(CMAKE_INSTALL_PREFIX "${prefix}" CACHE TYPE INTERNAL FORCE)
 #########################################
 	  
 # 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}${prefix}/doc/simgrid/html/"
-	  PATTERN ".svn" EXCLUDE 
-	  PATTERN ".git" EXCLUDE 
-	  PATTERN "*.o" EXCLUDE
-	  PATTERN "*~" EXCLUDE
-	)
+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}${prefix}/doc/simgrid/html/"
+		  PATTERN ".svn" EXCLUDE 
+		  PATTERN ".git" EXCLUDE 
+		  PATTERN "*.o" EXCLUDE
+		  PATTERN "*~" EXCLUDE
+		)
+endif(enable_doc)
+
 # binaries
 install(PROGRAMS ${CMAKE_BINARY_DIR}/bin/smpicc
                  ${CMAKE_BINARY_DIR}/bin/smpirun
-                 ${CMAKE_BINARY_DIR}/bin/tesh
 		DESTINATION $ENV{DESTDIR}${prefix}/bin/)
+if(WIN32)
+	install(PROGRAMS ${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/tesh.pl
+	DESTINATION $ENV{DESTDIR}${prefix}/bin/)
+else(WIN32)
+	install(PROGRAMS ${CMAKE_BINARY_DIR}/bin/tesh
+	DESTINATION $ENV{DESTDIR}${prefix}/bin/)
+endif(WIN32)  
 	
 install(PROGRAMS tools/MSG_visualization/colorize.pl
         DESTINATION $ENV{DESTDIR}${prefix}/bin/
@@ -29,21 +38,24 @@ install(PROGRAMS tools/MSG_visualization/colorize.pl
 install(TARGETS simgrid gras 
         DESTINATION $ENV{DESTDIR}${prefix}/lib/)
 	
-install(FILES ${CMAKE_BINARY_DIR}/lib/libsimgrid_static.a 
-        RENAME libsimgrid.a
-        DESTINATION $ENV{DESTDIR}${prefix}/lib/)
-	
 if(enable_smpi)	
   install(TARGETS smpi
           DESTINATION $ENV{DESTDIR}${prefix}/lib/)
-  install(FILES ${CMAKE_BINARY_DIR}/lib/libsmpi_static.a 
-        RENAME libsmpi.a
-        DESTINATION $ENV{DESTDIR}${prefix}/lib/)
-endif(enable_smpi)	
+endif(enable_smpi)
+
+if(enable_lib_static)
+	install(TARGETS simgrid_static 
+	        DESTINATION $ENV{DESTDIR}${prefix}/lib/)
+	if(enable_smpi)	
+  		install(TARGETS smpi_static
+          		DESTINATION $ENV{DESTDIR}${prefix}/lib/)
+	endif(enable_smpi)
+endif(enable_lib_static)
 
 # include files
 foreach(file ${install_HEADERS})
   get_filename_component(location ${file} PATH)
+  string(REPLACE "${CMAKE_CURRENT_BINARY_DIR}/" "" location "${location}")
   install(FILES ${file}
           DESTINATION $ENV{DESTDIR}${prefix}/${location})
 endforeach(file ${install_HEADERS})
@@ -66,13 +78,13 @@ if(HAVE_LUA)
 	file(MAKE_DIRECTORY "${CMAKE_BINARY_DIR}/lib/lua/5.1")
 	add_custom_target(simgrid_lua ALL
   		DEPENDS simgrid 
-  				${CMAKE_BINARY_DIR}/lib/lua/5.1/simgrid.${LIB_EXE}
+  				${CMAKE_BINARY_DIR}/lib/lua/5.1/simgrid.so
 		)
 	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}
+		OUTPUT ${CMAKE_BINARY_DIR}/lib/lua/5.1/simgrid.so
+		COMMAND ${CMAKE_COMMAND} -E create_symlink ../../libsimgrid.${LIB_EXE} ${CMAKE_BINARY_DIR}/lib/lua/5.1/simgrid.so
 	)
-	install(FILES ${CMAKE_BINARY_DIR}/lib/lua/5.1/simgrid.${LIB_EXE}
+	install(FILES ${CMAKE_BINARY_DIR}/lib/lua/5.1/simgrid.so
 		DESTINATION $ENV{DESTDIR}${prefix}/lib/lua/5.1
 		)
 endif(HAVE_LUA)
@@ -82,13 +94,13 @@ if(HAVE_RUBY)
 	file(MAKE_DIRECTORY "${CMAKE_BINARY_DIR}/lib/ruby/${install_link_ruby}")
 	add_custom_target(ruby_simgrid ALL
 		DEPENDS simgrid
-				${CMAKE_BINARY_DIR}/lib/ruby/${install_link_ruby}/libsimgrid.${LIB_EXE}
+				${CMAKE_BINARY_DIR}/lib/ruby/${install_link_ruby}/libsimgrid.so
 	)
 	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}
+		OUTPUT ${CMAKE_BINARY_DIR}/lib/ruby/${install_link_ruby}/libsimgrid.so
+		COMMAND ${CMAKE_COMMAND} -E create_symlink ../../../libsimgrid.${LIB_EXE} ${CMAKE_BINARY_DIR}/lib/ruby/${install_link_ruby}/libsimgrid.so
 	)
-	install(FILES ${CMAKE_BINARY_DIR}/lib/ruby/${install_link_ruby}/libsimgrid.${LIB_EXE}
+	install(FILES ${CMAKE_BINARY_DIR}/lib/ruby/${install_link_ruby}/libsimgrid.so
 		DESTINATION $ENV{DESTDIR}${prefix}/lib/ruby/${install_link_ruby}/
 	)
 	install(FILES ${PROJECT_DIRECTORY}/src/bindings/ruby/simgrid.rb
@@ -139,7 +151,7 @@ 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 ${prefix}/lib/lua/5.1/simgrid.${LIB_EXE}	
+	COMMAND ${CMAKE_COMMAND} -E remove -f ${prefix}/lib/lua/5.1/simgrid.so
 	WORKING_DIRECTORY "${PROJECT_DIRECTORY}/"
 	)
 endif(HAVE_LUA)
@@ -148,7 +160,7 @@ if(HAVE_RUBY)
 	string(REGEX REPLACE "^.*ruby/" "" install_link_ruby "${RUBY_ARCH_DIR}")
 	add_custom_command(TARGET uninstall
 	COMMAND ${CMAKE_COMMAND} -E echo "uninstall binding ruby ok"
-	COMMAND ${CMAKE_COMMAND} -E remove -f ${prefix}/lib/ruby/${install_link_ruby}/libsimgrid.${LIB_EXE}
+	COMMAND ${CMAKE_COMMAND} -E remove -f ${prefix}/lib/ruby/${install_link_ruby}/libsimgrid.so
 	COMMAND ${CMAKE_COMMAND} -E remove -f ${prefix}/lib/ruby/${install_link_ruby}/simgrid.rb
 	WORKING_DIRECTORY "${PROJECT_DIRECTORY}/"
 	)
@@ -210,6 +222,8 @@ add_custom_target(dist-dir
   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/
 )
 
 set(dirs_in_tarball "")
@@ -240,9 +254,13 @@ endforeach(file ${source_to_pack})
 ######################################
 
 add_custom_target(dist
-  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}
+  DEPENDS ${CMAKE_BINARY_DIR}/simgrid-${release_version}.tar.gz
+)
+add_custom_command(
+	OUTPUT ${CMAKE_BINARY_DIR}/simgrid-${release_version}.tar.gz
+	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}
 )
 add_dependencies(dist dist-dir)