yet another attempt at testing the tuto on jenkins

[simgrid.git] / tools / jenkins / build.sh

diff --git a/tools/jenkins/build.sh b/tools/jenkins/build.sh
index f7ad695..0873ca6 100755 (executable)
--- a/tools/jenkins/build.sh
+++ b/tools/jenkins/build.sh
@@ -89,6 +89,12 @@ fi
 mkdir $WORKSPACE/build
 cd $WORKSPACE/build
 
+have_NS3="no"
+if dpkg -l libns3-dev 2>&1|grep -q "ii  libns3-dev" ; then
+  have_NS3="yes"
+fi
+echo "XX have_NS3: ${have_NS3}"
+
 # This is for Windows:
 PATH="$WORKSPACE/build/lib:$PATH"
 
@@ -119,6 +125,8 @@ echo "XX"
 echo "XX Configure and build SimGrid"
 echo "XX   pwd: "$(pwd)
 echo "XX"
+set -x
+export SIMGRID_INSTALL_PATH=/builds/simgrid_install
 cmake -G"$GENERATOR"\
   -DCMAKE_INSTALL_PREFIX=/builds/simgrid_install \
   -Denable_debug=ON -Denable_documentation=OFF -Denable_coverage=OFF \
@@ -129,8 +137,10 @@ cmake -G"$GENERATOR"\
   -Denable_mallocators=$(onoff test "$build_mode" != "DynamicAnalysis") \
   -Denable_memcheck=$(onoff test "$build_mode" = "DynamicAnalysis") \
   -Denable_compile_warnings=$(onoff test "$GENERATOR" != "MSYS Makefiles") -Denable_smpi=ON \
+  -Denable_ns3=$(onoff test "$have_NS3" = "yes" -a "$build_mode" = "Debug") \
   -Denable_jedule=OFF -Denable_java=ON -Denable_lua=OFF $SRCFOLDER
 #  -Denable_lua=$(onoff test "$build_mode" != "DynamicAnalysis") \
+set +x
 
 make -j$NUMBER_OF_PROCESSORS VERBOSE=1
 
@@ -150,11 +160,12 @@ if [ -f Testing/TAG ] ; then
    mv CTestResults.xml $WORKSPACE
 fi
 
-if test "$(uname -o)" != "Msys" -a "$(build_mode)" = "Debug" ; then
+if test "$(uname -o)" != "Msys" -a "${build_mode}" = "Debug" ; then
   echo "XX"
   echo "XX Test done. Install everything since it's a regular build + not on a Windows."
   echo "XX"
 
+  rm -rf /builds/simgrid_install
   make install
 fi