From 6e088a6ec810931efe43545782a2cc5560436640 Mon Sep 17 00:00:00 2001 From: Vasily Date: Tue, 23 Jul 2019 16:32:55 +0200 Subject: [PATCH] Make Qmake copy licenses instead of OS scripts Described in commit 97e203fd89e7cb54c7ce96ce779b2e8cb6ac1374 Linux was not including any license files by mistake. --- advancedSettings.pro | 7 ++++++- build_scripts/win/build.py | 5 ----- third-party/easylogging++/{LICENSE => LICENSE-MIT} | 0 third-party/openvr/{LICENSE => LICENSE-VALVE} | 0 4 files changed, 6 insertions(+), 6 deletions(-) rename third-party/easylogging++/{LICENSE => LICENSE-MIT} (100%) rename third-party/openvr/{LICENSE => LICENSE-VALVE} (100%) diff --git a/advancedSettings.pro b/advancedSettings.pro index 618dbc9..84addfd 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 +COPIES += resCopy readmeCopy licenseCopy COPY_DEST_DIR = $$OUT_PWD/$$DESTDIR resCopy.files = src/res/* @@ -53,3 +53,8 @@ resCopy.path = $$COPY_DEST_DIR/res readmeCopy.files = Readme.md readmeCopy.path = $$COPY_DEST_DIR + +licenseCopy.files = LICENSE \ + third-party/openvr/LICENSE-VALVE \ + third-party/easylogging++/LICENSE-MIT +licenseCopy.path = $$COPY_DEST_DIR diff --git a/build_scripts/win/build.py b/build_scripts/win/build.py index 3eefa6b..24fb9d4 100644 --- a/build_scripts/win/build.py +++ b/build_scripts/win/build.py @@ -119,11 +119,6 @@ def deploy(): say("Copying necessary files:") - #license - copy_file(get_project_dir() + "\\LICENSE", get_deploy_dir() + "\\LICENSE-GPL.txt") - 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") - #package files copy_folder(get_project_dir() + "\\src\\package_files", get_deploy_dir()) diff --git a/third-party/easylogging++/LICENSE b/third-party/easylogging++/LICENSE-MIT similarity index 100% rename from third-party/easylogging++/LICENSE rename to third-party/easylogging++/LICENSE-MIT diff --git a/third-party/openvr/LICENSE b/third-party/openvr/LICENSE-VALVE similarity index 100% rename from third-party/openvr/LICENSE rename to third-party/openvr/LICENSE-VALVE