Reverted to longer line length license file and added custom macOS version.

This commit is contained in:
Leon Styhre 2020-09-17 21:49:40 +02:00
parent 2a852170a8
commit 254029fed6
3 changed files with 44 additions and 19 deletions

34
LICENSE
View file

@ -1,24 +1,20 @@
Original work Copyright (c) 2014 Alec Lofquist Original work Copyright (c) 2014 Alec Lofquist
Modified work Copyright (c) 2020 Leon Styhre Modified work Copyright (c) 2020 Leon Styhre
Permission is hereby granted, free of charge, to any person Permission is hereby granted, free of charge, to any person obtaining a copy
obtaining a copy of this software and associated documentation of this software and associated documentation files (the "Software"), to deal
files (the "Software"), to deal in the Software without in the Software without restriction, including without limitation the rights
restriction, including without limitation the rights to use, to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copy, modify, merge, publish, distribute, sublicense, and/or copies of the Software, and to permit persons to whom the Software is
sell copies of the Software, and to permit persons to whom furnished to do so, subject to the following conditions:
the Software is furnished to do so, subject to the following
conditions:
The above copyright notice and this permission notice shall be The above copyright notice and this permission notice shall be included in
included in all copies or substantial portions of the Software. all copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, THE SOFTWARE.
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE
OR OTHER DEALINGS IN THE SOFTWARE.

View file

@ -206,7 +206,12 @@ include(InstallRequiredSystemLibraries)
set(CPACK_PACKAGE_NAME "emulationstation-de") 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_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.") 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") set(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_SOURCE_DIR}/LICENSE")
endif()
set(CPACK_PACKAGE_VENDOR "Leon Styhre") set(CPACK_PACKAGE_VENDOR "Leon Styhre")
# Update this when there has been a new release. # Update this when there has been a new release.

View file

@ -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.