1
0
Fork 0

Work on building the packages script controlled.

This commit is contained in:
Wilfried Goesgens 2016-08-18 15:54:23 +02:00
parent 7faa565a50
commit 238b2a6f35
4 changed files with 31 additions and 8 deletions

View File

@ -122,7 +122,8 @@ MAKE=make
PACKAGE_MAKE=make PACKAGE_MAKE=make
MAKE_PARAMS="" MAKE_PARAMS=""
MAKE_CMD_PREFIX="" MAKE_CMD_PREFIX=""
CONFIGURE_OPTIONS="-DCMAKE_INSTALL_PREFIX=/ -DCMAKE_INSTALL_LOCALSTATEDIR=/var$CMAKE_OPENSSL" CONFIGURE_OPTIONS="-DCMAKE_INSTALL_PREFIX=/ $CMAKE_OPENSSL"
# -DCMAKE_INSTALL_LOCALSTATEDIR=/var"
MAINTAINER_MODE="-DUSE_MAINTAINER_MODE=off" MAINTAINER_MODE="-DUSE_MAINTAINER_MODE=off"
TARGET_DIR="" TARGET_DIR=""
@ -207,7 +208,7 @@ while [ $# -gt 0 ]; do
shift shift
;; ;;
--msvc) --msvc)
shift shift
MSVC=1 MSVC=1
CC="" CC=""
@ -236,7 +237,7 @@ while [ $# -gt 0 ]; do
shift shift
;; ;;
--builddir) --buildDir)
shift shift
BUILD_DIR=$1 BUILD_DIR=$1
shift shift
@ -276,6 +277,12 @@ while [ $# -gt 0 ]; do
V8_LDFLAGS="${V8_LDFLAGS} -static-libgcc -static-libstdc++" V8_LDFLAGS="${V8_LDFLAGS} -static-libgcc -static-libstdc++"
shift shift
;; ;;
--parallel)
shift
PARALLEL_BUILDS=$1
shift
;;
--targetDir) --targetDir)
shift shift
@ -352,7 +359,7 @@ if [ "${VERBOSE}" == 1 ]; then
MAKE_PARAMS="${MAKE_PARAMS} V=1 Verbose=1 VERBOSE=1" MAKE_PARAMS="${MAKE_PARAMS} V=1 Verbose=1 VERBOSE=1"
fi fi
if [ -n "${PAR}"]; then if [ -n "${PAR}" ]; then
MAKE_PARAMS="${MAKE_PARAMS} ${PAR} ${PARALLEL_BUILDS}" MAKE_PARAMS="${MAKE_PARAMS} ${PAR} ${PARALLEL_BUILDS}"
fi fi
@ -390,7 +397,7 @@ if [ ! -f Makefile -o ! -f CMakeCache.txt ]; then
fi fi
${MAKE_CMD_PREFIX} ${MAKE} ${MAKE_PARAMS} ${MAKE_CMD_PREFIX} ${MAKE} ${MAKE_PARAMS}
git rev-parse HEAD > ${SOURCE_DIR}/last_compiled_version.sha (cd ${SOURCE_DIR}; git rev-parse HEAD > last_compiled_version.sha)
if [ -n "$CPACK" -a -n "${TARGET_DIR}" ]; then if [ -n "$CPACK" -a -n "${TARGET_DIR}" ]; then
${PACKAGE_MAKE} packages ${PACKAGE_MAKE} packages

View File

@ -6,12 +6,12 @@ DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
cd ${DIR}/.. cd ${DIR}/..
export PARALLEL_BUILDS=25
./Installation/Jenkins/build.sh \ ./Installation/Jenkins/build.sh \
standard \ standard \
--rpath \ --rpath \
--parallel 25 \
--package DEB \ --package DEB \
--builddir build-deb \ --buildDir build-deb \
--targetDir /var/tmp/ \ --targetDir /var/tmp/ \
--jemalloc \ --jemalloc \

16
scripts/build-nsis.sh Normal file
View File

@ -0,0 +1,16 @@
#!/bin/bash
set -e
DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
cd ${DIR}/..
./Installation/Jenkins/build.sh \
standard \
--msvc \
--buildDir /cygdrive/c/b/y/ \
--package NSIS \
--targetDir /var/tmp/
cd ${DIR}/..

View File

@ -10,7 +10,7 @@ cd ${DIR}/..
standard \ standard \
--rpath \ --rpath \
--package RPM \ --package RPM \
--builddir build-rpm \ --buildDir build-rpm \
--targetDir /var/tmp/ \ --targetDir /var/tmp/ \
--jemalloc \ --jemalloc \