Update scripts for Jenkins, now that Java is gone.

diff --git a/tools/jenkins/Coverage.sh b/tools/jenkins/Coverage.sh
index 8eea064..2eb97cc 100755 (executable)
--- a/tools/jenkins/Coverage.sh
+++ b/tools/jenkins/Coverage.sh
@@ -12,8 +12,6 @@ echo "XXXX Cleanup previous attempts. Remaining content of /tmp:"
 rm -f /tmp/cc*
 rm -f /tmp/*.so
 rm -f /tmp/*.so.*
-rm -rf /tmp/jvm-*
-find "$WORKSPACE" -name "hs_err_pid*.log" -exec rm -f {} +
 ls /tmp
 df -h
 echo "XXXX Let's go"

diff --git a/tools/jenkins/DynamicAnalysis.sh b/tools/jenkins/DynamicAnalysis.sh
index 55d2ad0..1c63f58 100755 (executable)
--- a/tools/jenkins/DynamicAnalysis.sh
+++ b/tools/jenkins/DynamicAnalysis.sh
@@ -12,10 +12,6 @@ echo "XXXX Cleanup previous attempts. Remaining content of /tmp:"
 rm -f /tmp/cc*
 rm -f /tmp/*.so
 rm -f /tmp/*.so.*
-rm -rf /tmp/simgrid-java*
-rm -rf /var/tmp/simgrid-java*
-rm -rf /tmp/jvm-*
-find "$WORKSPACE" -name "hs_err_pid*.log" -exec rm -f {} +
 ls /tmp
 df -h
 echo "XXXX Let's go"

diff --git a/tools/jenkins/build.sh b/tools/jenkins/build.sh
index 131f03c..2d02d04 100755 (executable)
--- a/tools/jenkins/build.sh
+++ b/tools/jenkins/build.sh
@@ -12,8 +12,6 @@ echo "XXXX Cleanup previous attempts. Remaining content of /tmp:"
 rm -f /tmp/cc*
 rm -f /tmp/*.so
 rm -f /tmp/*.so.*
-rm -rf /tmp/jvm-*
-find $WORKSPACE -name "hs_err_pid*.log" -exec rm -f {} +
 ls /tmp
 df -h
 echo "XXXX Let's go"
@@ -186,14 +184,6 @@ echo "XX   pwd: $(pwd)"
 echo "XX"
 set -x
 
-if cmake --version | grep -q 3\.11 ; then
-  # -DCMAKE_DISABLE_SOURCE_CHANGES=ON is broken with java on CMake 3.11
-  # https://gitlab.kitware.com/cmake/cmake/issues/17933
-  MAY_DISABLE_SOURCE_CHANGE=""
-else
-  MAY_DISABLE_SOURCE_CHANGE="-DCMAKE_DISABLE_SOURCE_CHANGES=ON"
-fi
-
 if [ "$os" = "CentOS" ]; then
     if [ "$(ld -v | cut -d\  -f4 | cut -c1-4)" = "2.30" ]; then
         echo "Temporary disable LTO, believed to be broken on this system."
@@ -219,7 +209,7 @@ cmake -G"$GENERATOR" ${INSTALL:+-DCMAKE_INSTALL_PREFIX=$INSTALL} \
   -Denable_compile_warnings=$(onoff test "$GENERATOR" != "MSYS Makefiles") -Denable_smpi=ON \
   -Denable_ns3=$(onoff test "$have_NS3" = "yes" -a "$build_mode" = "Debug") \
   -DSIMGRID_PYTHON_LIBDIR=${SIMGRID_PYTHON_LIBDIR} \
-  ${MAY_DISABLE_SOURCE_CHANGE} ${MAY_DISABLE_LTO} ${MAY_HINT_AT_NS3} \
+  -DCMAKE_DISABLE_SOURCE_CHANGES=ON ${MAY_DISABLE_LTO} ${MAY_HINT_AT_NS3} \
   -Denable_msg=$(onoff test "$build_mode" = "ModelChecker") \
   -DLTO_EXTRA_FLAG="auto" \
   -DCMAKE_CXX_COMPILER_LAUNCHER=ccache \

diff --git a/tools/jenkins/project_description.sh b/tools/jenkins/project_description.sh
index 08f2476..fa0a970 100755 (executable)
--- a/tools/jenkins/project_description.sh
+++ b/tools/jenkins/project_description.sh
@@ -13,10 +13,6 @@ 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"
 }
@@ -135,7 +131,6 @@ 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)),'version');">Eigen3</td>
     <td class=matrix-header style=min-width:50px onclick="sortTable($((++col)),'version');">ns-3</td>
@@ -162,7 +157,6 @@ do
     fi
     boost=$(get_boost)
     compiler=$(get_compiler)
-    java=$(get_java)
     cmake=$(get_cmake)
     eigen3=$(get_eigen3)
     ns3=$(get_ns3)
@@ -200,7 +194,6 @@ 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:left">$ns3</td>