X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/7721f9d25945759e012f67181e69550a3a222eb0..1753c00431344391ba6c76a80f41cd2c93c1f2f0:/buildtools/Cmake/Distrib.cmake

diff --git a/buildtools/Cmake/Distrib.cmake b/buildtools/Cmake/Distrib.cmake
index e1c87a33b0..f22e55cf8b 100755
--- a/buildtools/Cmake/Distrib.cmake
+++ b/buildtools/Cmake/Distrib.cmake
@@ -1,11 +1,13 @@
-set(CMAKE_INSTALL_PREFIX ${prefix} CACHE TYPE INTERNAL FORCE)
+set(CMAKE_INSTALL_PREFIX "${prefix}" CACHE TYPE INTERNAL FORCE)
 
 #########################################
 ### Fill in the "make install" target ###
 #########################################
 	  
 # doc
-if(EXISTS ${PROJECT_DIRECTORY}/doc/html/)
+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 
@@ -13,8 +15,6 @@ if(EXISTS ${PROJECT_DIRECTORY}/doc/html/)
 	  PATTERN "*.o" EXCLUDE
 	  PATTERN "*~" EXCLUDE
 	)
-endif(EXISTS ${PROJECT_DIRECTORY}/doc/html/)
-
 # binaries
 install(PROGRAMS ${CMAKE_BINARY_DIR}/bin/smpicc
                  ${CMAKE_BINARY_DIR}/bin/smpirun
@@ -36,6 +36,9 @@ install(FILES ${CMAKE_BINARY_DIR}/lib/libsimgrid_static.a
 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)	
 
 # include files
@@ -60,18 +63,29 @@ if(HAVE_JAVA)
 endif(HAVE_JAVA)
 
 if(HAVE_LUA)
-  add_custom_target(absolute_liblink ALL
-    COMMAND ${CMAKE_COMMAND} -E create_symlink $ENV{DESTDIR}${prefix}/lib/libsimgrid.so ${CMAKE_BINARY_DIR}/libsimgrid.so)
-  install(FILES ${CMAKE_BINARY_DIR}/libsimgrid.so
-          DESTINATION $ENV{DESTDIR}${prefix}/lib/lua/5.1
-	  RENAME simgrid.so)
+	file(MAKE_DIRECTORY "${CMAKE_BINARY_DIR}/lib/lua/5.1")
+	add_custom_target(simgrid_lua ALL
+  		COMMAND ${CMAKE_COMMAND} -E create_symlink ../../libsimgrid.so ${CMAKE_BINARY_DIR}/lib/lua/5.1/simgrid.so
+  		DEPENDS simgrid
+		)
+	install(FILES ${CMAKE_BINARY_DIR}/lib/lua/5.1/simgrid.so
+		DESTINATION $ENV{DESTDIR}${prefix}/lib/lua/5.1
+		)
 endif(HAVE_LUA)
 
 if(HAVE_RUBY)
-  string(REGEX REPLACE "^.*ruby/" "" install_link_ruby "${RUBY_ARCH_DIR}")
-  install(FILES ${CMAKE_BINARY_DIR}/libsimgrid.so
-                ${PROJECT_DIRECTORY}/src/bindings/ruby/simgrid.rb
-          DESTINATION $ENV{DESTDIR}${prefix}/lib/ruby/${install_link_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.so ${CMAKE_BINARY_DIR}/lib/ruby/${install_link_ruby}/libsimgrid.so
+	DEPENDS simgrid
+	)
+	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
+		DESTINATION $ENV{DESTDIR}${prefix}/lib/ruby/${install_link_ruby}/)
+
 endif(HAVE_RUBY)
 
 ###########################################
@@ -81,13 +95,15 @@ endif(HAVE_RUBY)
 add_custom_target(uninstall
 COMMAND ${CMAKE_COMMAND} -E	remove_directory ${prefix}/doc/simgrid
 COMMAND ${CMAKE_COMMAND} -E	echo "uninstall doc ok"
-COMMAND ${CMAKE_COMMAND} -E	remove -f ${uninstall_libs}
+COMMAND ${CMAKE_COMMAND} -E	remove -f ${prefix}/lib/libgras*
+COMMAND ${CMAKE_COMMAND} -E	remove -f ${prefix}/lib/libsimgrid*
+COMMAND ${CMAKE_COMMAND} -E	remove -f ${prefix}/lib/libsmpi*
 COMMAND ${CMAKE_COMMAND} -E	echo "uninstall lib ok"
-COMMAND ${CMAKE_COMMAND} -E	remove -f ${uninstall_bins}
-COMMAND ${CMAKE_COMMAND} -E	remove -f ${prefix}/bin/simgrid_colorizer.pl
+COMMAND ${CMAKE_COMMAND} -E	remove -f ${prefix}/bin/smpicc
+COMMAND ${CMAKE_COMMAND} -E	remove -f ${prefix}/bin/smpirun
+COMMAND ${CMAKE_COMMAND} -E	remove -f ${prefix}/bin/tesh
+COMMAND ${CMAKE_COMMAND} -E	remove -f ${prefix}/bin/simgrid-colorizer
 COMMAND ${CMAKE_COMMAND} -E	echo "uninstall bin ok"
-COMMAND ${CMAKE_COMMAND} -E	remove -f ${uninstall_HEADERS}
-COMMAND ${CMAKE_COMMAND} -E	echo "uninstal include ok"
 COMMAND ${CMAKE_COMMAND} -E	remove_directory ${prefix}/include/amok
 COMMAND ${CMAKE_COMMAND} -E	remove_directory ${prefix}/include/gras
 COMMAND ${CMAKE_COMMAND} -E	remove_directory ${prefix}/include/instr
@@ -96,20 +112,25 @@ COMMAND ${CMAKE_COMMAND} -E	remove_directory ${prefix}/include/simdag
 COMMAND ${CMAKE_COMMAND} -E	remove_directory ${prefix}/include/smpi
 COMMAND ${CMAKE_COMMAND} -E	remove_directory ${prefix}/include/surf
 COMMAND ${CMAKE_COMMAND} -E	remove_directory ${prefix}/include/xbt
+COMMAND ${CMAKE_COMMAND} -E	remove_directory ${prefix}/include/mc
+COMMAND ${CMAKE_COMMAND} -E	remove -f ${prefix}/include/simgrid_config.h
+COMMAND ${CMAKE_COMMAND} -E	remove -f ${prefix}/include/gras.h 
+COMMAND ${CMAKE_COMMAND} -E	remove -f ${prefix}/include/xbt.h
+COMMAND ${CMAKE_COMMAND} -E	echo "uninstal include ok"
 WORKING_DIRECTORY "${prefix}"
 )
 
 if(HAVE_JAVA)
 	add_custom_command(TARGET uninstall
 	COMMAND ${CMAKE_COMMAND} -E	remove -f ${prefix}/share/simgrid.jar
-	COMMAND ${CMAKE_COMMAND} -E echo "uninstall binding java"
+	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"
+	COMMAND ${CMAKE_COMMAND} -E echo "uninstall binding lua ok"
 	COMMAND ${CMAKE_COMMAND} -E remove -f ${prefix}/lib/lua/5.1/simgrid.so	
 	WORKING_DIRECTORY "${PROJECT_DIRECTORY}/"
 	)
@@ -118,7 +139,7 @@ endif(HAVE_LUA)
 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"
+	COMMAND ${CMAKE_COMMAND} -E echo "uninstall binding ruby ok"
 	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}/"
@@ -133,11 +154,11 @@ add_custom_target(html
 COMMAND ${CMAKE_COMMAND} -E echo "Make the html doc"
 COMMAND ${CMAKE_COMMAND} -E echo "cmake -DBIBTEX2HTML=${BIBTEX2HTML} ./"
 COMMAND ${CMAKE_COMMAND} -DBIBTEX2HTML=${BIBTEX2HTML} ./
-COMMAND ${CMAKE_COMMAND} -E remove_directory ${PROJECT_DIRECTORY}/buildtools/Cmake/src/doc/CMakeFiles
-COMMAND ${CMAKE_COMMAND} -E remove -f ${PROJECT_DIRECTORY}/buildtools/Cmake/src/doc/CMakeCache.txt
-COMMAND ${CMAKE_COMMAND} -E remove -f ${PROJECT_DIRECTORY}/buildtools/Cmake/src/doc/cmake_install.cmake
-COMMAND ${CMAKE_COMMAND} -E remove -f ${PROJECT_DIRECTORY}/buildtools/Cmake/src/doc/Makefile
-WORKING_DIRECTORY "${PROJECT_DIRECTORY}/buildtools/Cmake/src/doc"
+COMMAND ${CMAKE_COMMAND} -E remove_directory ${PROJECT_DIRECTORY}/buildtools/Cmake/doc/CMakeFiles
+COMMAND ${CMAKE_COMMAND} -E remove -f ${PROJECT_DIRECTORY}/buildtools/Cmake/doc/CMakeCache.txt
+COMMAND ${CMAKE_COMMAND} -E remove -f ${PROJECT_DIRECTORY}/buildtools/Cmake/doc/cmake_install.cmake
+COMMAND ${CMAKE_COMMAND} -E remove -f ${PROJECT_DIRECTORY}/buildtools/Cmake/doc/Makefile
+WORKING_DIRECTORY "${PROJECT_DIRECTORY}/buildtools/Cmake/doc"
 )
 
 ################################################################
@@ -157,7 +178,7 @@ add_custom_target(dist-dir
 )
 
 set(dirs_in_tarball "")
-foreach(file ${source_to_pack} ${txt_files})
+foreach(file ${source_to_pack})
   # This damn prefix is still set somewhere (seems to be in subdirs)
   string(REPLACE "${PROJECT_DIRECTORY}/" "" file ${file})
   
@@ -196,9 +217,11 @@ add_dependencies(dist dist-dir)
 
 # Allow to test the "make dist"
 add_custom_target(distcheck
+  COMMAND ${CMAKE_COMMAND} -E remove_directory simgrid-${release_version}.cpy 
+  COMMAND ${CMAKE_COMMAND} -E copy_directory simgrid-${release_version}/ simgrid-${release_version}.cpy 
   COMMAND ${CMAKE_COMMAND} -E make_directory simgrid-${release_version}/_build
   COMMAND ${CMAKE_COMMAND} -E make_directory simgrid-${release_version}/_inst
-  
+ 
   # This stupid cmake creates a directory in source, killing the purpose of the chmod
   # (tricking around)
   COMMAND ${CMAKE_COMMAND} -E make_directory simgrid-${release_version}/CMakeFiles 
@@ -209,10 +232,18 @@ add_custom_target(distcheck
   
   COMMAND ${CMAKE_COMMAND} -E chdir simgrid-${release_version}/_build ${CMAKE_COMMAND} build ..  -Dprefix=../_inst
 #  COMMAND ${CMAKE_COMMAND} -E chdir simgrid-${release_version}/_build make dist-dir
-  COMMAND ${CMAKE_COMMAND} -E chdir simgrid-${release_version}/_build make 
-  COMMAND ${CMAKE_COMMAND} -E chdir simgrid-${release_version}/_build ctest -j5 --output-on-failure
+  COMMAND ${CMAKE_COMMAND} -E chdir simgrid-${release_version}/_build make
+  
+  # This fails, unfortunately, because GRAS is broken for now
+#  COMMAND ${CMAKE_COMMAND} -E chdir simgrid-${release_version}/_build ctest -j5 --output-on-failure
+
+  COMMAND ${CMAKE_COMMAND} -E echo "XXX Check that cleaning works"
   COMMAND ${CMAKE_COMMAND} -E chdir simgrid-${release_version}/_build make clean
-#  COMMAND ${CMAKE_COMMAND} -E remove_directory simgrid-${release_version}/
+  COMMAND ${CMAKE_COMMAND} -E remove_directory simgrid-${release_version}/_build
+  COMMAND ${CMAKE_COMMAND} -E remove_directory simgrid-${release_version}/_inst
+  COMMAND diff -ruN simgrid-${release_version}.cpy simgrid-${release_version}
+  COMMAND ${CMAKE_COMMAND} -E remove_directory simgrid-${release_version}.cpy 
+  COMMAND ${CMAKE_COMMAND} -E remove_directory simgrid-${release_version}/
 )
 add_dependencies(distcheck dist-dir)
 
@@ -220,10 +251,15 @@ add_dependencies(distcheck dist-dir)
 ### Fill in the "make check" target ###
 #######################################
 
-add_custom_target(check
-COMMAND make test
-#WORKING_DIRECTORY "${PROJECT_DIRECTORY}"
-)
+if(enable_memcheck)
+	add_custom_target(check
+	COMMAND ctest -D ExperimentalMemCheck
+	)
+else(enable_memcheck)
+	add_custom_target(check
+	COMMAND make test
+	)
+endif(enable_memcheck)
 
 #######################################
 ### Fill in the "make all-clean" target ###