Fix some small glitches

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

diff --git a/buildtools/Cmake/cmake_simgrid.conf b/buildtools/Cmake/cmake_simgrid.conf
index fbda2fb..1ab7a2d 100644 (file)
--- a/buildtools/Cmake/cmake_simgrid.conf
+++ b/buildtools/Cmake/cmake_simgrid.conf
@@ -24,15 +24,15 @@ get_version() {
 # wait_archive: wait until the archive gets defined into the right position
 wait_archive() {
   while [ ! -e ${SIMGRID_BASEDIR}/${version}.tar.gz ] ; do
 # wait_archive: wait until the archive gets defined into the right position
 wait_archive() {
   while [ ! -e ${SIMGRID_BASEDIR}/${version}.tar.gz ] ; do

-    echo ${SIMGRID_BASEDIR}/${version}.tar.gz not found. Wait one second.
-    sleep 1
+    echo ${SIMGRID_BASEDIR}/${version}.tar.gz not found. Wait five seconds.
+    sleep 5

   done
 }
 
 # make_dist: rebuild an archive from the svn
 make_dist() {
   get_version
   done
 }
 
 # make_dist: rebuild an archive from the svn
 make_dist() {
   get_version

-  if [ ! -e ${SIMGRID_BASEDIR}/${version}.tar.gz ] ; do
+  if [ ! -e ${SIMGRID_BASEDIR}/${version}.tar.gz ] ; then

     echo "rebuild the missing files for compilation"
     ./bootstrap && ./configure --enable-maintainer-mode --disable-compile-optimizations
     echo "Make the archive"
     echo "rebuild the missing files for compilation"
     ./bootstrap && ./configure --enable-maintainer-mode --disable-compile-optimizations
     echo "Make the archive"


@@ -64,6 +64,7 @@ clean_node() {
 
 # open_archive: wait for archive to be built, cleanup previous
 open_archive() {
 
 # open_archive: wait for archive to be built, cleanup previous
 open_archive() {

+  get_version

   clean_node
   wait_archive
   cd $BUILDDIR/..
   clean_node
   wait_archive
   cd $BUILDDIR/..