Cdash cosmetics.

git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@7637 48e7efb5-ca39-0410-a469-dd3cf9ba447f

diff --git a/CMakeLists.txt b/CMakeLists.txt
index af0ff37..7fddeef 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,4 +1,5 @@
 cmake_minimum_required(VERSION 2.6)
+exec_program("rm ${Project_BINARY_DIR}/CTestTestfile.cmake" OUTPUT_VARIABLE rmok)
 SET(CMAKE_LANGUAGE "Cxx")
 SET(PROJECT_NAME "Simgrid")
 SET(PROJECT_LABEL "Simgrid")
@@ -74,6 +75,5 @@ foreach(test ${LIST_OF_TEST})
                string(REGEX REPLACE "^.*Test.*\\:+" " " test ${test}) #for ctest version 2.8
                string(STRIP ${test} test)
                set_tests_properties(${test} PROPERTIES LABELS "rev${SVN_VERSION}")
-               message("${test}")
        endif(test_ok_1 OR test_ok_2)
 endforeach(test ${LIST_OF_TEST})

diff --git a/buildtools/pipol/Experimental_all_simgrid_gt.sh b/buildtools/pipol/Experimental_all_simgrid_gt.sh
index 888a3c3..9ef07f4 100644 (file)
--- a/buildtools/pipol/Experimental_all_simgrid_gt.sh
+++ b/buildtools/pipol/Experimental_all_simgrid_gt.sh
@@ -2,8 +2,6 @@
 
 SYSTEM=`uname`
 
-sh /home/mescal/navarro/liste_install.sh
-
 if [ -e ./pipol ] ; then
        rm -rf ./pipol/$PIPOL_HOST
        mkdir ./pipol/$PIPOL_HOST
@@ -12,9 +10,10 @@ else
        rm -rf ./pipol/$PIPOL_HOST
        mkdir ./pipol/$PIPOL_HOST
 fi
-
 cd ./pipol/$PIPOL_HOST
 
+sh /home/mescal/navarro/liste_install.sh
+
 svn checkout svn://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk simgrid-trunk --quiet
 cd simgrid-trunk
 

diff --git a/buildtools/pipol/Nightly_simgrid.sh b/buildtools/pipol/Nightly_simgrid.sh
index 7045f17..7b872dd 100644 (file)
--- a/buildtools/pipol/Nightly_simgrid.sh
+++ b/buildtools/pipol/Nightly_simgrid.sh
@@ -21,20 +21,18 @@
 
 SYSTEM=`uname`
 
-sh /home/mescal/navarro/liste_install.sh
-
-
 if [ -e ./pipol ] ; then
-       rm -r ./pipol/$PIPOL_HOST
+       rm -rf ./pipol/$PIPOL_HOST
        mkdir ./pipol/$PIPOL_HOST
 else
        mkdir ./pipol
-       rm -r ./pipol/$PIPOL_HOST
+       rm -rf ./pipol/$PIPOL_HOST
        mkdir ./pipol/$PIPOL_HOST
 fi
-
 cd ./pipol/$PIPOL_HOST
 
+sh /home/mescal/navarro/liste_install.sh
+
 svn checkout svn://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk simgrid-trunk --quiet
 cd simgrid-trunk
 

diff --git a/buildtools/pipol/liste_install.sh b/buildtools/pipol/liste_install.sh
index 879f96d..b0059be 100644 (file)
--- a/buildtools/pipol/liste_install.sh
+++ b/buildtools/pipol/liste_install.sh
@@ -6,21 +6,6 @@ if [ -e /usr/bin/yum ] ; then
        sudo yum -y update
 fi
 
-which_cmake=`which cmake`      #cmake necessary
-echo $which_cmake
-if [ x$which_cmake = x ] ; then
-  echo "Try to install cmake"
-  if [ -e /usr/bin/apt-get ] ; then
-    sudo apt-get -y install cmake
-  fi
-  if [ -e /usr/bin/yum ] ; then
-    sudo yum -y install cmake
-  fi
-  if [ x$arch = xDarwin ] ; then
-    sudo fink -y install cmake
-  fi
-fi
-
 which_svn=`which svn`  #svn necessary
 echo $which_svn
 if [ x$which_svn = x ] ; then
@@ -138,3 +123,45 @@ if [ x$which_unzip = x ] ; then
     sudo fink -y install unzip
   fi
 fi
+
+which_cmake=`which cmake`      #cmake necessary
+echo $which_cmake
+if [ x$which_cmake = x ] ; then
+  echo "Try to install cmake"
+  if [ -e /usr/bin/apt-get ] ; then
+    sudo apt-get -y remove cmake
+    sudo apt-get -y install cmake
+  fi
+  if [ -e /usr/bin/yum ] ; then
+    sudo yum -y install cmake
+  fi
+  if [ x$arch = xDarwin ] ; then
+    sudo fink -y install cmake
+  fi
+fi
+
+which_cmake_version=`cmake --version`
+which_cpack_version=`cpack --version`
+which_ctest_version=`ctest --version`
+echo "current version of cmake : $which_cmake_version"
+echo "current version of cpack : $which_cpack_version"
+echo "current version of ctest : $which_ctest_version"
+if [ "x$which_cmake_version" != "xcmake version 2.8.1" ] ; then
+       which_cmake=`which cmake`
+       which_cpack=`which cpack`
+       which_ctest=`which ctest`
+       cp -rf ../../cmake-2.8.1/ ./
+       cd ./cmake-2.8.1/
+       cmake . > /dev/null
+       make -j > /dev/null 2>&1
+       sudo ln -sf `pwd`/bin/cmake $which_cmake
+       sudo ln -sf `pwd`/bin/cpack $which_cpack
+       sudo ln -sf `pwd`/bin/ctest $which_ctest
+       which_cmake_version=`cmake --version`
+       which_cpack_version=`cpack --version`
+       which_ctest_version=`ctest --version`
+       echo "new version of cmake : $which_cmake_version"
+       echo "new version of cpack : $which_cpack_version"
+       echo "new version of ctest : $which_ctest_version"
+       cd ..
+fi