fix handling of enterprise tags

Installation/release.sh

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