diff options
| -rw-r--r-- | bootstrap-cmake.sh | 30 | ||||
| -rwxr-xr-x | bootstrap-cpp.sh | 10 |
2 files changed, 32 insertions, 8 deletions
diff --git a/bootstrap-cmake.sh b/bootstrap-cmake.sh new file mode 100644 index 00000000000..8fe99e47df7 --- /dev/null +++ b/bootstrap-cmake.sh @@ -0,0 +1,30 @@ +#!/bin/bash -e +# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. + +usage() { + echo "Usage: $0 <source-dir> [<extra-cmake-args>]" >&2 +} + +if [[ $# -eq 1 ]]; then + SOURCE_DIR=$1 + EXTRA_CMAKE_ARGS="" +elif [ $# -eq 2 ]; then + SOURCE_DIR=$1 + EXTRA_CMAKE_ARGS=$2 +elif [[ $# -eq 1 && ( "$1" = "-h" || "$1" = "--help" )]]; then + usage + exit 0 +else + echo "Wrong number of arguments: expected 1 or 2, was $#" >&2 + usage + exit 1 +fi + +cmake3 \ + -DCMAKE_INSTALL_PREFIX=/opt/vespa \ + -DJAVA_HOME=/usr/lib/jvm/java-openjdk \ + -DEXTRA_LINK_DIRECTORY="/opt/vespa-boost/lib;/opt/vespa-libtorrent/lib;/opt/vespa-zookeeper-c-client/lib;/opt/vespa-cppunit/lib;/usr/lib64/llvm3.9/lib" \ + -DEXTRA_INCLUDE_DIRECTORY="/opt/vespa-boost/include;/opt/vespa-libtorrent/include;/opt/vespa-zookeeper-c-client/include;/opt/vespa-cppunit/include;/usr/include/llvm3.9" \ + -DCMAKE_INSTALL_RPATH="/opt/vespa/lib64;/opt/vespa-boost/lib;/opt/vespa-libtorrent/lib;/opt/vespa-zookeeper-c-client/lib;/opt/vespa-cppunit/lib;/usr/lib/jvm/java-1.8.0/jre/lib/amd64/server;/usr/include/llvm3.9" \ + ${EXTRA_CMAKE_ARGS} \ + "${SOURCE_DIR}" diff --git a/bootstrap-cpp.sh b/bootstrap-cpp.sh index aef18a9a020..6495bf0177c 100755 --- a/bootstrap-cpp.sh +++ b/bootstrap-cpp.sh @@ -19,14 +19,8 @@ fi mkdir -p "${BUILD_DIR}" -source /opt/rh/devtoolset-6/enable || true +source /etc/profile.d/devtoolset-6.sh || true cd "${SOURCE_DIR}" sh ./bootstrap.sh full cd "${BUILD_DIR}" -cmake3 \ - -DCMAKE_INSTALL_PREFIX=/opt/vespa \ - -DJAVA_HOME=/usr/lib/jvm/java-openjdk \ - -DEXTRA_LINK_DIRECTORY="/opt/vespa-boost/lib;/opt/vespa-libtorrent/lib;/opt/vespa-zookeeper-c-client/lib;/opt/vespa-cppunit/lib;/usr/lib64/llvm3.9/lib" \ - -DEXTRA_INCLUDE_DIRECTORY="/opt/vespa-boost/include;/opt/vespa-libtorrent/include;/opt/vespa-zookeeper-c-client/include;/opt/vespa-cppunit/include;/usr/include/llvm3.9" \ - -DCMAKE_INSTALL_RPATH="/opt/vespa/lib64;/opt/vespa-boost/lib;/opt/vespa-libtorrent/lib;/opt/vespa-zookeeper-c-client/lib;/opt/vespa-cppunit/lib;/usr/lib/jvm/java-1.8.0/jre/lib/amd64/server;/usr/include/llvm3.9" \ - "${SOURCE_DIR}" +sh ${SOURCE_DIR}/bootstrap-cmake.sh ${SOURCE_DIR} |