X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/6a30ce7329b39609b9a6b139f32b2d2f1a84f120..8db5b24ed8e2ac545a35960a4e90a0f6ff0e51ed:/buildtools/scripts/simgrid_build.functions

diff --git a/buildtools/scripts/simgrid_build.functions b/buildtools/scripts/simgrid_build.functions
index d028bca37c..301714a205 100644
--- a/buildtools/scripts/simgrid_build.functions
+++ b/buildtools/scripts/simgrid_build.functions
@@ -7,10 +7,17 @@ get_version() {
   if [ x$version = x ] ; then
     cd ${SIMGRID_SVN_ROOT}
     if [ -e .svn ] ; then
-      svn up
+      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 describe --long --all | sed 's|.*/||'`
+      version="simgrid-3.3.4-git-r"`git log --oneline -1 | sed 's| .*||'`
     fi fi
     export version
   fi
@@ -37,8 +44,9 @@ make_dist() {
     # (disable compilation optim to make it built faster)
     ./configure --enable-maintainer-mode --disable-compile-optimizations
     echo "Make the archive"
-    make -C src 
-    make -C tools
+    make clean
+    make -C src libgras.la
+    make -C tools/gras
     make dist
 
     echo "Copy the archive in position"