Add link for bindings during install.

git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@7542 48e7efb5-ca39-0410-a469-dd3cf9ba447f

diff --git a/buildtools/Cmake/src/CMakeCompleteInFiles.txt b/buildtools/Cmake/src/CMakeCompleteInFiles.txt
index 54fe366..0ed3dd2 100644 (file)
--- a/buildtools/Cmake/src/CMakeCompleteInFiles.txt
+++ b/buildtools/Cmake/src/CMakeCompleteInFiles.txt
@@ -113,7 +113,6 @@ endif(disable_java)
 if(disable_gtnets)
        SET(HAVE_GTNETS 0)
 else(disable_gtnets)
-       SET(BUILDNAME "GTNETS" CACHE TYPE INTERNAL FORCE)
        set(GTNETS_LDFLAGS "-L${gtnets_path}/lib")
        set(GTNETS_CPPFLAGS "-I${gtnets_path}/include/gtnets")
        exec_program("${CMAKE_CXX_COMPILER} ${GTNETS_CPPFLAGS} -lgtnets ${GTNETS_LDFLAGS} ${PROJECT_DIRECTORY}/buildtools/Cmake/prog_test/prog_gtnets.cpp " OUTPUT_VARIABLE COMPILE_GTNETS_VAR) 
@@ -289,14 +288,17 @@ if(NOT disable_lua)
 
        if(LUA_LIB_PATH_1)
                set(liblua lua5.1)
+               set(lua_lib_path_to_use ${LUA_LIB_PATH_1})
        endif(LUA_LIB_PATH_1)
 
        if(LUA_LIB_PATH_2)
                set(liblua lua-5.1)
+               set(lua_lib_path_to_use ${LUA_LIB_PATH_2})
        endif(LUA_LIB_PATH_2)
 
        if(LUA_LIB_PATH_3)
                set(liblua lua.5.1.1)
+               set(lua_lib_path_to_use ${LUA_LIB_PATH_3})
        endif(LUA_LIB_PATH_3)
 
        if(NOT LUA_LIB_PATH_1 AND NOT LUA_LIB_PATH_2 AND NOT LUA_LIB_PATH_3)

diff --git a/buildtools/Cmake/src/CMakeDefinePackages.txt b/buildtools/Cmake/src/CMakeDefinePackages.txt
index a73623e..8ae90e1 100644 (file)
--- a/buildtools/Cmake/src/CMakeDefinePackages.txt
+++ b/buildtools/Cmake/src/CMakeDefinePackages.txt
@@ -314,6 +314,13 @@ ${PROJECT_DIRECTORY}/tools/tesh/tesh
 ${PROJECT_DIRECTORY}/tools/MSG_visualization/colorize.pl
 )
 
+if(HAVE_JAVA)
+       set(install_bins
+       ${install_bins}
+       ${PROJECT_DIRECTORY}/src/simgrid.jar
+       )
+endif(HAVE_JAVA)
+
 set(install_libs
 ${PROJECT_DIRECTORY}/src/.libs/libsimgrid.*
 ${PROJECT_DIRECTORY}/src/.libs/libsimgrid_static.*

diff --git a/buildtools/Cmake/src/CMakeDistrib.txt b/buildtools/Cmake/src/CMakeDistrib.txt
index 2bf59ae..55a49b8 100644 (file)
--- a/buildtools/Cmake/src/CMakeDistrib.txt
+++ b/buildtools/Cmake/src/CMakeDistrib.txt
@@ -53,6 +53,8 @@ string(REPLACE "${PROJECT_DIRECTORY}/tools/MSG_visualization/colorize.pl" "${pre
 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
@@ -66,13 +68,30 @@ 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