Logo AND Algorithmique Numérique Distribuée

Public GIT Repository
Fix Java on mac.
authorNavarrop <Pierre.Navarro@imag.fr>
Thu, 22 Sep 2011 12:33:20 +0000 (14:33 +0200)
committerNavarrop <Pierre.Navarro@imag.fr>
Thu, 22 Sep 2011 12:34:32 +0000 (14:34 +0200)
Update pipol scripts.

buildtools/pipol/Experimental.sh
buildtools/pipol/Experimental_bindings.sh
buildtools/pipol/Nightly_simgrid.sh
buildtools/pipol/rc.mac

index d49d614..7fada6d 100755 (executable)
@@ -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 \
index 5f3c8f5..c6a90c9 100755 (executable)
@@ -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
index 549e54e..d300cf9 100755 (executable)
@@ -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
index 7b7804b..c14e3ea 100644 (file)
@@ -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