SteamFrame/OpenVR-AdvancedSettings-frame
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Make Linux build scripts directory agnostic

Browse Source 
Using the script location as an anchor, the scripts can now be called
from anywhere and work.
This commit is contained in:
Vasily
2019-04-17 20:51:34 +02:00
committed by username223
parent 6895a44ddb
commit ed9e4008af
2 changed files with 14 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build_scripts/linux/build_linux.sh
+13 -11
View File
@@ -1,18 +1,20 @@
#!/usr/bin/env bash #!/usr/bin/env bash
set -e set -e
DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )" SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
. $DIR/configure.sh PROJECT_DIR=$SCRIPT_DIR/../../
BUILD_DIR=$PROJECT_DIR/build/
. $SCRIPT_DIR/configure.sh
echo $MAKE_COMMAND echo $MAKE_COMMAND
mkdir -p build mkdir -p $BUILD_DIR
cd build cd $BUILD_DIR
qmake --version qmake --version
qmake -spec $QMAKE_SPEC .. qmake -spec $QMAKE_SPEC $PROJECT_DIR
$MAKE_COMMAND $MAKE_COMMAND
$CLANG_TIDY $CLANG_TIDY
cp -r ../src/res ./bin/linux/AdvancedSettings/ cp -r $PROJECT_DIR/src/res $BUILD_DIR/bin/linux/AdvancedSettings/
cp ../src/package_files/action_manifest.json ./bin/linux/AdvancedSettings/ cp $PROJECT_DIR/src/package_files/action_manifest.json $BUILD_DIR/bin/linux/AdvancedSettings/
cp ../src/package_files/manifest.vrmanifest ./bin/linux/AdvancedSettings/ cp $PROJECT_DIR/src/package_files/manifest.vrmanifest $BUILD_DIR/bin/linux/AdvancedSettings/
cp -r ../src/package_files/default_action_manifests ./bin/linux/AdvancedSettings/ cp -r $PROJECT_DIR/src/package_files/default_action_manifests $BUILD_DIR/bin/linux/AdvancedSettings/
cp ../third-party/openvr/lib/linux64/libopenvr_api.so ./bin/linux/AdvancedSettings/ cp $PROJECT_DIR/third-party/openvr/lib/linux64/libopenvr_api.so $BUILD_DIR/bin/linux/AdvancedSettings/
cp ../build_scripts/linux/run-with-library.sh ./bin/linux/AdvancedSettings/ cp $PROJECT_DIR/build_scripts/linux/run-with-library.sh $BUILD_DIR/bin/linux/AdvancedSettings/
build_scripts/linux/configure.sh
+1 -1
View File
@@ -14,6 +14,6 @@ else
# Clean up the artifacts and run everything together in that case. # Clean up the artifacts and run everything together in that case.
MAKE_COMMAND='bear make --jobs' MAKE_COMMAND='bear make --jobs'
QMAKE_SPEC='linux-clang' QMAKE_SPEC='linux-clang'
CLANG_TIDY='../build_scripts/linux/run-clang-tidy.sh' CLANG_TIDY='$SCRIPT_DIR/run-clang-tidy.sh'
fi fi