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 5a9bbef..b0b27aa 100644 (file)
--- a/buildtools/pipol/Nightly_simgrid.sh
+++ b/buildtools/pipol/Nightly_simgrid.sh
@@ -31,10 +31,9 @@ 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_ROOT=`pwd`
-export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$SIMGRID_ROOT/gtnets_install/lib
+SIMGRID_DIR=`pwd`
+export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$SIMGRID_DIR/gtnets_install/lib
 perl ./buildtools/pipol/cmake.pl
 perl ./buildtools/pipol/ruby.pl
 
@@ -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 \
@@ -57,18 +54,15 @@ if [ x$PIPOL_IMAGE == "xamd64_2010-linux-ubuntu-maverick.dd.gz" ] ; then
        -Denable_gtnets=off \
        -Denable_jedule=off \
        -Denable_memcheck=on ./
-       ctest -D ExperimentalStart
-       ctest -D ExperimentalConfigure
-       ctest -D ExperimentalBuild
-       ctest -D ExperimentalMemCheck
-       ctest -D ExperimentalSubmit
-       make clean
+       ctest -D NightlyStart
+       ctest -D NightlyConfigure
+       ctest -D NightlyBuild
+       ctest -D NightlyMemCheck
+       ctest -D NightlySubmit
 else
        #supernovae
        cmake \
        -Denable_lua=on \
-       -Denable_ruby=on \
-       -Denable_java=on \
        -Denable_tracing=on \
        -Denable_smpi=on \
        -Denable_supernovae=on \
@@ -102,5 +96,26 @@ else
        ctest -D NightlyTest
        ctest -D NightlyCoverage
        ctest -D NightlySubmit
-       make clean
-fi
\ No newline at end of file
+fi
+
+export SIMGRID_ROOT=`pwd`
+
+cd ../
+svn checkout svn://scm.gforge.inria.fr/svn/simgrid/contrib/trunk/simgrid-java simgrid-java --quiet
+cd simgrid-java
+cmake .
+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