1
0
Fork 0

Change build-directory name when building enterprise packages

This commit is contained in:
Wilfried Goesgens 2016-11-04 09:56:13 +01:00
parent 5efb3d2ce8
commit 7035338911
5 changed files with 39 additions and 5 deletions

View File

@ -5,13 +5,19 @@ set -e
DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
cd ${DIR}/.. cd ${DIR}/..
EP=""
for i in $@; do
if test "$i" == "--enterprise"; then
EP="EP"
fi
done
./Installation/Jenkins/build.sh \ ./Installation/Jenkins/build.sh \
standard \ standard \
--rpath \ --rpath \
--parallel 5 \ --parallel 5 \
--package Bundle \ --package Bundle \
--buildDir build-bundle \ --buildDir build-${EP}bundle \
--prefix "/opt/arangodb" \ --prefix "/opt/arangodb" \
--targetDir /var/tmp/ \ --targetDir /var/tmp/ \
--clang \ --clang \

View File

@ -6,12 +6,20 @@ DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
cd ${DIR}/.. cd ${DIR}/..
EP=""
for i in $@; do
if test "$i" == "--enterprise"; then
EP="EP"
fi
done
./Installation/Jenkins/build.sh \ ./Installation/Jenkins/build.sh \
standard \ standard \
--rpath \ --rpath \
--parallel 25 \ --parallel 25 \
--package DEB \ --package DEB \
--buildDir build-deb \ --buildDir build-${EP}deb \
--targetDir /var/tmp/ \ --targetDir /var/tmp/ \
--jemalloc \ --jemalloc \
--noopt \ --noopt \

View File

@ -5,11 +5,17 @@ set -e
DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
cd ${DIR}/.. cd ${DIR}/..
EP="y"
for i in $@; do
if test "$i" == "--enterprise"; then
EP="e"
fi
done
./Installation/Jenkins/build.sh \ ./Installation/Jenkins/build.sh \
standard \ standard \
--msvc \ --msvc \
--buildDir /cygdrive/c/b/y/ \ --buildDir /cygdrive/c/b/${EP}/ \
--package NSIS \ --package NSIS \
--targetDir /var/tmp/ \ --targetDir /var/tmp/ \
$@ $@

View File

@ -6,11 +6,18 @@ DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
cd ${DIR}/.. cd ${DIR}/..
EP=""
for i in $@; do
if test "$i" == "--enterprise"; then
EP="EP"
fi
done
./Installation/Jenkins/build.sh \ ./Installation/Jenkins/build.sh \
standard \ standard \
--rpath \ --rpath \
--package RPM \ --package RPM \
--buildDir build-rpm \ --buildDir build-${EP}rpm \
--targetDir /var/tmp/ \ --targetDir /var/tmp/ \
--jemalloc \ --jemalloc \
--noopt \ --noopt \

View File

@ -8,6 +8,13 @@ if test -z ${CXX}; then
export CXX=g++ export CXX=g++
fi fi
EP=""
for i in $@; do
if test "$i" == "--enterprise"; then
EP="EP"
fi
done
export CPU_CORES=$(grep -c ^processor /proc/cpuinfo) export CPU_CORES=$(grep -c ^processor /proc/cpuinfo)
DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
@ -20,7 +27,7 @@ cd ${DIR}/..
--parallel ${CPU_CORES} \ --parallel ${CPU_CORES} \
--package TGZ \ --package TGZ \
--snap \ --snap \
--buildDir build-snap \ --buildDir build-${EP}snap \
--targetDir /var/tmp/ \ --targetDir /var/tmp/ \
--noopt \ --noopt \
$@ $@