A
lgorithmique
N
umérique
D
istribuée
Public GIT Repository
projects
/
simgrid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Yet another typo, bummer
[simgrid.git]
/
buildtools
/
scripts
/
simgrid_build.functions
diff --git
a/buildtools/scripts/simgrid_build.functions
b/buildtools/scripts/simgrid_build.functions
index
b8da173
..
301714a
100644
(file)
--- 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 [ -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
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
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"
# (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
make -C src libgras.la
make -C tools/gras
make dist