X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/ef9dd15620315b1fff8e6b4c8663eb9664cba849..dfdb9cac134ec7a7fa6539ed889bd5fc823539a6:/buildtools/scripts/simgrid_build.functions diff --git a/buildtools/scripts/simgrid_build.functions b/buildtools/scripts/simgrid_build.functions index b8da173300..301714a205 100644 --- a/buildtools/scripts/simgrid_build.functions +++ b/buildtools/scripts/simgrid_build.functions @@ -9,13 +9,13 @@ get_version() { 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` + 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 @@ -44,6 +44,7 @@ make_dist() { # (disable compilation optim to make it built faster) ./configure --enable-maintainer-mode --disable-compile-optimizations echo "Make the archive" + make clean make -C src libgras.la make -C tools/gras make dist