From 46c8a6256592dd1daf2ff3a006dad8a76036f125 Mon Sep 17 00:00:00 2001 From: Vasily Date: Tue, 23 Jul 2019 16:45:58 +0200 Subject: [PATCH] Make Qmake copy package files instead of OS scripts Described in commit 97e203fd89e7cb54c7ce96ce779b2e8cb6ac1374 The linux directory in package_files is included even on Windows install for simplicity and because it takes up less than 1KB. --- advancedSettings.pro | 5 ++++- build_scripts/linux/build_linux.sh | 3 --- build_scripts/win/build.py | 3 --- 3 files changed, 4 insertions(+), 7 deletions(-) diff --git a/advancedSettings.pro b/advancedSettings.pro index 84addfd..00cf18d 100644 --- a/advancedSettings.pro +++ b/advancedSettings.pro @@ -45,7 +45,7 @@ include($$include_dir/sources.pri) include($$include_dir/resources.pri) # Copy extra files -COPIES += resCopy readmeCopy licenseCopy +COPIES += resCopy readmeCopy licenseCopy packageFilesCopy COPY_DEST_DIR = $$OUT_PWD/$$DESTDIR resCopy.files = src/res/* @@ -58,3 +58,6 @@ licenseCopy.files = LICENSE \ third-party/openvr/LICENSE-VALVE \ third-party/easylogging++/LICENSE-MIT licenseCopy.path = $$COPY_DEST_DIR + +packageFilesCopy.files = src/package_files/* +packageFilesCopy.path = $$COPY_DEST_DIR diff --git a/build_scripts/linux/build_linux.sh b/build_scripts/linux/build_linux.sh index c5e99ea..7aab13f 100755 --- a/build_scripts/linux/build_linux.sh +++ b/build_scripts/linux/build_linux.sh @@ -13,7 +13,4 @@ qmake -spec $QMAKE_SPEC $PROJECT_DIR $QMAKE_EXTRAS $MAKE_COMMAND $CLANG_TIDY -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/ diff --git a/build_scripts/win/build.py b/build_scripts/win/build.py index 24fb9d4..d3a1bdf 100644 --- a/build_scripts/win/build.py +++ b/build_scripts/win/build.py @@ -119,9 +119,6 @@ def deploy(): say("Copying necessary files:") - #package files - copy_folder(get_project_dir() + "\\src\\package_files", get_deploy_dir()) - #openvr dll copy_file(get_project_dir() + "\\third-party\\openvr\\bin\\win64\\openvr_api.dll", get_deploy_dir() + "\\openvr_api.dll")