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

fix handling of enterprise tags

This commit is contained in:
Wilfried Goesgens 2016-11-15 15:30:25 +01:00
parent 1649b2cd59
commit 64b50e5816
1 changed files with 81 additions and 86 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
Installation/release.sh
View File

@ -1,5 +1,9 @@
#!/bin/bash #!/bin/bash
set -e set -ex
SCRIPT_DIR=`dirname $0`
SRC_DIR="${SCRIPT_DIR}/../"
ENTERPRISE_SRC_DIR=${SRC_DIR}/enterprise
TAG=1 TAG=1
BOOK=1 BOOK=1
@ -7,6 +11,7 @@ BUILD=1
SWAGGER=1 SWAGGER=1
EXAMPLES=1 EXAMPLES=1
LINT=1 LINT=1
PARALLEL=8
if [ "$#" -lt 1 ]; then if [ "$#" -lt 1 ]; then
echo "usage: $0 <major>.<minor>.<revision>" echo "usage: $0 <major>.<minor>.<revision>"
@ -16,6 +21,12 @@ fi
while [ "$#" -gt 0 ]; do while [ "$#" -gt 0 ]; do
echo "$1" echo "$1"
case "$1" in case "$1" in
--parallel)
shift
PARALLEL=$1
shift
;;
--no-lint) --no-lint)
LINT=0 LINT=0
shift shift
@ -61,6 +72,10 @@ while [ "$#" -gt 0 ]; do
esac esac
done done
if [ -d ${ENTERPRISE_SRC_DIR} ]; then
echo "enterprise directory missing"
fi
if echo ${VERSION} | grep -q -- '-'; then if echo ${VERSION} | grep -q -- '-'; then
echo "${VERSION} mustn't contain minuses! " echo "${VERSION} mustn't contain minuses! "
exit 1 exit 1
@ -96,41 +111,25 @@ if [ `uname` == "Darwin" ]; then
CMAKE_CONFIGURE="${CMAKE_CONFIGURE} -DOPENSSL_ROOT_DIR=/usr/local/opt/openssl -DCMAKE_OSX_DEPLOYMENT_TARGET=10.11" CMAKE_CONFIGURE="${CMAKE_CONFIGURE} -DOPENSSL_ROOT_DIR=/usr/local/opt/openssl -DCMAKE_OSX_DEPLOYMENT_TARGET=10.11"
fi fi
ENTERPRISE=0
if [ -d enterprise ]; then
ENTERPRISE=1
fi
if [ "$BUILD" != "0" ]; then if [ "$BUILD" != "0" ]; then
echo "COMPILING COMMUNITY" echo "COMPILING COMMUNITY"
if [ "$BUILD" == "1" ]; then
rm -rf build && mkdir build rm -rf build && mkdir build
fi
( (
cd build cd build
cmake .. ${CMAKE_CONFIGURE} cmake .. ${CMAKE_CONFIGURE}
make clean_autogenerated_files make clean_autogenerated_files
cmake .. ${CMAKE_CONFIGURE} cmake .. ${CMAKE_CONFIGURE}
make -j 8 make -j ${PARALLEL}
) )
if [ "$ENTERPRISE" == "1" ]; then
echo "COMPILING ENTERPRISE" echo "COMPILING ENTERPRISE"
if [ "$BUILD" == "1" ]; then
rm -rf build-enterprise && mkdir build-enterprise rm -rf build-enterprise && mkdir build-enterprise
fi
( (
cd build-enterprise cd build-enterprise
cmake .. ${CMAKE_CONFIGURE} -DUSE_ENTERPRISE=ON cmake .. ${CMAKE_CONFIGURE} -DUSE_ENTERPRISE=ON
make -j 8 make -j ${PARALLEL}
) )
fi fi
fi
if [ "$LINT" == "1" ]; then if [ "$LINT" == "1" ]; then
echo "LINTING" echo "LINTING"
@ -191,16 +190,12 @@ if [ "$TAG" == "1" ]; then
git tag "v$VERSION" git tag "v$VERSION"
git push --tags git push --tags
if [ "$ENTERPRISE" == "1" ]; then cd ${ENTERPRISE_SRC_DIR}
(
cd enterprise
git commit -m "release version $VERSION enterprise" -a git commit -m "release version $VERSION enterprise" -a
git push git push
git tag "v$VERSION" git tag "v$VERSION"
git push --tags git push --tags
)
fi
echo echo
echo "--------------------------------------------------" echo "--------------------------------------------------"