From cbac2f95390401530e8448eefe6220722e305d07 Mon Sep 17 00:00:00 2001 From: Vasily Date: Tue, 23 Jul 2019 16:10:41 +0200 Subject: [PATCH] Make Qmake copy res directory instead of OS scripts Since Qt 5.6 Qmake has supported the (undocumented) file_copies function. Moving to an OS independent version is superior for obvious reasons. Use in https://stackoverflow.com/questions/3984104/qmake-how-to-copy-a-file-to-the-output/54162789#54162789 Uses the same interface as the INSTALLS function described here https://doc.qt.io/qt-5/qmake-advanced-usage.html#installing-files Implemented in the file_copies.prf file found here https://code.qt.io/cgit/qt/qtbase.git/log/mkspecs/features/file_copies.prf --- advancedSettings.pro | 8 +++++++- build_scripts/linux/build_linux.sh | 2 +- build_scripts/win/build.py | 3 --- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/advancedSettings.pro b/advancedSettings.pro index 2b13e11..a781703 100644 --- a/advancedSettings.pro +++ b/advancedSettings.pro @@ -1,5 +1,5 @@ QT += core gui qml quick multimedia widgets -CONFIG += c++1z +CONFIG += c++1z file_copies DEFINES += ELPP_THREAD_SAFE ELPP_QT_LOGGING ELPP_NO_DEFAULT_LOG_FILE @@ -43,3 +43,9 @@ win32-clang-msvc{ include($$include_dir/sources.pri) include($$include_dir/resources.pri) + +# Copy extra files +COPIES += resCopy + +resCopy.files = src/res/* +resCopy.path = $$OUT_PWD/$$DESTDIR/res diff --git a/build_scripts/linux/build_linux.sh b/build_scripts/linux/build_linux.sh index b369e4c..c5e99ea 100755 --- a/build_scripts/linux/build_linux.sh +++ b/build_scripts/linux/build_linux.sh @@ -12,7 +12,7 @@ qmake --version qmake -spec $QMAKE_SPEC $PROJECT_DIR $QMAKE_EXTRAS $MAKE_COMMAND $CLANG_TIDY -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/ diff --git a/build_scripts/win/build.py b/build_scripts/win/build.py index 32dacb6..3412726 100644 --- a/build_scripts/win/build.py +++ b/build_scripts/win/build.py @@ -127,9 +127,6 @@ def deploy(): copy_file(get_project_dir() + "\\third-party\\openvr\\LICENSE", get_deploy_dir() + "\\LICENSE-VALVE.txt") copy_file(get_project_dir() + "\\third-party\\easylogging++\\LICENSE", get_deploy_dir() + "\\LICENSE-MIT.txt") - #res - copy_folder(get_project_dir() + "\\src\\res", get_deploy_dir() + "\\res") - #package files copy_folder(get_project_dir() + "\\src\\package_files", get_deploy_dir())