Fix gtnets detection and add a script to install patched gtnets from simgrid svn.

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

diff --git a/buildtools/pipol/Nightly_simgrid.sh b/buildtools/pipol/Nightly_simgrid.sh
index 382d89a..80f4a22 100644 (file)
--- a/buildtools/pipol/Nightly_simgrid.sh
+++ b/buildtools/pipol/Nightly_simgrid.sh
@@ -3,21 +3,22 @@
 #PRE-PIPOL /home/mescal/navarro/pre-simgrid.sh
 
 #PIPOL esn i386-linux-ubuntu-intrepid.dd.gz none 02:00 --user --silent
+#PIPOL esn amd64-linux-ubuntu-intrepid.dd.gz none 02:00 --user --silent
 
 #PIPOL esn i386-linux-ubuntu-jaunty.dd.gz none 02:00 --user --silent
+#PIPOL esn amd64-linux-ubuntu-jaunty.dd.gz none 02:00 --user --silent
 
 #PIPOL esn i386-linux-ubuntu-karmic.dd.gz none 02:00 --user --silent
 #PIPOL esn amd64-linux-ubuntu-karmic.dd.gz none 02:00 --user --silent
 
-#PIPOL esn i386-linux-debian-lenny.dd.gz none 02:00 --user --silent
-#PIPOL esn amd64-linux-debian-lenny.dd.gz none 02:00 --user --silent
-
-#PIPOL esn i386-linux-debian-testing.dd none 02:00 --user --silent
-
 #PIPOL esn i386-linux-fedora-core11.dd.gz none 02:00 --user --silent
+#PIPOL esn amd64-linux-fedora-core11.dd.gz none 02:00 --user --silent
+
+#PIPOL esn i386_kvm-linux-debian-lenny none 02:00 --user --silent
+#PIPOL esn i386_kvm-linux-debian-testing none 02:00 --user --silent
 
-#PIPOL esn i386-linux-fedora-core12.dd.gz none 02:00 --user --silent
-#PIPOL esn amd64-linux-fedora-core12.dd.gz none 02:00 --user --silent
+#PIPOL esn amd64_kvm-linux-debian-lenny none 02:00 --user --silent
+#PIPOL esn amd64_kvm-linux-debian-testing none 02:00 --user --silent
 
 SYSTEM=`uname`
 
@@ -81,26 +82,6 @@ ctest -D NightlyTest
 ctest -D NightlySubmit
 make clean
 
-#gtnets
-cmake -Denable_lua=on \
--Denable_ruby=on \
--Denable_lib_static=on \
--Denable_graphviz=on \
--Denable_model-checking=off \
--Denable_tracing=on \
--Denable_latency_bound_tracking=on \
--Denable_gtnets=on \
--Dgtnets_path=/usr \
--Denable_java=on \
--Dwith_context=auto \
--Denable_smpi=on .
-ctest -D NightlyStart
-ctest -D NightlyConfigure
-ctest -D NightlyBuild
-ctest -D NightlyTest
-ctest -D NightlySubmit
-make clean
-
 #full_flags
 cmake -Denable_lua=on \
 -Denable_ruby=on \
@@ -110,7 +91,6 @@ cmake -Denable_lua=on \
 -Denable_tracing=on \
 -Denable_latency_bound_tracking=on \
 -Denable_gtnets=off \
--Dgtnets_path=/usr \
 -Denable_java=on \
 -Dwith_context=auto \
 -Denable_compile_optimizations=on \
@@ -132,7 +112,6 @@ cmake -Denable_lua=on \
 -Denable_tracing=on \
 -Denable_latency_bound_tracking=on \
 -Denable_gtnets=off \
--Dgtnets_path=/usr \
 -Denable_java=on \
 -Dwith_context=auto \
 -Denable_compile_optimizations=off \
@@ -154,8 +133,7 @@ cmake -Denable_lua=on \
 -Denable_model-checking=on \
 -Denable_tracing=on \
 -Denable_latency_bound_tracking=on \
--Denable_gtnets=on \
--Dgtnets_path=/usr \
+-Denable_gtnets=off \
 -Denable_java=on \
 -Dwith_context=auto \
 -Denable_compile_optimizations=off \
@@ -221,8 +199,18 @@ if [ $SYSTEM = Linux ] ; then
        cd simgrid-trunk
        
        if [ -e $userhome/usr/lib/libgtsim-opt.so ] ; then
-               #Make gtnets
-               cmake -Denable_supernovae=off -Denable_compile_warnings=off -Denable_compile_optimizations=off -Dgtnets_path=$absolute_path/usr ./
+               #gtnets
+               cmake -Denable_lua=on \
+               -Denable_ruby=on \
+               -Denable_lib_static=on \
+               -Denable_graphviz=on \
+               -Denable_model-checking=off \
+               -Denable_tracing=on \
+               -Denable_latency_bound_tracking=on \
+               -Denable_gtnets=on \
+               -Denable_java=on \
+               -Dwith_context=auto \
+               -Denable_smpi=on .
                ctest -D NightlyStart
                ctest -D NightlyConfigure
                ctest -D NightlyBuild
@@ -234,7 +222,8 @@ fi
 
 if( $PIPOL_IMAGE = i386-linux-ubuntu-karmic.dd.gz )
        #Make the memcheck mode
-       cmake -Denable_gtnets=off -Denable_memcheck=on ./
+       cmake -Denable_gtnets=off \
+       -Denable_memcheck=on ./
        ctest -D NightlyStart
        ctest -D NightlyConfigure
        ctest -D NightlyBuild