From dfbd8f05c8da57a78a0fb979cd5c53a167f70856 Mon Sep 17 00:00:00 2001 From: Lars Toenning Date: Sun, 9 Jun 2024 23:41:19 +0200 Subject: [PATCH] chore: Move license HTML file to installer dir The reuse linter only supports single files inside the LICENSE folder. As the HTML version for the license is only required for the installer, this commit moves it to the installer folder. --- cmake/install.cmake | 1 - installer/installbuilder/project.xml | 4 ++-- .../share/legal}/LicenseRef-swift-pilot-client-1.html | 5 +++++ 3 files changed, 7 insertions(+), 3 deletions(-) rename {LICENSES => resources/share/legal}/LicenseRef-swift-pilot-client-1.html (99%) diff --git a/cmake/install.cmake b/cmake/install.cmake index 0b2057f64..2c74acff0 100644 --- a/cmake/install.cmake +++ b/cmake/install.cmake @@ -4,7 +4,6 @@ # Readme, License etc. set(GENERAL_FILES ${swift_SOURCE_DIR}/LICENSES/LicenseRef-swift-pilot-client-1.txt - ${swift_SOURCE_DIR}/LICENSES/LicenseRef-swift-pilot-client-1.html ) install(FILES ${GENERAL_FILES} DESTINATION bin) diff --git a/installer/installbuilder/project.xml b/installer/installbuilder/project.xml index bbf57074c..df6825b42 100644 --- a/installer/installbuilder/project.xml +++ b/installer/installbuilder/project.xml @@ -9,7 +9,7 @@ ../../dist/bin/LicenseRef-swift-pilot-client-1.txt - ../../dist/bin/LicenseRef-swift-pilot-client-1.html + ../../dist/share/legal/LicenseRef-swift-pilot-client-1.html ../images/leftimage.png ../images/logo.png ../images/splashscreen.png @@ -323,7 +323,7 @@ https://swift-project.org/ en utf-8 ../../dist/bin/LicenseRef-swift-pilot-client-1.txt - ../../dist/bin/LicenseRef-swift-pilot-client-1.html + ../../dist/share/legal/LicenseRef-swift-pilot-client-1.html diff --git a/LICENSES/LicenseRef-swift-pilot-client-1.html b/resources/share/legal/LicenseRef-swift-pilot-client-1.html similarity index 99% rename from LICENSES/LicenseRef-swift-pilot-client-1.html rename to resources/share/legal/LicenseRef-swift-pilot-client-1.html index c01fb03dd..b23dc0ac8 100644 --- a/LICENSES/LicenseRef-swift-pilot-client-1.html +++ b/resources/share/legal/LicenseRef-swift-pilot-client-1.html @@ -1,3 +1,8 @@ + +