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
added platform for ns3 wifi example
[simgrid.git]
/
tools
/
jenkins
/
build.sh
diff --git
a/tools/jenkins/build.sh
b/tools/jenkins/build.sh
index 3f24abedb57e19d2f48c2e131d6dbf2c0c29bbe4..2045041db054fae775e539b055b43304b5c85cdd 100755
(executable)
--- a/
tools/jenkins/build.sh
+++ b/
tools/jenkins/build.sh
@@
-31,7
+31,7
@@
die () {
shift
[ $# -gt 0 ] || set -- "Error - Halting"
echo "$@" >&2
shift
[ $# -gt 0 ] || set -- "Error - Halting"
echo "$@" >&2
- exit
$status
+ exit
"$status"
}
# Get an ON/OFF string from a command:
}
# Get an ON/OFF string from a command:
@@
-81,7
+81,7
@@
if [ -f /mnt/c/Windows/System32/WindowsPowerShell/v1.0/powershell.exe ]; then
PATH="/mnt/c/Windows/System32/WindowsPowerShell/v1.0/:$PATH"
major=$(powershell.exe -command "[environment]::OSVersion.Version.Major" | sed 's/\r//g')
build=$(powershell.exe -command "[environment]::OSVersion.Version.Build"| sed 's/\r//g')
PATH="/mnt/c/Windows/System32/WindowsPowerShell/v1.0/:$PATH"
major=$(powershell.exe -command "[environment]::OSVersion.Version.Major" | sed 's/\r//g')
build=$(powershell.exe -command "[environment]::OSVersion.Version.Build"| sed 's/\r//g')
- ver=
"$major v$build - WSL $os $ver"
+ ver="$major v$build - WSL $os $ver"
os=Windows
fi
os=Windows
fi
@@
-134,13
+134,13
@@
ulimit -c 0 || true
echo "XX"
echo "XX Get out of the tree"
echo "XX"
echo "XX"
echo "XX Get out of the tree"
echo "XX"
-if [ -d
$WORKSPACE
/build ]
+if [ -d
"$WORKSPACE"
/build ]
then
# Windows cannot remove the directory if it's still used by the previous build
then
# Windows cannot remove the directory if it's still used by the previous build
- rm -rf
$WORKSPACE/build || sleep 10 && rm -rf $WORKSPACE/build || sleep 10 && rm -rf $WORKSPACE
/build
+ rm -rf
"$WORKSPACE"/build || sleep 10 && rm -rf "$WORKSPACE"/build || sleep 10 && rm -rf "$WORKSPACE"
/build
fi
fi
-mkdir
$WORKSPACE
/build
-cd
$WORKSPACE
/build
+mkdir
"$WORKSPACE"
/build
+cd
"$WORKSPACE"
/build
have_NS3="no"
if dpkg -l libns3-dev 2>&1|grep -q "ii libns3-dev" ; then
have_NS3="no"
if dpkg -l libns3-dev 2>&1|grep -q "ii libns3-dev" ; then
@@
-153,25
+153,25
@@
PATH="$WORKSPACE/build/lib:$PATH"
echo "XX"
echo "XX Build the archive out of the tree"
echo "XX"
echo "XX Build the archive out of the tree"
-echo "XX pwd:
"$(pwd)
+echo "XX pwd:
$(pwd)"
echo "XX"
echo "XX"
-cmake -G"$GENERATOR" -Denable_documentation=OFF
$WORKSPACE
+cmake -G"$GENERATOR" -Denable_documentation=OFF
"$WORKSPACE"
make dist -j $NUMBER_OF_PROCESSORS
SIMGRID_VERSION=$(cat VERSION)
echo "XX"
echo "XX Open the resulting archive"
echo "XX"
make dist -j $NUMBER_OF_PROCESSORS
SIMGRID_VERSION=$(cat VERSION)
echo "XX"
echo "XX Open the resulting archive"
echo "XX"
-gunzip
${SIMGRID_VERSION}
.tar.gz
-tar xf
${SIMGRID_VERSION}
.tar
-mkdir
${WORKSPACE}/build/${SIMGRID_VERSION}
/build
-cd
${WORKSPACE}/build/${SIMGRID_VERSION}
/build
+gunzip
"${SIMGRID_VERSION}"
.tar.gz
+tar xf
"${SIMGRID_VERSION}"
.tar
+mkdir
"${WORKSPACE}"/build/"${SIMGRID_VERSION}"
/build
+cd
"${WORKSPACE}"/build/"${SIMGRID_VERSION}"
/build
SRCFOLDER="${WORKSPACE}/build/${SIMGRID_VERSION}"
echo "XX"
echo "XX Configure and build SimGrid"
SRCFOLDER="${WORKSPACE}/build/${SIMGRID_VERSION}"
echo "XX"
echo "XX Configure and build SimGrid"
-echo "XX pwd:
"$(pwd)
+echo "XX pwd:
$(pwd)"
echo "XX"
set -x
echo "XX"
set -x
@@
-183,13
+183,6
@@
else
MAY_DISABLE_SOURCE_CHANGE="-DCMAKE_DISABLE_SOURCE_CHANGES=ON"
fi
MAY_DISABLE_SOURCE_CHANGE="-DCMAKE_DISABLE_SOURCE_CHANGES=ON"
fi
-if [ "$os" = "NixOS" ] && [ "$(gcc -dumpversion)" = "7.4.0" ]; then
- echo "Temporary disable LTO, believed to be broken on this system."
- MAY_DISABLE_LTO=-Denable_lto=OFF
-else
- MAY_DISABLE_LTO=
-fi
-
cmake -G"$GENERATOR" ${INSTALL:+-DCMAKE_INSTALL_PREFIX=$INSTALL} \
-Denable_debug=ON -Denable_documentation=OFF -Denable_coverage=OFF \
-Denable_model-checking=$(onoff test "$build_mode" = "ModelChecker") \
cmake -G"$GENERATOR" ${INSTALL:+-DCMAKE_INSTALL_PREFIX=$INSTALL} \
-Denable_debug=ON -Denable_documentation=OFF -Denable_coverage=OFF \
-Denable_model-checking=$(onoff test "$build_mode" = "ModelChecker") \
@@
-200,8
+193,11
@@
cmake -G"$GENERATOR" ${INSTALL:+-DCMAKE_INSTALL_PREFIX=$INSTALL} \
-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_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 ${MAY_DISABLE_SOURCE_CHANGE} ${MAY_DISABLE_LTO} \
- $SRCFOLDER
+ -Denable_jedule=OFF -Denable_lua=OFF ${MAY_DISABLE_SOURCE_CHANGE} \
+ -Denable_java=$(onoff test "$build_mode" = "ModelChecker") \
+ -Denable_msg=$(onoff test "$build_mode" = "ModelChecker") \
+ -DLTO_EXTRA_FLAG="auto" \
+ "$SRCFOLDER"
# -Denable_lua=$(onoff test "$build_mode" != "DynamicAnalysis") \
set +x
# -Denable_lua=$(onoff test "$build_mode" != "DynamicAnalysis") \
set +x
@@
-214,7
+210,7
@@
echo "XX"
ctest -T test --output-on-failure --no-compress-output || true
ctest -T test --output-on-failure --no-compress-output || true
-if test -n "$INSTALL" && [
${branch_name}
= "origin/master" ] ; then
+if test -n "$INSTALL" && [
"${branch_name}"
= "origin/master" ] ; then
echo "XX"
echo "XX Test done. Install everything since it's a regular build, not on a Windows."
echo "XX"
echo "XX"
echo "XX Test done. Install everything since it's a regular build, not on a Windows."
echo "XX"