Minor cleanups to build on pipol

[simgrid.git] / buildtools / scripts / simgrid_build.functions

diff --git a/buildtools/scripts/simgrid_build.functions b/buildtools/scripts/simgrid_build.functions
index b366288..b8da173 100644 (file)
--- 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
+        version="simgrid-3.3.4-svn-r"`svnversion`
+      else
+        echo "Cannot use svn on that arch"
+        version="simgrid-3.3.4-svn-r"`head -n 4 .svn/entries |tail -n 1`
+      fi
+      set -e
+    else if [ -e .git ] ; then
+      version="simgrid-3.3.4-git-r"`git log --oneline -1 | sed 's| .*||'`
+    fi fi
     export version
   fi
 }
@@ -33,7 +44,9 @@ make_dist() {
     # (disable compilation optim to make it built faster)
     ./configure --enable-maintainer-mode --disable-compile-optimizations
     echo "Make the archive"
-    make all dist
+    make -C src libgras.la
+    make -C tools/gras
+    make dist
 
     echo "Copy the archive in position"
     mkdir -p ${SIMGRID_BASEDIR}