Now working.

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

diff --git a/buildtools/Cmake/src/CMakeMakeExeLib.txt b/buildtools/Cmake/src/CMakeMakeExeLib.txt
index 3b0bcda..086d9b4 100644 (file)
--- a/buildtools/Cmake/src/CMakeMakeExeLib.txt
+++ b/buildtools/Cmake/src/CMakeMakeExeLib.txt
@@ -15,7 +15,7 @@ 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/libsimgrid.so" "${PROJECT_DIRECTORY}"  OUTPUT_VARIABLE LIEN_OK)
+       exec_program("ln -sf ${PROJECT_DIRECTORY}/src/.libs/libsimgrid.so ${PROJECT_DIRECTORY}/src/bindings/ruby/libsimgrid.so" "${PROJECT_DIRECTORY}"  OUTPUT_VARIABLE LIEN_OK)
 endif(HAVE_RUBY)
 
 if(CMAKE_SYSTEM_NAME MATCHES "Darwin")
@@ -35,7 +35,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/libsimgrid.so" "${PROJECT_DIRECTORY}"  OUTPUT_VARIABLE LIEN_OK)
+       exec_program("ln -sf ${PROJECT_DIRECTORY}/src/.libs/libsimgrid.so ${PROJECT_DIRECTORY}/src/bindings/lua/libsimgrid.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 c72375c..bd6f69f 100644 (file)
--- a/examples/ruby/MasterSlave.rb
+++ b/examples/ruby/MasterSlave.rb
@@ -1,4 +1,4 @@
-require 'libsimgrid.so'
+require 'simgrid'
 include MSG
 #################################################
 # Class Master

diff --git a/examples/ruby/PingPong.rb b/examples/ruby/PingPong.rb
index f0c4f1d..26a79f0 100644 (file)
--- a/examples/ruby/PingPong.rb
+++ b/examples/ruby/PingPong.rb
@@ -1,4 +1,4 @@
-require 'libsimgrid.so'
+require 'simgrid'
 
 include MSG
 
@@ -7,7 +7,7 @@ include MSG
 #####################
 
 class PingPongTask < MSG::Task
-  
+
   # The initialize method has no effect 
   @time 
   def setTime(t)

diff --git a/examples/ruby/Quicksort.rb b/examples/ruby/Quicksort.rb
index c3ea74e..6c1b550 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 'libsimgrid.so'
+require 'simgrid'
 
 include MSG
 

diff --git a/src/bindings/ruby/simgrid.rb b/src/bindings/ruby/simgrid.rb
index c81b83d..32fbbe2 100644 (file)
--- a/src/bindings/ruby/simgrid.rb
+++ b/src/bindings/ruby/simgrid.rb
@@ -5,7 +5,7 @@
 # This program is free software; you can redistribute it and/or modify it
 #  under the terms of the license (GNU LGPL) which comes with this package. */
 # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # 
-require 'libsimgrid'
+require 'libsimgrid.so'
 require 'thread'
 
 #######################################