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
jenkins: use ninja when available as it's a few percent faster
[simgrid.git]
/
tools
/
jenkins
/
build.sh
diff --git
a/tools/jenkins/build.sh
b/tools/jenkins/build.sh
index
a9d9d64
..
3f15e2e
100755
(executable)
--- a/
tools/jenkins/build.sh
+++ b/
tools/jenkins/build.sh
@@
-129,6
+129,11
@@
echo "Branch built is $branch_name"
NUMBER_OF_PROCESSORS="$(nproc)" || NUMBER_OF_PROCESSORS=1
GENERATOR="Unix Makefiles"
NUMBER_OF_PROCESSORS="$(nproc)" || NUMBER_OF_PROCESSORS=1
GENERATOR="Unix Makefiles"
+BUILDER=make
+if which ninja 2>/dev/null >/dev/null ; then
+ GENERATOR=Ninja
+ BUILDER=ninja
+fi
ulimit -c 0 || true
ulimit -c 0 || true
@@
-169,7
+174,7
@@
echo "XX pwd: $(pwd)"
echo "XX"
cmake -G"$GENERATOR" -Denable_documentation=OFF "$WORKSPACE"
echo "XX"
cmake -G"$GENERATOR" -Denable_documentation=OFF "$WORKSPACE"
-
make
dist -j $NUMBER_OF_PROCESSORS
+
${BUILDER}
dist -j $NUMBER_OF_PROCESSORS
SIMGRID_VERSION=$(cat VERSION)
echo "XX"
SIMGRID_VERSION=$(cat VERSION)
echo "XX"
@@
-217,7
+222,7
@@
cmake -G"$GENERATOR" ${INSTALL:+-DCMAKE_INSTALL_PREFIX=$INSTALL} \
-DCMAKE_CXX_COMPILER_LAUNCHER=ccache \
"$SRCFOLDER"
-DCMAKE_CXX_COMPILER_LAUNCHER=ccache \
"$SRCFOLDER"
-
make
-j $NUMBER_OF_PROCESSORS VERBOSE=1 tests
+
${BUILDER}
-j $NUMBER_OF_PROCESSORS VERBOSE=1 tests
echo "XX"
echo "XX Run the tests"
echo "XX"
echo "XX Run the tests"
@@
-233,7
+238,7
@@
if test -n "$INSTALL" && [ "${branch_name}" = "origin/master" ] ; then
rm -rf "$INSTALL"
rm -rf "$INSTALL"
-
make
install
+
${BUILDER}
install
fi
echo "XX"
fi
echo "XX"