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
Rename the CondVar observer as it should
[simgrid.git]
/
BuildSimGrid.sh
diff --git
a/BuildSimGrid.sh
b/BuildSimGrid.sh
index
8876b63
..
410d1dd
100755
(executable)
--- a/
BuildSimGrid.sh
+++ b/
BuildSimGrid.sh
@@
-1,26
+1,40
@@
#!/usr/bin/env sh
#
# This little script rebuilds and runs the SimGrid archive in parallel, extracting a log
#!/usr/bin/env sh
#
# This little script rebuilds and runs the SimGrid archive in parallel, extracting a log
-# This is almost a
n inter
nal script, but others may find this useful
+# This is almost a
perso
nal script, but others may find this useful
#
#
-# Copyright (c) 2017-20
18
The SimGrid Team. Licence: LGPL of WDFPL, as you want.
+# Copyright (c) 2017-20
23
The SimGrid Team. Licence: LGPL of WDFPL, as you want.
-if [ ! -e Makefile ] ; then
- echo "Please configure SimGrid before building it:"
- echo " ccmake ."
- exit 1
+if [ ! -e Makefile ] && [ ! -e build.ninja ]; then
+ if [ -e build/default/Makefile ] ; then
+ cd build/default
+ else
+ echo "Please configure SimGrid before building it:"
+ echo " ccmake ."
+ exit 1
+ fi
fi
fi
-target=all
+target=examples
+ncores=$(grep -c processor /proc/cpuinfo)
+halfcores=$(expr $ncores / 2 + 1)
install_path=$(sed -n 's/^CMAKE_INSTALL_PREFIX:PATH=//p' CMakeCache.txt)
install_path=$(sed -n 's/^CMAKE_INSTALL_PREFIX:PATH=//p' CMakeCache.txt)
-if [ -e ${install_path}
-a -d ${install_path} -a -x
${install_path} ] ; then
+if [ -e ${install_path}
] && [ -d ${install_path} ] && [ -x ${install_path} ] && [ -w
${install_path} ] ; then
target=install
fi
target=install
fi
+if [ -e build.ninja ] ; then
+ builder="ninja"
+else
+ builder="make"
+fi
+
(
echo "install_path: ${install_path}"
echo "Target: ${target}"
(
echo "install_path: ${install_path}"
echo "Target: ${target}"
- (nice make -j4 ${target} || make) && nice ctest -j4 --output-on-failure ; date
+ echo "Cores to build: ${ncores}"
+ echo "Cores to test: ${halfcores}"
+ (nice ${builder} -j${ncores} ${target} tests || ${builder} ${target} tests) && nice ctest -j${halfcores} --output-on-failure ; date
) 2>&1 | tee BuildSimGrid.sh.log
) 2>&1 | tee BuildSimGrid.sh.log
-exit 0
+