X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/7c2ead33f8ba4a8f9faae51cb9565e5e35f4b234..refs/heads/experimental:/tools/jenkins/project_description.sh
diff --git a/tools/jenkins/project_description.sh b/tools/jenkins/project_description.sh
index 7a75cc22f3..8af5e8d804 100755
--- a/tools/jenkins/project_description.sh
+++ b/tools/jenkins/project_description.sh
@@ -6,34 +6,33 @@ get_boost(){
then
BOOST=$(grep -m 1 "Found Boost:" ./consoleText | sed "s/.*-- Found Boost:.*found suitable version \"\([a-zA-Z0-9\.]*\)\",.*/\1/g")
fi
- echo $BOOST
+ echo "$BOOST"
}
get_compiler(){
grep -m 1 "The C compiler identification" ./consoleText | sed "s/.*-- The C compiler identification is \([a-zA-Z0-9\.]*\)/\1/g"
}
-get_java(){
- grep -m 1 "Found Java:" ./consoleText | sed "s/.*-- Found Java.*found suitable version \"\([a-zA-Z0-9\.]*\)\",.*/\1/g"
-}
-
get_cmake(){
grep -m 1 "Cmake version" ./consoleText| sed "s/.*-- Cmake version \([a-zA-Z0-9\.]*\)/\1/g"
}
+get_eigen3(){
+ sed -n 's/.* Eigen3 library \.\+: \([^ ]*\) in .*/\1/p;T;q' ./consoleText
+}
+
+get_json(){
+ sed -n 's/.* JSON library \.\+: \([^ ]*\) in .*/\1/p;T;q' ./consoleText
+}
+
get_ns3(){
- found=$(grep -c "ns-3 found" ./consoleText)
- if [ $found != 0 ]; then
- echo "â"
- else
- echo ""
- fi
+ sed -n 's/.*-- ns-3 found (v\(3[-.0-9a-z]\+\).*/\1/p;T;q' ./consoleText
}
get_python(){
found=$(grep -c "Compile Python bindings .....: ON" ./consoleText)
- if [ $found != 0 ]; then
- echo "â"
+ if [ "$found" != 0 ]; then
+ grep -m 1 "Found Python3" ./consoleText| sed "s/.*-- Found Python3.*found version \"\([a-zA-Z0-9\.]*\)\".*/\1/g"
else
echo ""
fi
@@ -44,7 +43,7 @@ if [ -f consoleText ]; then
fi
-if [ -z $BUILD_URL ]; then
+if [ -z "$BUILD_URL" ]; then
BUILD_URL="https://ci.inria.fr/simgrid/job/SimGrid/lastBuild"
fi
@@ -53,8 +52,8 @@ wget --quiet ${BUILD_URL}/consoleText >/dev/null 2>&1
nodes=($(sed -n 's/^Triggering SimGrid [^ ]* Debug,//p' ./consoleText| sort))
rm consoleText
-
-echo "
Description of the nodes - Automatically updated by project_description.sh script - Don't edit here
+cat <Description of the nodes - Automatically updated by project_description.sh script - Don't edit here
@@ -76,7 +75,7 @@ function sortTable(n, type) {
table = document.getElementById('configuration-matrix');
switching = true;
//Set the sorting direction to ascending:
- dir = 'asc';
+ dir = 'asc';
/*Make a loop that will continue until
no switching has been done:*/
while (switching) {
@@ -116,7 +115,7 @@ function sortTable(n, type) {
rows[i].parentNode.insertBefore(rows[i + 1], rows[i]);
switching = true;
//Each time a switch is done, increase this count by 1:
- switchcount ++;
+ switchcount ++;
} else {
/*If no switching has been done AND the direction is 'asc',
set the direction to 'desc' and run the while loop again.*/
@@ -126,90 +125,89 @@ function sortTable(n, type) {
}
}
}
-}
-