X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/aab9e27873c858d6136fecad6d57a61a115c1ca2..dce3629eaa9e90590280c46209d6ec5dabeb982c:/tools/jenkins/project_description.sh

diff --git a/tools/jenkins/project_description.sh b/tools/jenkins/project_description.sh
index 2b6389ebe8..4a52a6fc65 100755
--- a/tools/jenkins/project_description.sh
+++ b/tools/jenkins/project_description.sh
@@ -13,25 +13,20 @@ 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(){
-  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_json(){
+  sed -n 's/.* JSON 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(){
@@ -140,9 +135,9 @@ function sortTable(n, type) {
     <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');">JSON</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)),'version');">Python</td>
   </tr>
@@ -167,9 +162,9 @@ do
     fi
     boost=$(get_boost)
     compiler=$(get_compiler)
-    java=$(get_java)
     cmake=$(get_cmake)
     eigen3=$(get_eigen3)
+    json=$(get_json)
     ns3=$(get_ns3)
     py=$(get_python)
     os=$(grep -m 1 "OS Version" ./consoleText| sed "s/OS Version : \(.*\)/\1/g")
@@ -205,9 +200,9 @@ do
     <td class="matrix-cell" style="text-align:center">${statusmc}</td>
     <td class="matrix-cell" style="text-align:left">$compiler</td>
     <td class="matrix-cell" style="text-align:left">$boost</td>
-    <td class="matrix-cell" style="text-align:left">$java</td>
     <td class="matrix-cell" style="text-align:left">$cmake</td>
     <td class="matrix-cell" style="text-align:center">$eigen3</td>
+    <td class="matrix-cell" style="text-align:center">$json</td>
     <td class="matrix-cell" style="text-align:left">$ns3</td>
     <td class="matrix-cell" style="text-align:left">$py</td>
   </tr>
@@ -215,40 +210,4 @@ EOF
     rm consoleText
 done
 
-
-#Appveyor - get ID of the last job with the API
-BUILD_ID=$(curl -s "https://ci.appveyor.com/api/projects/mquinson/simgrid" | grep -o '\[{"jobId":"[a-zA-Z0-9]*",' | sed "s/\[{\"jobId\":\"//" | sed "s/\",//")
-wget --quiet https://ci.appveyor.com/api/buildjobs/"$BUILD_ID"/log -O ./consoleText >/dev/null 2>&1
-sed -i -e "s/\r//g" ./consoleText
-node="<a href=\"https://ci.appveyor.com/project/mquinson/simgrid\">appveyor</a>"
-os="Windows Server 2012 - VS2015 + mingw64 5.3.0"
-boost=$(get_boost)
-compiler=$(get_compiler)
-java=$(get_java)
-cmake=$(get_cmake)
-eigen3=$(get_eigen3)
-ns3=$(get_ns3)
-py=$(get_python)
-success=$(grep -m 1 "Build success" ./consoleText)
-ball="${icons[failure]}"
-if [ -n "$success" ]; then
-  ball="${icons[success]}"
-fi
-cat <<EOF
-  <tr>
-    <td class="matrix-leftcolumn">$node</td>
-    <td class="matrix-cell" style="text-align:left">$os</td>
-    <td class="matrix-cell" style="text-align:center"><${ball}></td>
-    <td class="matrix-cell" style="text-align:center"><${icons[disabled]}></td>
-    <td class="matrix-cell" style="text-align:left">$compiler</td>
-    <td class="matrix-cell" style="text-align:left">$boost</td>
-    <td class="matrix-cell" style="text-align:left">$java</td>
-    <td class="matrix-cell" style="text-align:left">$cmake</td>
-    <td class="matrix-cell" style="text-align:center">$eigen3</td>
-    <td class="matrix-cell" style="text-align:left">$ns3</td>
-    <td class="matrix-cell" style="text-align:left">$py</td>
-  </tr>
-EOF
-rm consoleText
-
 echo "</table>"