Clean and update srcipt for pipol.

[simgrid.git] / buildtools / pipol / Nightly_simgrid.sh

diff --git a/buildtools/pipol/Nightly_simgrid.sh b/buildtools/pipol/Nightly_simgrid.sh
index a44f019..b0b27aa 100644 (file)
--- a/buildtools/pipol/Nightly_simgrid.sh
+++ b/buildtools/pipol/Nightly_simgrid.sh
@@ -31,7 +31,6 @@ cd ./pipol/$PIPOL_HOST
 svn checkout svn://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk simgrid-trunk --quiet
 cd simgrid-trunk
 
-sh ./buildtools/pipol/liste_install.sh
 sh ./buildtools/pipol/install_gtnets.sh ./gtnets_install
 SIMGRID_DIR=`pwd`
 export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$SIMGRID_DIR/gtnets_install/lib
@@ -44,8 +43,6 @@ if [ x$PIPOL_IMAGE == "xamd64_2010-linux-ubuntu-maverick.dd.gz" ] ; then
        #mem-check
        cmake \
        -Denable_lua=off \
-       -Denable_ruby=off \
-       -Denable_java=off \
        -Denable_tracing=off \
        -Denable_smpi=off \
        -Denable_supernovae=off \
@@ -62,13 +59,10 @@ if [ x$PIPOL_IMAGE == "xamd64_2010-linux-ubuntu-maverick.dd.gz" ] ; then
        ctest -D NightlyBuild
        ctest -D NightlyMemCheck
        ctest -D NightlySubmit
-       make clean
 else
        #supernovae
        cmake \
        -Denable_lua=on \
-       -Denable_ruby=on \
-       -Denable_java=on \
        -Denable_tracing=on \
        -Denable_smpi=on \
        -Denable_supernovae=on \
@@ -102,10 +96,10 @@ else
        ctest -D NightlyTest
        ctest -D NightlyCoverage
        ctest -D NightlySubmit
-       make clean
 fi
 
-export SIMGRID_ROOT=$SIMGRID_DIR
+export SIMGRID_ROOT=`pwd`
+
 cd ../
 svn checkout svn://scm.gforge.inria.fr/svn/simgrid/contrib/trunk/simgrid-java simgrid-java --quiet
 cd simgrid-java
@@ -114,4 +108,14 @@ ctest -D NightlyStart
 ctest -D NightlyConfigure
 ctest -D NightlyBuild
 ctest -D NightlyTest
+ctest -D NightlySubmit
+
+cd ../
+svn checkout svn://scm.gforge.inria.fr/svn/simgrid/contrib/trunk/simgrid-ruby simgrid-ruby --quiet
+cd simgrid-ruby
+cmake .
+ctest -D NightlyStart
+ctest -D NightlyConfigure
+ctest -D NightlyBuild
+ctest -D NightlyTest
 ctest -D NightlySubmit
\ No newline at end of file