X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/01dc7e145ae18ee678ac03beeed469cdcb5e5798..67f68adf1c571987486dc2472fde3b02a8e48d15:/buildtools/scripts/simgrid_build.functions

diff --git a/buildtools/scripts/simgrid_build.functions b/buildtools/scripts/simgrid_build.functions
index 5c1c53aae0..f6811ebc2b 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/buildtools/scripts/cchange-svn-wc-format.py ${SIMGRID_SVN_ROOT} 1.5
+        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
 }
@@ -24,17 +35,19 @@ wait_archive() {
 make_dist() {
   get_version
   if [ ! -e ${SIMGRID_BASEDIR}/${version}.tar.gz ] ; then
-    cd ${SIMGRID_BASEDIR}
+    cd ${SIMGRID_SVN_ROOT}
     echo "rebuild the missing files for compilation"
     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}