[project-description] Fix extraction of the ns-3 version.

[simgrid.git] / tools / jenkins / project_description.sh

diff --git a/tools/jenkins/project_description.sh b/tools/jenkins/project_description.sh
index 74196ff..b002915 100755 (executable)
--- a/tools/jenkins/project_description.sh
+++ b/tools/jenkins/project_description.sh
@@ -22,16 +22,11 @@ get_cmake(){
 }
 
 get_eigen3(){
-  found=$(grep -c "Found Eigen3:" ./consoleText)
-  if [ "$found" != 0 ]; then
-    echo "✔"
-  else
-    echo ""
-  fi
+  sed -n 's/.* Eigen3 library \.\+: \([^ ]*\) in .*/\1/p;T;q' ./consoleText
 }
 
 get_ns3(){
-  grep -m 1 "ns-3 found (v3.[0-9]*; incl:" ./consoleText | sed "s/.*-- ns-3 found .v\(3.[0-9]*\); incl:.*/\1/g"
+  sed -n 's/.*-- ns-3 found (v\(3[-.0-9a-z]\+\); minor:.*/\1/p;T;q' ./consoleText
 }
 
 get_python(){
@@ -136,15 +131,15 @@ function sortTable(n, type) {
   <tr class=matrix-row>
     <td class=matrix-header style=min-width:75px onclick='sortTable($((col=0)));'>Name of the Builder</td>
     <td class=matrix-header style=min-width:75px onclick='sortTable($((++col)));'>OS</td>
-    <td class=matrix-header style=min-width:50px onclick='sortTable(0);'>Debug</td>
-    <td class=matrix-header style=min-width:50px onclick='sortTable(0);'>MC</td>
+    <td class=matrix-header style=min-width:50px onclick='sortTable($((++col,0)));'>Debug</td>
+    <td class=matrix-header style=min-width:50px onclick='sortTable($((++col,0)));'>MC</td>
     <td class=matrix-header style=min-width:75px onclick='sortTable($((++col)));'>Compiler</td>
     <td class=matrix-header style=min-width:75px onclick="sortTable($((++col)),'version');">Boost</td>
     <td class=matrix-header style=min-width:75px onclick="sortTable($((++col)),'version');">Java</td>
     <td class=matrix-header style=min-width:75px onclick="sortTable($((++col)),'version');">Cmake</td>
-    <td class=matrix-header style=min-width:50px onclick='sortTable($((++col)));'>Eigen3</td>
+    <td class=matrix-header style=min-width:50px onclick="sortTable($((++col)),'version');">Eigen3</td>
     <td class=matrix-header style=min-width:50px onclick="sortTable($((++col)),'version');">ns-3</td>
-    <td class=matrix-header style=min-width:50px onclick='sortTable($((++col)));'>Python</td>
+    <td class=matrix-header style=min-width:50px onclick="sortTable($((++col)),'version');">Python</td>
   </tr>
 EOF