From 254029fed62c0c82760f911cdb3f6d8f930ae501 Mon Sep 17 00:00:00 2001 From: Leon Styhre Date: Thu, 17 Sep 2020 21:49:40 +0200 Subject: [PATCH] Reverted to longer line length license file and added custom macOS version. --- LICENSE | 34 ++++++++++------------- es-app/CMakeLists.txt | 5 ++++ es-app/assets/EmulationStation-DE_LICENSE | 24 ++++++++++++++++ 3 files changed, 44 insertions(+), 19 deletions(-) create mode 100644 es-app/assets/EmulationStation-DE_LICENSE diff --git a/LICENSE b/LICENSE index 1af585273..2ff1e8f4c 100644 --- a/LICENSE +++ b/LICENSE @@ -1,24 +1,20 @@ Original work Copyright (c) 2014 Alec Lofquist Modified work Copyright (c) 2020 Leon Styhre -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: +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 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. +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/es-app/CMakeLists.txt b/es-app/CMakeLists.txt index 2bf974962..774a4032f 100644 --- a/es-app/CMakeLists.txt +++ b/es-app/CMakeLists.txt @@ -206,7 +206,12 @@ include(InstallRequiredSystemLibraries) set(CPACK_PACKAGE_NAME "emulationstation-de") set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "An emulator front-end with controller navigation and theming support.") set(CPACK_PACKAGE_DESCRIPTION "EmulationStation Desktop Edition is a fast and flexible front-end for browsing and launching games from your multi-platform retro game collection. It's intended to be used in conjunction with emulators such as the RetroArch cores.") +if(APPLE) +# Shorter line length license file to be able to fit inside the macOS drag and drop installer window without causing ugly line breaks. +set(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/assets/EmulationStation-DE_LICENSE") +else() set(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_SOURCE_DIR}/LICENSE") +endif() set(CPACK_PACKAGE_VENDOR "Leon Styhre") # Update this when there has been a new release. diff --git a/es-app/assets/EmulationStation-DE_LICENSE b/es-app/assets/EmulationStation-DE_LICENSE new file mode 100644 index 000000000..1af585273 --- /dev/null +++ b/es-app/assets/EmulationStation-DE_LICENSE @@ -0,0 +1,24 @@ +Original work Copyright (c) 2014 Alec Lofquist +Modified work Copyright (c) 2020 Leon Styhre + +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.