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

Fix windows compile, add several cpack iterations

This commit is contained in:
Wilfried Goesgens 2016-07-26 18:04:24 +02:00
parent 92958cc4a0
commit cc2d346766
2 changed files with 25 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
Installation/Jenkins/build.sh
View File

@ -61,7 +61,6 @@ if test -z "${CXX}"; then
CC="/usr/bin/gcc-4.9" CC="/usr/bin/gcc-4.9"
CXX="/usr/bin/g++-4.9" CXX="/usr/bin/g++-4.9"
fi fi
MAKE=make
CFLAGS="-g" CFLAGS="-g"
CXXFLAGS="-g" CXXFLAGS="-g"
@ -74,6 +73,9 @@ LIBS=""
BUILD_DIR="build" BUILD_DIR="build"
BUILD_CONFIG=RelWithDebInfo BUILD_CONFIG=RelWithDebInfo
PAR="-j"
GENERATOR=make
MAKE=make
MAKE_PARAMS="" MAKE_PARAMS=""
MAKE_CMD_PREFIX="" MAKE_CMD_PREFIX=""
CONFIGURE_OPTIONS="$CMAKE_OPENSSL" CONFIGURE_OPTIONS="$CMAKE_OPENSSL"
@ -83,7 +85,7 @@ TARGET_DIR=""
CLANG36=0 CLANG36=0
CLANG=0 CLANG=0
COVERGAE=0 COVERGAE=0
CPACK=0 CPACK=
FAILURE_TESTS=0 FAILURE_TESTS=0
GCC5=0 GCC5=0
GOLD=0 GOLD=0
@ -119,7 +121,12 @@ while [ $# -gt 0 ]; do
--msvc) --msvc)
shift shift
CONFIGURE_OPTIONS="${CONFIGURE_OPTIONS} -G 'Visual Studio 14 Win64'" CC=""
CXX=""
PAR=""
PARALLEL_BUILDS=""
GENERATOR="Visual Studio 14 Win64"
CPACK="ZIP NSIS"
MAKE='cmake --build . --config RelWithDebInfo' MAKE='cmake --build . --config RelWithDebInfo'
;; ;;
@ -308,18 +315,24 @@ fi
if [ ! -f Makefile ]; then if [ ! -f Makefile ]; then
CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" LDFLAGS="${LDFLAGS}" LIBS="${LIBS}" \ CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" LDFLAGS="${LDFLAGS}" LIBS="${LIBS}" \
cmake .. -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_INSTALL_LOCALSTATEDIR=/var -DVARDIR=/var ${CONFIGURE_OPTIONS} ${MAINTAINER_MODE} cmake .. -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_INSTALL_LOCALSTATEDIR=/var -DVARDIR=/var ${CONFIGURE_OPTIONS} ${MAINTAINER_MODE} -G "${GENERATOR}"
fi fi
${MAKE_CMD_PREFIX} ${MAKE} ${VERBOSE_MAKE} -j "${PARALLEL_BUILDS}" ${MAKE_PARAMS} ${MAKE_CMD_PREFIX} ${MAKE} ${VERBOSE_MAKE} "${PAR}" "${PARALLEL_BUILDS}" ${MAKE_PARAMS}
if [ -n "$CPACK" -a -n "${TARGET_DIR}" ]; then if [ -n "$CPACK" -a -n "${TARGET_DIR}" ]; then
if [ "$CPACK" == "DEB" ]; then for PACK in ${CPACK}; do
make prepare_debian if [ "$PACK" == "DEB" ]; then
fi make prepare_debian
fi
cpack -G "$CPACK" cpack -G "$PACK"
EXT=`echo $CPACK|tr '[:upper:]' '[:lower:]'`
cp *.${EXT} ${TARGET_DIR} EXT=`echo $PACK|tr '[:upper:]' '[:lower:]'`
if [ "$PACK" == "NSIS" ]; then
true
else
cp *.${EXT} ${TARGET_DIR}
fi
fi fi
git rev-parse HEAD > ../last_compiled_version.sha git rev-parse HEAD > ../last_compiled_version.sha

2
cmake/ArangoDBinstallCfg.cmake
View File

@ -8,7 +8,7 @@ set(CMAKE_INSTALL_FULL_SYSCONFDIR_ARANGO "${CMAKE_INSTALL_FULL_SYSCONFDIR}/arang
# Global macros ---------------------------------------------------------------- # Global macros ----------------------------------------------------------------
macro (generate_root_config name) macro (generate_root_config name)
FILE(READ ${PROJECT_SOURCE_DIR}/${CMAKE_INSTALL_SYSCONFDIR_ARANGODB}/${name}.conf.in FileContent) FILE(READ ${PROJECT_SOURCE_DIR}/etc/arangodb3/${name}.conf.in FileContent)
STRING(REPLACE "@PKGDATADIR@" "@ROOTDIR@/share/arangodb3" STRING(REPLACE "@PKGDATADIR@" "@ROOTDIR@/share/arangodb3"
FileContent "${FileContent}") FileContent "${FileContent}")
STRING(REPLACE "@LOCALSTATEDIR@" "@ROOTDIR@/var" STRING(REPLACE "@LOCALSTATEDIR@" "@ROOTDIR@/var"