From ed9e4008af4ac588cce11231e53c38b5540b8d12 Mon Sep 17 00:00:00 2001 From: Vasily Date: Wed, 17 Apr 2019 12:23:25 +0200 Subject: [PATCH] Make Linux build scripts directory agnostic Using the script location as an anchor, the scripts can now be called from anywhere and work. --- build_scripts/linux/build_linux.sh | 24 +++++++++++++----------- build_scripts/linux/configure.sh | 2 +- 2 files changed, 14 insertions(+), 12 deletions(-) diff --git a/build_scripts/linux/build_linux.sh b/build_scripts/linux/build_linux.sh index 49d6606..63f8fd1 100755 --- a/build_scripts/linux/build_linux.sh +++ b/build_scripts/linux/build_linux.sh @@ -1,18 +1,20 @@ #!/usr/bin/env bash set -e -DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )" -. $DIR/configure.sh +SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )" +PROJECT_DIR=$SCRIPT_DIR/../../ +BUILD_DIR=$PROJECT_DIR/build/ +. $SCRIPT_DIR/configure.sh echo $MAKE_COMMAND -mkdir -p build -cd build +mkdir -p $BUILD_DIR +cd $BUILD_DIR qmake --version -qmake -spec $QMAKE_SPEC .. +qmake -spec $QMAKE_SPEC $PROJECT_DIR $MAKE_COMMAND $CLANG_TIDY -cp -r ../src/res ./bin/linux/AdvancedSettings/ -cp ../src/package_files/action_manifest.json ./bin/linux/AdvancedSettings/ -cp ../src/package_files/manifest.vrmanifest ./bin/linux/AdvancedSettings/ -cp -r ../src/package_files/default_action_manifests ./bin/linux/AdvancedSettings/ -cp ../third-party/openvr/lib/linux64/libopenvr_api.so ./bin/linux/AdvancedSettings/ -cp ../build_scripts/linux/run-with-library.sh ./bin/linux/AdvancedSettings/ +cp -r $PROJECT_DIR/src/res $BUILD_DIR/bin/linux/AdvancedSettings/ +cp $PROJECT_DIR/src/package_files/action_manifest.json $BUILD_DIR/bin/linux/AdvancedSettings/ +cp $PROJECT_DIR/src/package_files/manifest.vrmanifest $BUILD_DIR/bin/linux/AdvancedSettings/ +cp -r $PROJECT_DIR/src/package_files/default_action_manifests $BUILD_DIR/bin/linux/AdvancedSettings/ +cp $PROJECT_DIR/third-party/openvr/lib/linux64/libopenvr_api.so $BUILD_DIR/bin/linux/AdvancedSettings/ +cp $PROJECT_DIR/build_scripts/linux/run-with-library.sh $BUILD_DIR/bin/linux/AdvancedSettings/ diff --git a/build_scripts/linux/configure.sh b/build_scripts/linux/configure.sh index bdf5478..14e27ab 100644 --- a/build_scripts/linux/configure.sh +++ b/build_scripts/linux/configure.sh @@ -14,6 +14,6 @@ else # Clean up the artifacts and run everything together in that case. MAKE_COMMAND='bear make --jobs' QMAKE_SPEC='linux-clang' - CLANG_TIDY='../build_scripts/linux/run-clang-tidy.sh' + CLANG_TIDY='$SCRIPT_DIR/run-clang-tidy.sh' fi