From: Martin Quinson <martin.quinson@loria.fr>
Date: Sat, 25 Jul 2015 12:47:02 +0000 (+0200)
Subject: Revert "please cmake, could you tell us your compiler arguments?"
X-Git-Tag: v3_12~403
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/6f5907c3dce52292185fdff2dc13d1d349778b59

Revert "please cmake, could you tell us your compiler arguments?"

This reverts commit c8f356157e99a791a71bd6408f9d73423c0dab74.
---

diff --git a/buildtools/jenkins/build.sh b/buildtools/jenkins/build.sh
index 2341297558..7226a67a2f 100755
--- a/buildtools/jenkins/build.sh
+++ b/buildtools/jenkins/build.sh
@@ -34,7 +34,7 @@ mkdir $WORKSPACE/build
 cd $WORKSPACE/build
 
 cmake -Denable_documentation=OFF $WORKSPACE
-make dist VERBOSE=1
+make dist
 tar xzf `cat VERSION`.tar.gz
 cd `cat VERSION`
 
@@ -63,7 +63,7 @@ cmake -Denable_debug=ON -Denable_documentation=OFF -Denable_coverage=OFF \
   -Denable_compile_warnings=ON -Denable_smpi=ON -Denable_lib_static=OFF \
   -Denable_latency_bound_tracking=OFF -Denable_gtnets=OFF -Denable_jedule=OFF \
   -Denable_tracing=ON -Denable_java=ON
-make VERBOSE=1
+make
 
 cd $WORKSPACE/build
 cd `cat VERSION`
diff --git a/buildtools/jenkins/run.sh b/buildtools/jenkins/run.sh
index 6d13974b1e..f726799b43 100755
--- a/buildtools/jenkins/run.sh
+++ b/buildtools/jenkins/run.sh
@@ -30,14 +30,14 @@ then
 
     cmake -G "MSYS Makefiles" -Denable_documentation=OFF $WORKSPACE || die 1 "Failed to do the first cmake - Halting"
 
-    make dist VERBOSE=1|| die 2 "Failed to build dist - Halting"
+    make dist || die 2 "Failed to build dist - Halting"
 
     cmake -G "MSYS Makefiles" -Denable_java=ON -Denable_model-checking=OFF -Denable_lua=OFF -Denable_compile_optimizations=ON  -Denable_smpi=ON -Denable_smpi_MPICH3_testsuite=ON -Denable_compile_warnings=OFF -Denable_documentation=OFF . \
     || die 5 "Failed to perform the Cmake for $build_mode - Halting"
 
-    make -j$NUMBER_OF_PROCESSORS VERBOSE=1|| die 5 "Build failure - Halting"
+    make -j$NUMBER_OF_PROCESSORS || die 5 "Build failure - Halting"
 
-    make nsis VERBOSE=1|| die 6 "Failure while generating the Windows executable - Halting"
+    make nsis || die 6 "Failure while generating the Windows executable - Halting"
 
 else
     # Linux:
@@ -49,7 +49,7 @@ else
     cmake -Denable_documentation=OFF $WORKSPACE || die 1 "Failed to do the first cmake - Halting"
 
     rm Simgrid*.tar.gz
-    make dist VERBOSE=1 || die 2 "Failed to build dist - Halting"
+    make dist || die 2 "Failed to build dist - Halting"
 
     tar xzf `cat VERSION`.tar.gz || die 3 "Failed to extract the generated tgz - Halting"
 
@@ -72,7 +72,7 @@ else
 
     [ $? -eq 0 ] || die 5 "Failed to perform the Cmake for $build_mode - Halting"
 
-    make -j$NUMBER_OF_PROCESSORS VERBOSE=1 || die 6 "Build failure - Halting"
+    make -j$NUMBER_OF_PROCESSORS || die 6 "Build failure - Halting"
 fi
 
 echo "running tests with $NUMBER_OF_PROCESSORS processors"
diff --git a/buildtools/jenkins/run_DynamicAnalysis.sh b/buildtools/jenkins/run_DynamicAnalysis.sh
index 39327a0676..3a65693ede 100755
--- a/buildtools/jenkins/run_DynamicAnalysis.sh
+++ b/buildtools/jenkins/run_DynamicAnalysis.sh
@@ -31,7 +31,7 @@ done
 cd $WORKSPACE/build
 
 cmake -Denable_documentation=OFF -Denable_lua=OFF -Denable_tracing=ON -Denable_smpi=ON  -Denable_smpi_MPICH3_testsuite=OFF -Denable_compile_optimizations=OFF -Denable_compile_warnings=ON -Denable_lib_static=OFF -Denable_model-checking=OFF -Denable_latency_bound_tracking=OFF -Denable_gtnets=OFF -Denable_jedule=OFF -Denable_mallocators=OFF -Denable_memcheck_xml=ON $WORKSPACE
-make VERBOSE=1
+make
 
 ctest -D ExperimentalStart || true
 ctest -D ExperimentalConfigure || true
@@ -44,11 +44,11 @@ if [ -f Testing/TAG ] ; then
    mv Testing/`head -n 1 < Testing/TAG`/DynamicAnalysis.xml  $WORKSPACE
 fi
 
-make clean VERBOSE=1
+make clean
 
 cmake -Denable_documentation=OFF -Denable_lua=OFF -Denable_tracing=ON -Denable_smpi=ON -Denable_smpi_MPICH3_testsuite=ON -Denable_compile_optimizations=OFF -Denable_compile_warnings=ON -Denable_lib_static=OFF -Denable_model-checking=OFF -Denable_latency_bound_tracking=OFF -Denable_gtnets=OFF -Denable_jedule=OFF -Denable_mallocators=OFF -Denable_memcheck=OFF -Denable_memcheck_xml=OFF -Denable_coverage=ON $WORKSPACE
 
-make VERBOSE=1
+make
 ctest -D ExperimentalStart || true
 ctest -D ExperimentalConfigure || true
 ctest -D ExperimentalBuild || true