Various cleanups in the scripts. Should be good for now

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

diff --git a/buildtools/README b/buildtools/README
new file mode 100644 (file)
index 0000000..9bfdc8a
--- /dev/null
+++ b/buildtools/README
@@ -0,0 +1,19 @@
+The CMake configuration in this directory cannot be used to build SimGrid
+Instead, it can be used to auto-test it.
+
+To use it, you need a svn checkout under ~/simgrid-svn. Command to create it:
+   cd 
+   svn checkout svn://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk simgrid-svn
+
+Then, you need to create a distribution archive, with this command:
+   ~/simgrid-svn/buildtools/scripts/make_dist.sh
+The archive will be copied into the ~/simgrid directory.
+
+
+Then, you can test the archive with autotools only using that command:
+   ~/simgrid-svn/buildtools/scripts/test_dist_with_autotools.sh   
+Alternatively, you can test the archive with cmake using that command:
+   ~/simgrid-svn/buildtools/scripts/test_dist_with_cmake.sh
+
+Please note that autotools are needed in any cases. Only the test
+mechanism changes between the two pathes so far.
\ No newline at end of file

diff --git a/buildtools/scripts/build_with_autotools.sh b/buildtools/scripts/test_dist_with_autotools.sh
similarity index 79%
rename from buildtools/scripts/build_with_autotools.sh
rename to buildtools/scripts/test_dist_with_autotools.sh
index cb0b462..c773f45 100755 (executable)
--- a/buildtools/scripts/build_with_autotools.sh
+++ b/buildtools/scripts/test_dist_with_autotools.sh
@@ -6,5 +6,7 @@
 source ~/simgrid-svn/buildtools/scripts/simgrid_build.conf
 
 open_archive
-./configure $@
-make
+if [ ! -e Makefile ] ; then
+  ./configure $@
+fi
+./checkall

diff --git a/buildtools/scripts/test_dist_with_cmake.sh b/buildtools/scripts/test_dist_with_cmake.sh
new file mode 100755 (executable)
index 0000000..034be45
--- /dev/null
+++ b/buildtools/scripts/test_dist_with_cmake.sh
@@ -0,0 +1,22 @@
+#! /bin/bash
+# This script waits that the make_dist script finishes building the right archive in ~/simgrid
+# and then builds it using cmake. Warning, cmake is only a wrapper for now, you still need the autotools
+
+
+source ~/simgrid-svn/buildtools/scripts/simgrid_build.conf
+
+open_archive
+
+# Make sure we have cmake installed
+which_cmake=`which cmake` 
+if [ x$which_cmake = x ] ; then
+  echo "Try to install cmake"
+  sudo apt-get install cmake
+fi
+
+# Launch CMake
+cd buildtools/Cmake
+cmake ./
+
+# Run CTest, and push the results
+ctest -D Experimental CTEST_FULL_OUTPUT