From b2b0a96a0932b5e087112d19d6bc24b02d45c69d Mon Sep 17 00:00:00 2001 From: Xavier Mitault Date: Sun, 24 Sep 2023 17:12:41 +0200 Subject: [PATCH] CICD: Fix package creator PATCH --- LICENSE.txt | 9 +++++++++ scripts/bundle-linux.sh | 3 +++ scripts/bundle-macos.sh | 5 ++++- scripts/bundle-windows.ps1 | 1 + 4 files changed, 17 insertions(+), 1 deletion(-) create mode 100644 LICENSE.txt diff --git a/LICENSE.txt b/LICENSE.txt new file mode 100644 index 00000000..8a83dee1 --- /dev/null +++ b/LICENSE.txt @@ -0,0 +1,9 @@ +MIT License + +Copyright (c) 2023 X-L-R-G-B + +Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. diff --git a/scripts/bundle-linux.sh b/scripts/bundle-linux.sh index 7fdeba84..4c177a55 100755 --- a/scripts/bundle-linux.sh +++ b/scripts/bundle-linux.sh @@ -1,6 +1,8 @@ #!/bin/bash # Run cpack +set -ex + cmake -S . -B build cd build || exit 14 @@ -17,6 +19,7 @@ cp -r src bundle cp -r deps bundle cp -r CMakeLists.txt bundle cp -r LICENSE.txt bundle +cp -r LICENSE bundle cp -r README.md bundle tar -cvf r-type-linux.tar bundle diff --git a/scripts/bundle-macos.sh b/scripts/bundle-macos.sh index b51235a8..004c32d6 100755 --- a/scripts/bundle-macos.sh +++ b/scripts/bundle-macos.sh @@ -1,11 +1,13 @@ #!/bin/bash # Run cpack +set -ex + cmake -S . -B build cd build || exit 14 -cpack --config CPackConfig.cmake -G OSXX11 +cpack --config CPackConfig.cmake -G DragNDrop cd .. @@ -17,6 +19,7 @@ cp -r src bundle cp -r deps bundle cp -r CMakeLists.txt bundle cp -r LICENSE.txt bundle +cp -r LICENSE bundle cp -r README.md bundle zip -r -9 r-type-macos.zip bundle diff --git a/scripts/bundle-windows.ps1 b/scripts/bundle-windows.ps1 index 72ddf740..582cf691 100644 --- a/scripts/bundle-windows.ps1 +++ b/scripts/bundle-windows.ps1 @@ -17,6 +17,7 @@ Copy-Item src bundle -Recurse -Force Copy-Item deps bundle -Recurse -Force Copy-Item CMakeLists.txt bundle -Recurse -Force Copy-Item LICENSE bundle -Recurse -Force +Copy-Item LICENSE.txt bundle -Recurse -Force Copy-Item README.md bundle -Recurse -Force Compress-Archive -Path bundle -DestinationPath r-type-windows.zip