X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/12773c74b77113c759779be5f2de0aab95fc50fd..1c10206dfec917be0f5b3f4964f82b0c959436e2:/buildtools/scripts/simgrid_build.functions

diff --git a/buildtools/scripts/simgrid_build.functions b/buildtools/scripts/simgrid_build.functions
index ecaeec6f06..301714a205 100644
--- a/buildtools/scripts/simgrid_build.functions
+++ b/buildtools/scripts/simgrid_build.functions
@@ -6,8 +6,19 @@
 get_version() {
   if [ x$version = x ] ; then
     cd ${SIMGRID_SVN_ROOT}
-    svn up
-    version="simgrid-3.3.4-svn-r"`svnversion`
+    if [ -e .svn ] ; then
+      set +e
+      svn up 2>/dev/null
+      if [ $? != 0 ] ; then
+        set -e
+        ${SIMGRID_SVN_ROOT}/buildtools/scripts/change-svn-wc-format.py ${SIMGRID_SVN_ROOT} 1.4
+        svn up
+      fi
+      set -e
+      version="simgrid-3.3.4-svn-r"`svnversion`
+    else if [ -e .git ] ; then
+      version="simgrid-3.3.4-git-r"`git log --oneline -1 | sed 's| .*||'`
+    fi fi
     export version
   fi
 }
@@ -29,12 +40,14 @@ make_dist() {
     if [ ! -e configure ] ; then
       ./bootstrap
     fi
-    if [ ! -e Makefile ] ; then
-       # Disable compilation optim to make it built faster
-       ./configure --enable-maintainer-mode --disable-compile-optimizations
-    fi
+    # Reconfigure in any case or the svn version won't get updated
+    # (disable compilation optim to make it built faster)
+    ./configure --enable-maintainer-mode --disable-compile-optimizations
     echo "Make the archive"
-    make all dist
+    make clean
+    make -C src libgras.la
+    make -C tools/gras
+    make dist
 
     echo "Copy the archive in position"
     mkdir -p ${SIMGRID_BASEDIR}