X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/17f966eb23cc283701f1334ba7a6f023753ac182..8496661293114d866119c9f0e2a96124e8632bda:/buildtools/Cmake/src/CMakeDistrib.txt

diff --git a/buildtools/Cmake/src/CMakeDistrib.txt b/buildtools/Cmake/src/CMakeDistrib.txt
index ab7e562265..2d690a68c1 100755
--- a/buildtools/Cmake/src/CMakeDistrib.txt
+++ b/buildtools/Cmake/src/CMakeDistrib.txt
@@ -1,10 +1,8 @@
-set(simgrid_version "3.4")
-
 set(CMAKE_PROJECT_NAME "${PROJECT_NAME}")
 set(CPACK_PACKAGE_NAME "${PROJECT_NAME}")
 set(CPACK_PROJECT_NAME "${PROJECT_NAME}")
-set(CPACK_PACKAGE_FILE_NAME "simgrid-${simgrid_version}~${SVN_VERSION}${GIT_DATE}")
-set(CPACK_GENERATOR "TBZ2") #;TGZ;TZ;ZIP
+set(CPACK_PACKAGE_FILE_NAME "simgrid-${release_version}")
+set(CPACK_GENERATOR "TBZ2;TGZ") #;TGZ;TZ;ZIP
 
 foreach(file ${script_to_install})
 	get_filename_component(file_location ${file} PATH)
@@ -43,17 +41,16 @@ PATTERN "*~" EXCLUDE
 set(CPACK_SET_DESTDIR on)
 set(CMAKE_INSTALL_PREFIX ${prefix} CACHE TYPE INTERNAL FORCE)
 
-string(REPLACE ";" "\t" install_HEADERS "${install_HEADERS}")
 string(REPLACE ";" "\t" install_libs "${install_libs}")
 set(uninstall_bins "${install_bins}")
 string(REPLACE "${PROJECT_DIRECTORY}/src/smpi" "${prefix}/bin" uninstall_bins "${uninstall_bins}")
 string(REPLACE "${PROJECT_DIRECTORY}/tools/gras" "${prefix}/bin" uninstall_bins "${uninstall_bins}")
 string(REPLACE "${PROJECT_DIRECTORY}/tools/tesh" "${prefix}/bin" uninstall_bins "${uninstall_bins}")
-string(REPLACE "${PROJECT_DIRECTORY}/tools/MSG_visualization/colorize.pl" "${prefix}/bin/simgrid_colorizer.pl" uninstall_bins "${uninstall_bins}")
+string(REPLACE "${PROJECT_DIRECTORY}/tools/MSG_visualization/colorize.pl" "${prefix}/bin/simgrid-colorizer" uninstall_bins "${uninstall_bins}")
 string(REPLACE "${PROJECT_DIRECTORY}/src/.libs" "${prefix}/lib" uninstall_libs "${install_libs}")
 string(REPLACE "./" "${prefix}/" uninstall_HEADERS "${install_HEADERS}")
 
-string(REPLACE "/usr/lib/ruby" "" install_link_ruby "${RUBY_INCLUDE_PATH}")
+
 
 add_custom_target(install-simgrid
 COMMAND mkdir -p $ENV{DESTDIR}${prefix}
@@ -63,54 +60,59 @@ COMMAND mkdir -p $ENV{DESTDIR}${prefix}/include
 COMMAND mkdir -p $ENV{DESTDIR}${prefix}/doc
 COMMAND mkdir -p $ENV{DESTDIR}${prefix}/doc/simgrid
 COMMAND mkdir -p $ENV{DESTDIR}${prefix}/doc/simgrid/html
+COMMAND mkdir -p $ENV{DESTDIR}${prefix}/include
+COMMAND mkdir -p $ENV{DESTDIR}${prefix}/include/xbt
+COMMAND mkdir -p $ENV{DESTDIR}${prefix}/include/mc
+COMMAND mkdir -p $ENV{DESTDIR}${prefix}/include/msg
+COMMAND mkdir -p $ENV{DESTDIR}${prefix}/include/simdag
+COMMAND mkdir -p $ENV{DESTDIR}${prefix}/include/smpi
+COMMAND mkdir -p $ENV{DESTDIR}${prefix}/include/surf
+COMMAND mkdir -p $ENV{DESTDIR}${prefix}/include/gras
+COMMAND mkdir -p $ENV{DESTDIR}${prefix}/include/amok
+COMMAND mkdir -p $ENV{DESTDIR}${prefix}/include/instr
 COMMAND cp ${install_bins} $ENV{DESTDIR}${prefix}/bin
-COMMAND cp ${PROJECT_DIRECTORY}/tools/MSG_visualization/colorize.pl $ENV{DESTDIR}${prefix}/bin/simgrid_colorizer.pl
+COMMAND cp ${PROJECT_DIRECTORY}/tools/MSG_visualization/colorize.pl $ENV{DESTDIR}${prefix}/bin/simgrid-colorizer
 COMMAND echo "install bin           OK"
 COMMAND cp ${install_libs} $ENV{DESTDIR}${prefix}/lib
 COMMAND echo "install lib           OK"
-COMMAND cp --parent ${install_HEADERS} $ENV{DESTDIR}${prefix}
-COMMAND echo "install include       OK"
-COMMAND cp -rf ${PROJECT_DIRECTORY}/doc/html/ $ENV{DESTDIR}${prefix}/doc/simgrid
-COMMAND echo "install doc/html      OK"
 WORKING_DIRECTORY "${PROJECT_DIRECTORY}/"
 )
 
-foreach(file ${ex_to_svg})
-	string(REPLACE "${PROJECT_DIRECTORY}" "." file "${file}")
+foreach(file ${install_HEADERS})
 	add_custom_command(TARGET install-simgrid
-		COMMAND cp --parents -f ${file} $ENV{DESTDIR}${prefix}/doc/simgrid/
+		COMMAND cp ${file} $ENV{DESTDIR}${prefix}/${file}
 		WORKING_DIRECTORY "${PROJECT_DIRECTORY}"
 	)
-endforeach(file ${ex_to_svg})
+endforeach(file ${install_HEADERS})
 add_custom_command(TARGET install-simgrid
-	COMMAND echo "install doc/examples  OK"
+	COMMAND echo "install include       OK"
 	WORKING_DIRECTORY "${PROJECT_DIRECTORY}"
 )
 
 add_custom_target(uninstall
 COMMAND rm -rf ${prefix}/doc/simgrid
 COMMAND echo "uninstall doc ok"
-COMMAND rm ${uninstall_libs}
+COMMAND rm -f ${uninstall_libs}
 COMMAND echo "uninstall lib ok"
-COMMAND rm ${uninstall_bins}
-COMMAND rm ${prefix}/bin/simgrid_colorizer.pl
+COMMAND rm -f ${uninstall_bins}
+COMMAND rm -f ${prefix}/bin/simgrid_colorizer.pl
 COMMAND echo "uninstall bin ok"
-COMMAND rm ${uninstall_HEADERS}
+COMMAND rm -f ${uninstall_HEADERS}
 COMMAND echo "uninstal include ok"
-COMMAND rm -R ${prefix}/include/amok ${prefix}/include/gras ${prefix}/include/instr ${prefix}/include/msg 
-COMMAND rm -R ${prefix}/include/simdag ${prefix}/include/smpi ${prefix}/include/surf ${prefix}/include/xbt
+COMMAND rm -Rf ${prefix}/include/amok ${prefix}/include/gras ${prefix}/include/instr ${prefix}/include/msg 
+COMMAND rm -Rf ${prefix}/include/simdag ${prefix}/include/smpi ${prefix}/include/surf ${prefix}/include/xbt
 WORKING_DIRECTORY "${prefix}"
 )
 
 if(HAVE_JAVA)
 	add_custom_command(TARGET install-simgrid
-	COMMAND echo "install binding java  OK"
-	COMMAND mkdir --parent $ENV{DESTDIR}${prefix}/share/
+	COMMAND mkdir -p $ENV{DESTDIR}${prefix}/share/
 	COMMAND cp ${PROJECT_DIRECTORY}/src/simgrid.jar $ENV{DESTDIR}${prefix}/share/simgrid.jar
+	COMMAND echo "install binding java  OK"
 	WORKING_DIRECTORY "${PROJECT_DIRECTORY}/"
 	)
 	add_custom_command(TARGET uninstall
-	COMMAND rm ${prefix}/share/simgrid.jar
+	COMMAND rm -f ${prefix}/share/simgrid.jar
 	COMMAND echo "uninstall binding java"
 	WORKING_DIRECTORY "${PROJECT_DIRECTORY}/"
 	)	
@@ -118,42 +120,70 @@ endif(HAVE_JAVA)
 
 if(HAVE_LUA)
 	add_custom_command(TARGET install-simgrid
-	COMMAND echo "install binding lua   OK"
-	COMMAND mkdir --parent $ENV{DESTDIR}${prefix}/lib/lua/5.1/
+	COMMAND mkdir -p $ENV{DESTDIR}${prefix}/lib/lua/5.1/
 	COMMAND ln -sf ${prefix}/lib/libsimgrid.so $ENV{DESTDIR}${prefix}/lib/lua/5.1/simgrid.so
+	COMMAND echo "install binding lua   OK"
 	WORKING_DIRECTORY "${PROJECT_DIRECTORY}/"
 	)
 	add_custom_command(TARGET uninstall
 	COMMAND echo "uninstall binding lua"
-	COMMAND rm ${prefix}/lib/lua/5.1/simgrid.so	
+	COMMAND rm -f ${prefix}/lib/lua/5.1/simgrid.so	
 	WORKING_DIRECTORY "${PROJECT_DIRECTORY}/"
 	)
 endif(HAVE_LUA)
 
 if(HAVE_RUBY)
+	string(REGEX REPLACE "^.*ruby/" "" install_link_ruby "${RUBY_ARCH_DIR}")
 	add_custom_command(TARGET install-simgrid
+	COMMAND mkdir -p "$ENV{DESTDIR}${prefix}/lib/ruby/${install_link_ruby}/"
+	COMMAND ln -sf ${prefix}/lib/libsimgrid.so $ENV{DESTDIR}${prefix}/lib/ruby/${install_link_ruby}/libsimgrid.so
+	COMMAND cp ${PROJECT_DIRECTORY}/src/bindings/ruby/simgrid.rb $ENV{DESTDIR}${prefix}/lib/ruby/${install_link_ruby}/simgrid.rb
 	COMMAND echo "install binding ruby  OK"
-	COMMAND mkdir --parent $ENV{DESTDIR}${prefix}/lib/ruby${install_link_ruby}/
-	COMMAND ln -sf ${prefix}/lib/libsimgrid.so $ENV{DESTDIR}${prefix}/lib/ruby${install_link_ruby}/libsimgrid.so
-	COMMAND cp ${PROJECT_DIRECTORY}/src/bindings/ruby/simgrid.rb $ENV{DESTDIR}${prefix}/lib/ruby${install_link_ruby}/simgrid.rb
 	WORKING_DIRECTORY "${PROJECT_DIRECTORY}/"
 	)
 	add_custom_command(TARGET uninstall
 	COMMAND echo "uninstall binding ruby"
-	COMMAND rm ${prefix}/lib/ruby${install_link_ruby}/libsimgrid.so
-	COMMAND rm ${prefix}/lib/ruby${install_link_ruby}/simgrid.rb
+	COMMAND rm -f ${prefix}/lib/ruby/${install_link_ruby}/libsimgrid.so
+	COMMAND rm -f ${prefix}/lib/ruby/${install_link_ruby}/simgrid.rb
 	WORKING_DIRECTORY "${PROJECT_DIRECTORY}/"
 	)
 endif(HAVE_RUBY)
 
+foreach(file ${directory_to_create})
+	string(REPLACE "${PROJECT_DIRECTORY}" "." file "${file}")
+	add_custom_command(TARGET install-simgrid
+		COMMAND mkdir -p $ENV{DESTDIR}${prefix}/doc/simgrid/${file}
+		WORKING_DIRECTORY "${PROJECT_DIRECTORY}"
+	)
+endforeach(file ${directory_to_create})
+
+foreach(file ${ex_to_svg})
+	string(REPLACE "${PROJECT_DIRECTORY}" "." file "${file}")
+	add_custom_command(TARGET install-simgrid
+		COMMAND cp ${file} $ENV{DESTDIR}${prefix}/doc/simgrid/${file}
+		WORKING_DIRECTORY "${PROJECT_DIRECTORY}"
+	)
+endforeach(file ${ex_to_svg})
+
+add_custom_command(TARGET install-simgrid
+	COMMAND echo "install doc/examples  OK"
+	WORKING_DIRECTORY "${PROJECT_DIRECTORY}"
+)
+
+add_custom_command(TARGET install-simgrid
+	COMMAND cp ${PROJECT_DIRECTORY}/doc/html/* $ENV{DESTDIR}${prefix}/doc/simgrid/html/ || true
+	COMMAND echo "install doc/html      OK"
+	WORKING_DIRECTORY "${PROJECT_DIRECTORY}"
+)
+
 add_custom_target(html
 COMMAND echo "Make the html doc"
 COMMAND echo "cmake -DBIBTEX2HTML=${BIBTEX2HTML} ./"
 COMMAND cmake -DBIBTEX2HTML=${BIBTEX2HTML} ./
 COMMAND rm -rf ${PROJECT_DIRECTORY}/buildtools/Cmake/src/doc/CMakeFiles
-COMMAND rm ${PROJECT_DIRECTORY}/buildtools/Cmake/src/doc/CMakeCache.txt
-COMMAND rm ${PROJECT_DIRECTORY}/buildtools/Cmake/src/doc/cmake_install.cmake
-COMMAND rm ${PROJECT_DIRECTORY}/buildtools/Cmake/src/doc/Makefile
+COMMAND rm -f ${PROJECT_DIRECTORY}/buildtools/Cmake/src/doc/CMakeCache.txt
+COMMAND rm -f ${PROJECT_DIRECTORY}/buildtools/Cmake/src/doc/cmake_install.cmake
+COMMAND rm -f ${PROJECT_DIRECTORY}/buildtools/Cmake/src/doc/Makefile
 WORKING_DIRECTORY "${PROJECT_DIRECTORY}/buildtools/Cmake/src/doc"
 )
 
@@ -162,6 +192,12 @@ COMMAND make package
 COMMAND rm -rf _CPack_Packages
 #WORKING_DIRECTORY "${PROJECT_DIRECTORY}"
 )
+
+add_custom_target(check
+COMMAND make test
+#WORKING_DIRECTORY "${PROJECT_DIRECTORY}"
+)
+
 add_custom_target(distcheck
 COMMAND make package
 COMMAND rm -rf _CPack_Packages
@@ -249,8 +285,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/