1
0
Fork 0

Merge branch 'devel' of https://github.com/arangodb/arangodb into generic-col-types

This commit is contained in:
jsteemann 2016-08-30 13:02:14 +02:00
commit fab835c63a
4 changed files with 9 additions and 1 deletions

View File

@ -50,6 +50,11 @@ fi
VERSION="$1" VERSION="$1"
if echo ${VERSION} | grep -q -- '-'; then
echo "${VERSION} mustn't contain minuses! "
exit 1
fi
if git tag | grep -q "^v$VERSION$"; then if git tag | grep -q "^v$VERSION$"; then
echo "$0: version $VERSION already defined" echo "$0: version $VERSION already defined"
exit 1 exit 1

View File

@ -14,5 +14,6 @@ cd ${DIR}/..
--buildDir build-deb \ --buildDir build-deb \
--targetDir /var/tmp/ \ --targetDir /var/tmp/ \
--jemalloc \ --jemalloc \
$@
cd ${DIR}/.. cd ${DIR}/..

View File

@ -11,6 +11,7 @@ cd ${DIR}/..
--msvc \ --msvc \
--buildDir /cygdrive/c/b/y/ \ --buildDir /cygdrive/c/b/y/ \
--package NSIS \ --package NSIS \
--targetDir /var/tmp/ --targetDir /var/tmp/ \
$@
cd ${DIR}/.. cd ${DIR}/..

View File

@ -13,5 +13,6 @@ cd ${DIR}/..
--buildDir build-rpm \ --buildDir build-rpm \
--targetDir /var/tmp/ \ --targetDir /var/tmp/ \
--jemalloc \ --jemalloc \
$@
cd ${DIR}/.. cd ${DIR}/..