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

diff --git a/buildtools/Cmake/src/CMakeDistrib.txt b/buildtools/Cmake/src/CMakeDistrib.txt
index 93645daa77..55a49b847d 100644
--- a/buildtools/Cmake/src/CMakeDistrib.txt
+++ b/buildtools/Cmake/src/CMakeDistrib.txt
@@ -1,11 +1,11 @@
-set(simgrid_version "3.3.5")
+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
-	
+
 foreach(file ${script_to_install})
 	get_filename_component(file_location ${file} PATH)
 	string(REPLACE "${PROJECT_DIRECTORY}/" "/" file_location ${file_location})
@@ -45,31 +45,61 @@ 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}/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 ${prefix}
+COMMAND mkdir -p ${prefix}/bin
 COMMAND mkdir -p ${prefix}/lib
 COMMAND mkdir -p ${prefix}/include
 COMMAND mkdir -p ${prefix}/doc
 COMMAND mkdir -p ${prefix}/doc/simgrid
 COMMAND mkdir -p ${prefix}/doc/simgrid/html
+COMMAND cp ${install_bins} ${prefix}/bin
+COMMAND mv ${prefix}/bin/colorize.pl ${prefix}/bin/simgrid_colorizer.pl
+COMMAND echo "install bin ok"
 COMMAND cp ${install_libs} ${prefix}/lib
 COMMAND echo "install lib ok"
-COMMAND cp -rf ${PROJECT_DIRECTORY}/doc/html/ ${prefix}/doc/simgrid
-COMMAND echo "install doc ok"
 COMMAND cp --parent ${install_HEADERS} ${prefix}
 COMMAND echo "install include ok"
+COMMAND cp -rf ${PROJECT_DIRECTORY}/doc/html/ ${prefix}/doc/simgrid
+COMMAND echo "install doc ok"
 WORKING_DIRECTORY "${PROJECT_DIRECTORY}/"
 )
 
+if(HAVE_LUA)
+	add_custom_target(install-lua
+	COMMAND mkdir --parent ${prefix}/lua/5.1/
+	COMMAND ln -sf ${prefix}/lib/libsimgrid.so ${prefix}/lua/5.1/simgrid.so
+	WORKING_DIRECTORY "${PROJECT_DIRECTORY}/"
+	)
+endif(HAVE_LUA)
+
+if(HAVE_RUBY)
+	add_custom_target(install-ruby
+	COMMAND mkdir --parent ${prefix}/lib/site_ruby${install_link_ruby}/
+	COMMAND ln -sf ${prefix}/lib/libsimgrid.so ${prefix}/lib/site_ruby${install_link_ruby}/libsimgrid.so
+	COMMAND cp ${PROJECT_DIRECTORY}/src/bindings/ruby/simgrid.rb ${prefix}/lib/site_ruby${install_link_ruby}/simgrid.rb
+	WORKING_DIRECTORY "${PROJECT_DIRECTORY}/"
+	)
+endif(HAVE_RUBY)
+
 add_custom_target(uninstall
 COMMAND echo "uninstall simgrid"
 COMMAND rm -rf ${prefix}/doc/simgrid
 COMMAND echo "uninstall doc ok"
 COMMAND rm ${uninstall_libs}
 COMMAND echo "uninstall lib ok"
+COMMAND rm ${uninstall_bins}
+COMMAND echo "uninstall bin ok"
 COMMAND rm ${uninstall_HEADERS}
 COMMAND echo "uninstal include ok"
 COMMAND rm -R ${prefix}/include/amok ${prefix}/include/gras ${prefix}/include/instr ${prefix}/include/msg