From: Navarrop <Pierre.Navarro@imag.fr>
Date: Thu, 22 Sep 2011 12:33:20 +0000 (+0200)
Subject: Fix Java on mac.
X-Git-Tag: v3_6_2~57
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/456956406393b0d3e514252750cadb3178e97243

Fix Java on mac.
Update pipol scripts.
---

diff --git a/buildtools/pipol/Experimental.sh b/buildtools/pipol/Experimental.sh
index d49d614e95..7fada6d0c2 100755
--- a/buildtools/pipol/Experimental.sh
+++ b/buildtools/pipol/Experimental.sh
@@ -15,10 +15,11 @@ cd simgrid
 
 perl ./buildtools/pipol/cmake.pl
 perl ./buildtools/pipol/ruby.pl
-	
-sh ./buildtools/pipol/install_gtnets.sh ./gtnets_install
-SIMGRID_ROOT=`pwd`
-export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$SIMGRID_ROOT/gtnets_install/lib
+
+#Those 3 lines is for GTNetS
+#sh ./buildtools/pipol/install_gtnets.sh ./gtnets_install
+#SIMGRID_ROOT=`pwd`
+#export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$SIMGRID_ROOT/gtnets_install/lib
 
 #supernovae
 cmake \
diff --git a/buildtools/pipol/Experimental_bindings.sh b/buildtools/pipol/Experimental_bindings.sh
index 5f3c8f5a17..c6a90c9095 100755
--- a/buildtools/pipol/Experimental_bindings.sh
+++ b/buildtools/pipol/Experimental_bindings.sh
@@ -31,6 +31,9 @@ export DYLD_LIBRARY_PATH=`pwd`/lib #for mac
 cd ../
 git clone git://scm.gforge.inria.fr/simgrid/simgrid-java.git simgrid-java --quiet
 cd simgrid-java
+export DYLD_LIBRARY_PATH=$DYLD_LIBRARY_PATH:`pwd`/lib
+export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:`pwd`/lib #for mac
+
 cmake .
 ctest -D ExperimentalStart
 ctest -D ExperimentalConfigure
diff --git a/buildtools/pipol/Nightly_simgrid.sh b/buildtools/pipol/Nightly_simgrid.sh
index 549e54ebfc..d300cf92cb 100755
--- a/buildtools/pipol/Nightly_simgrid.sh
+++ b/buildtools/pipol/Nightly_simgrid.sh
@@ -104,8 +104,10 @@ export SIMGRID_ROOT=`pwd`
 export LD_LIBRARY_PATH=`pwd`/lib
 export DYLD_LIBRARY_PATH=`pwd`/lib              
 cd ../
-svn checkout svn://scm.gforge.inria.fr/svn/simgrid/contrib/trunk/simgrid-java simgrid-java --quiet
+git clone git://scm.gforge.inria.fr/simgrid/simgrid-java.git simgrid-java --quiet
 cd simgrid-java
+export DYLD_LIBRARY_PATH=$DYLD_LIBRARY_PATH:`pwd`/lib
+export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:`pwd`/lib
 cmake .
 ctest -D NightlyStart
 ctest -D NightlyConfigure
diff --git a/buildtools/pipol/rc.mac b/buildtools/pipol/rc.mac
index 7b7804b44d..c14e3ea522 100644
--- a/buildtools/pipol/rc.mac
+++ b/buildtools/pipol/rc.mac
@@ -7,6 +7,10 @@
 #sudo port install lua
 #sudo port select bf2c
 
+sudo port install ruby19
+sudo ln -sf /opt/local/lib/libruby.1.9.1.dylib /usr/lib/libruby.dylib
+sudo ln -sf /opt/local/bin/ruby1.9 /usr/bin/ruby
+
 #sudo port select gcc mp-gcc46
 
 which_gcc=`which gcc`		#gcc gcc necessary