A
lgorithmique
N
umérique
D
istribuée
Public GIT Repository
projects
/
simgrid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Allow to give search directory on command line.
[simgrid.git]
/
tools
/
jenkins
/
build.sh
diff --git
a/tools/jenkins/build.sh
b/tools/jenkins/build.sh
index
37fbdb6
..
7f98d0f
100755
(executable)
--- a/
tools/jenkins/build.sh
+++ b/
tools/jenkins/build.sh
@@
-66,7
+66,7
@@
case "$build_mode" in
;;
esac
;;
esac
-if test "$(uname
-o
)" = "Msys"; then
+if test "$(uname)" = "Msys"; then
if [ -z "$NUMBER_OF_PROCESSORS" ]; then
NUMBER_OF_PROCESSORS=1
fi
if [ -z "$NUMBER_OF_PROCESSORS" ]; then
NUMBER_OF_PROCESSORS=1
fi
@@
-98,7
+98,7
@@
echo "XX have_NS3: ${have_NS3}"
# This is for Windows:
PATH="$WORKSPACE/build/lib:$PATH"
# This is for Windows:
PATH="$WORKSPACE/build/lib:$PATH"
-if test "$(uname
-o
)" != "Msys"; then
+if test "$(uname)" != "Msys"; then
echo "XX"
echo "XX Build the archive out of the tree"
echo "XX pwd: "$(pwd)
echo "XX"
echo "XX Build the archive out of the tree"
echo "XX pwd: "$(pwd)
@@
-126,13
+126,17
@@
echo "XX Configure and build SimGrid"
echo "XX pwd: "$(pwd)
echo "XX"
set -x
echo "XX pwd: "$(pwd)
echo "XX"
set -x
-cmake -G"$GENERATOR"\
- -DCMAKE_INSTALL_PREFIX=/builds/simgrid_install \
+if [ "$build_mode" = "ModelChecker" ] ; then
+ INSTALL="-DCMAKE_INSTALL_PREFIX=/builds/mc_simgrid_install"
+elif [ "$build_mode" = "Debug" ] ; then
+ INSTALL="-DCMAKE_INSTALL_PREFIX=/builds/simgrid_install"
+fi
+cmake -G"$GENERATOR" $INSTALL \
-Denable_debug=ON -Denable_documentation=OFF -Denable_coverage=OFF \
-Denable_model-checking=$(onoff test "$build_mode" = "ModelChecker") \
-Denable_smpi_ISP_testsuite=$(onoff test "$build_mode" = "ModelChecker") \
-Denable_compile_optimizations=$(onoff test "$build_mode" != "DynamicAnalysis") \
-Denable_debug=ON -Denable_documentation=OFF -Denable_coverage=OFF \
-Denable_model-checking=$(onoff test "$build_mode" = "ModelChecker") \
-Denable_smpi_ISP_testsuite=$(onoff test "$build_mode" = "ModelChecker") \
-Denable_compile_optimizations=$(onoff test "$build_mode" != "DynamicAnalysis") \
- -Denable_smpi_MPICH3_testsuite=$(onoff test "$build_mode"
!= "DynamicAnalysis
") \
+ -Denable_smpi_MPICH3_testsuite=$(onoff test "$build_mode"
= "Debug
") \
-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_mallocators=$(onoff test "$build_mode" != "DynamicAnalysis") \
-Denable_memcheck=$(onoff test "$build_mode" = "DynamicAnalysis") \
-Denable_compile_warnings=$(onoff test "$GENERATOR" != "MSYS Makefiles") -Denable_smpi=ON \
@@
-143,7
+147,7
@@
set +x
make -j$NUMBER_OF_PROCESSORS VERBOSE=1
make -j$NUMBER_OF_PROCESSORS VERBOSE=1
-if test "$(uname
-o
)" != "Msys"; then
+if test "$(uname)" != "Msys"; then
cd $WORKSPACE/build
cd $(cat VERSION)/build
fi
cd $WORKSPACE/build
cd $(cat VERSION)/build
fi
@@
-159,12
+163,14
@@
if [ -f Testing/TAG ] ; then
mv CTestResults.xml $WORKSPACE
fi
mv CTestResults.xml $WORKSPACE
fi
-if test "$(uname
-o)" != "Msys" -a "${build_mode}" = "Debug
" ; then
+if test "$(uname
)" != "Msys" && test "${build_mode}" = "Debug" -o "${build_mode}" = "ModelChecker
" ; then
echo "XX"
echo "XX"
- echo "XX Test done. Install everything since it's a regular build
+
not on a Windows."
+ echo "XX Test done. Install everything since it's a regular build
,
not on a Windows."
echo "XX"
echo "XX"
- rm -rf /builds/simgrid_install
+ test "${build_mode}" = "Debug" && rm -rf /builds/simgrid_install
+ test "${build_mode}" = "ModelChecker" && rm -rf /builds/mc_simgrid_install
+
make install
fi
make install
fi