Hawkin
/
arangodb
mirror of https://gitee.com/bigwinds/arangodb
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'devel' of https://github.com/arangodb/arangodb into devel

This commit is contained in:
Kaveh Vahedipour 2016-08-30 14:41:33 +02:00
parent c8178239e1 1c34b564ed
commit 75d54abce6
6 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Installation/release.sh
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

2
js/client/modules/@arangodb/index.js
View File

@ -105,7 +105,7 @@ exports.plainServerVersion = function () {
devel = version.match(/(.*)((alpha|beta|devel|rc)[0-9]*)$/); devel = version.match(/(.*)((alpha|beta|devel|rc)[0-9]*)$/);
if (devel !== null) { if (devel !== null) {
version = devel[1]; version = devel[1] + '0';
} }
} }

2
js/server/modules/@arangodb/index.js
View File

@ -86,7 +86,7 @@ exports.plainServerVersion = function () {
devel = version.match(/(.*)((alpha|beta|devel|rc)[0-9]*)$/); devel = version.match(/(.*)((alpha|beta|devel|rc)[0-9]*)$/);
if (devel !== null) { if (devel !== null) {
version = devel[1]; version = devel[1] + '0';;
} }
} }

1
scripts/build-deb.sh
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}/..

3
scripts/build-nsis.sh
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}/..

1
scripts/build-rpm.sh
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}/..