summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--README.md5
-rwxr-xr-xbootstrap-cpp.sh24
-rwxr-xr-xbootstrap.sh2
3 files changed, 7 insertions, 24 deletions
diff --git a/README.md b/README.md
index 97c4bf69bc3..37ceb44ccfd 100644
--- a/README.md
+++ b/README.md
@@ -28,15 +28,14 @@ You can also setup CentOS 7 natively and install the following build dependencie
### Build Java modules
export MAVEN_OPTS="-Xms128m -Xmx512m"
- source /opt/rh/rh-maven33/enable
- bash bootstrap.sh java
+ sh bootstrap.sh java
mvn -T <num-threads> install
### Build C++ modules
Replace `<build-dir>` with the name of the directory in which you'd like to build Vespa.
Replace `<source-dir>` with the directory in which you've cloned/unpacked the source tree.
- bash bootstrap-cpp.sh <source-dir> <build-dir>
+ sh bootstrap-cpp.sh <source-dir> <build-dir>
cd <build-dir>
make -j <num-threads>
ctest3 -j <num-threads>
diff --git a/bootstrap-cpp.sh b/bootstrap-cpp.sh
index 47d2a82622a..0b1d5751e96 100755
--- a/bootstrap-cpp.sh
+++ b/bootstrap-cpp.sh
@@ -5,10 +5,9 @@ usage() {
echo "Usage: $0 <source-dir> <build-dir>" >&2
}
-# Parse arguments
if [ $# -eq 2 ]; then
- SOURCE_DIR="$1"
- BUILD_DIR="$2"
+ SOURCE_DIR=$(realpath $1)
+ BUILD_DIR=$(realpath $2)
elif [[ $# -eq 1 && ( "$1" = "-h" || "$1" = "--help" )]]; then
usage
exit 0
@@ -18,23 +17,10 @@ else
exit 1
fi
-# Check the source directory
-if [ ! -d "$SOURCE_DIR" ] ; then
- echo "Source dir $SOURCE_DIR not found" >&2
- exit 1
-fi
-SOURCE_DIR=$(realpath "${SOURCE_DIR}")
-
-# Check (and possibly create) the build directory
-mkdir -p "${BUILD_DIR}" || {
- echo "Failed to create build directory" >&2
- exit 1
-}
-BUILD_DIR=$(realpath "${BUILD_DIR}")
+mkdir -p "${BUILD_DIR}"
-# Build it
source /opt/rh/devtoolset-6/enable || true
cd "${SOURCE_DIR}"
-bash ./bootstrap.sh full
+sh ./bootstrap.sh full
cd "${BUILD_DIR}"
-bash ${SOURCE_DIR}/bootstrap-cmake.sh "${SOURCE_DIR}"
+sh ${SOURCE_DIR}/bootstrap-cmake.sh ${SOURCE_DIR}
diff --git a/bootstrap.sh b/bootstrap.sh
index d0593eb1dee..075da74b7c7 100755
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -5,8 +5,6 @@ usage() {
echo "Usage: $0 [full | java | default]" >&2
}
-source /opt/rh/rh-maven33/enable
-
if [ $# -eq 0 ]; then
# Build minimal set of java modules required to run cmake
MODE=default