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

diff --git a/buildtools/Cmake/src/CMakeDistrib.txt b/buildtools/Cmake/src/CMakeDistrib.txt
index 55a49b847d..1a76c577e0 100644
--- a/buildtools/Cmake/src/CMakeDistrib.txt
+++ b/buildtools/Cmake/src/CMakeDistrib.txt
@@ -64,7 +64,7 @@ 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 cp ${PROJECT_DIRECTORY}/tools/MSG_visualization/colorize.pl ${prefix}/bin/simgrid_colorizer.pl
 COMMAND echo "install bin ok"
 COMMAND cp ${install_libs} ${prefix}/lib
 COMMAND echo "install lib ok"
@@ -75,30 +75,13 @@ 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 rm ${prefix}/bin/simgrid_colorizer.pl
 COMMAND echo "uninstall bin ok"
 COMMAND rm ${uninstall_HEADERS}
 COMMAND echo "uninstal include ok"
@@ -107,6 +90,50 @@ COMMAND rm -R ${prefix}/include/simdag ${prefix}/include/smpi ${prefix}/include/
 WORKING_DIRECTORY "${prefix}"
 )
 
+if(HAVE_JAVA)
+	add_custom_command(TARGET install-simgrid
+	COMMAND echo "install binding java"
+	COMMAND mkdir --parent ${prefix}/share/
+	COMMAND cp ${PROJECT_DIRECTORY}/src/simgrid.jar ${prefix}/share/simgrid.jar
+	WORKING_DIRECTORY "${PROJECT_DIRECTORY}/"
+	)
+	add_custom_command(TARGET uninstall
+	COMMAND rm ${prefix}/share/simgrid.jar
+	COMMAND echo "uninstall binding java"
+	WORKING_DIRECTORY "${PROJECT_DIRECTORY}/"
+	)	
+endif(HAVE_JAVA)
+
+if(HAVE_LUA)
+	add_custom_command(TARGET install-simgrid
+	COMMAND echo "install binding lua"
+	COMMAND mkdir --parent ${prefix}/lib/lua/5.1/
+	COMMAND ln -sf ${prefix}/lib/libsimgrid.so ${prefix}/lib/lua/5.1/simgrid.so
+	WORKING_DIRECTORY "${PROJECT_DIRECTORY}/"
+	)
+	add_custom_command(TARGET uninstall
+	COMMAND echo "uninstall binding lua"
+	COMMAND rm ${prefix}/lib/lua/5.1/simgrid.so	
+	WORKING_DIRECTORY "${PROJECT_DIRECTORY}/"
+	)
+endif(HAVE_LUA)
+
+if(HAVE_RUBY)
+	add_custom_command(TARGET install-simgrid
+	COMMAND echo "install binding 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}/"
+	)
+	add_custom_command(TARGET uninstall
+	COMMAND echo "uninstall binding ruby"
+	COMMAND rm ${prefix}/lib/site_ruby${install_link_ruby}/libsimgrid.so
+	COMMAND rm ${prefix}/lib/site_ruby${install_link_ruby}/simgrid.rb
+	WORKING_DIRECTORY "${PROJECT_DIRECTORY}/"
+	)
+endif(HAVE_RUBY)
+
 add_custom_target(html
 COMMAND echo "Make the html doc"
 COMMAND echo "cmake -DBIBTEX2HTML=${BIBTEX2HTML} ./"