Fix path for simgrid library.

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

diff --git a/.gitignore b/.gitignore
index 9d42ad3..3af2661 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -25,6 +25,13 @@ _*.c
 config.log
 config.status
 Makefile.in
+*_unit.c
+src/simgrid.jar
+src/simgrid_units_main.c
+src/bindings/ruby/simgrid.so
+examples/ruby/simgrid.so
+examples/lua/simgrid.so
+examples/msg/zmsg_test.trace
 
 buildtools/Cmake/src/tmp_gras_config.h.in
 buildtools/Cmake/src/tmp_tracing_config.h.in

diff --git a/buildtools/Cmake/src/CMakeMakeExeLib.txt b/buildtools/Cmake/src/CMakeMakeExeLib.txt
index cae7627..74fab76 100644 (file)
--- a/buildtools/Cmake/src/CMakeMakeExeLib.txt
+++ b/buildtools/Cmake/src/CMakeMakeExeLib.txt
@@ -15,7 +15,8 @@ set(SMPI_DEP "")
 
 if(HAVE_RUBY)
        set(SIMGRID_DEP "${SIMGRID_DEP} -lm -module")
-       exec_program("ln -sf ${PROJECT_DIRECTORY}/src/.libs/libsimgrid.so ${PROJECT_DIRECTORY}/examples/ruby/simgrid.so" "${PROJECT_DIRECTORY}"  OUTPUT_VARIABLE LIEN_OK)
+       exec_program("ln -sf ${PROJECT_DIRECTORY}/src/.libs/libsimgrid.* ${PROJECT_DIRECTORY}/examples/ruby/simgrid.so" "${PROJECT_DIRECTORY}"  OUTPUT_VARIABLE LIEN_OK)
+       exec_program("ln -sf ${PROJECT_DIRECTORY}/src/.libs/libsimgrid.* ${PROJECT_DIRECTORY}/src/bindings/ruby/simgrid.so" "${PROJECT_DIRECTORY}"  OUTPUT_VARIABLE LIEN_OK)
 endif(HAVE_RUBY)
 
 if(CMAKE_SYSTEM_NAME MATCHES "Darwin")
@@ -35,7 +36,7 @@ endif(pthread)
 
 if(HAVE_LUA)
        SET(SIMGRID_DEP "${SIMGRID_DEP} -ldl -l${liblua}")
-       exec_program("ln -sf ${PROJECT_DIRECTORY}/src/.libs/libsimgrid.so ${PROJECT_DIRECTORY}/examples/lua/simgrid.so" "${PROJECT_DIRECTORY}"  OUTPUT_VARIABLE LIEN_OK)
+       exec_program("ln -sf ${PROJECT_DIRECTORY}/src/.libs/libsimgrid.* ${PROJECT_DIRECTORY}/examples/lua/simgrid.so" "${PROJECT_DIRECTORY}"  OUTPUT_VARIABLE LIEN_OK)
 endif(HAVE_LUA)
 
 if(HAVE_GTNETS)

diff --git a/examples/ruby/MasterSlave.rb b/examples/ruby/MasterSlave.rb
index bd6f69f..1979be7 100644 (file)
--- a/examples/ruby/MasterSlave.rb
+++ b/examples/ruby/MasterSlave.rb
@@ -1,4 +1,4 @@
-require 'simgrid'
+require 'simgrid.so'
 include MSG
 #################################################
 # Class Master

diff --git a/examples/ruby/PingPong.rb b/examples/ruby/PingPong.rb
index 73b5153..9c3769f 100644 (file)
--- a/examples/ruby/PingPong.rb
+++ b/examples/ruby/PingPong.rb
@@ -1,4 +1,4 @@
-require 'simgrid'
+require 'simgrid.so'
 
 include MSG
 
@@ -85,4 +85,4 @@ else
 end
 
 MSG.run
-MSG.exit
\ No newline at end of file
+MSG.exit

diff --git a/examples/ruby/Quicksort.rb b/examples/ruby/Quicksort.rb
index 6c1b550..dff3353 100644 (file)
--- a/examples/ruby/Quicksort.rb
+++ b/examples/ruby/Quicksort.rb
@@ -1,7 +1,7 @@
 # Debug it with this command:
 # make -C ../.. && valgrind ruby MasterSlave.rb --log=ruby.thres:debug 2>&1 | less
 
-require 'simgrid'
+require 'simgrid.so'
 
 include MSG