From bcd21623110b5cea0011c95ff71cfe66cae6e7e4 Mon Sep 17 00:00:00 2001 From: Larry Gritz Date: Thu, 27 Aug 2020 13:05:04 -0700 Subject: [PATCH] License file renames for uniformity and correct autodetection (#1246) Rename LICENSE -> LICENSE.md for uniformity with other projects and our own documentation. Rename LICENSE-THIRD-PARTY.md -> THIRD-PARTY.md because it was confusing GitHub's autodetection of the license (this makes many tools, including third part such as the ASWF's landscape fail to correctly categorize this project as BSD-3-Clause). Signed-off-by: Larry Gritz --- CMakeLists.txt | 8 +++----- LICENSE => LICENSE.md | 0 LICENSE-THIRD-PARTY.md => THIRD-PARTY.md | 0 src/doc/CMakeLists.txt | 2 +- 4 files changed, 4 insertions(+), 6 deletions(-) rename LICENSE => LICENSE.md (100%) rename LICENSE-THIRD-PARTY.md => THIRD-PARTY.md (100%) diff --git a/CMakeLists.txt b/CMakeLists.txt index b617d5a4a..3dabf17c5 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -514,12 +514,10 @@ set (CPACK_PACKAGE_VENDOR ${PROJECT_AUTHORS}) set (CPACK_PACKAGE_DESCRIPTION_SUMMARY "OpenShadingLanguage is...") set (CPACK_PACKAGE_DESCRIPTION_FILE "${PROJECT_SOURCE_DIR}/src/doc/Description.txt") set (CPACK_PACKAGE_FILE_NAME ${PROJECT_NAME}-${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH}-${platform}) -file (COPY "${PROJECT_SOURCE_DIR}/LICENSE" DESTINATION "${CMAKE_BINARY_DIR}") -file (RENAME "${CMAKE_BINARY_DIR}/LICENSE" "${CMAKE_BINARY_DIR}/License.txt") -set (CPACK_RESOURCE_FILE_LICENSE "${CMAKE_BINARY_DIR}/License.txt") +file (COPY "${PROJECT_SOURCE_DIR}/LICENSE.md" DESTINATION "${CMAKE_BINARY_DIR}") +set (CPACK_RESOURCE_FILE_LICENSE "${CMAKE_BINARY_DIR}/LICENSE.md") file (COPY "${PROJECT_SOURCE_DIR}/README.md" DESTINATION "${CMAKE_BINARY_DIR}") -file (RENAME "${CMAKE_BINARY_DIR}/README.md" "${CMAKE_BINARY_DIR}/Readme.txt") -set (CPACK_RESOURCE_FILE_README "${CMAKE_BINARY_DIR}/Readme.txt") +set (CPACK_RESOURCE_FILE_README "${CMAKE_BINARY_DIR}/README.md") set (CPACK_RESOURCE_FILE_WELCOME "${PROJECT_SOURCE_DIR}/src/doc/Welcome.txt") #set (CPACK_PACKAGE_EXECUTABLES I'm not sure what this is for) #set (CPACK_STRIP_FILES Do we need this?) diff --git a/LICENSE b/LICENSE.md similarity index 100% rename from LICENSE rename to LICENSE.md diff --git a/LICENSE-THIRD-PARTY.md b/THIRD-PARTY.md similarity index 100% rename from LICENSE-THIRD-PARTY.md rename to THIRD-PARTY.md diff --git a/src/doc/CMakeLists.txt b/src/doc/CMakeLists.txt index 5f2f3e0b3..d79c7b6b3 100644 --- a/src/doc/CMakeLists.txt +++ b/src/doc/CMakeLists.txt @@ -11,7 +11,7 @@ set (public_docs osl-languagespec.pdf install (FILES ${public_docs} DESTINATION ${CMAKE_INSTALL_DOCDIR} COMPONENT documentation) -install ( FILES "${PROJECT_SOURCE_DIR}/LICENSE" +install ( FILES "${PROJECT_SOURCE_DIR}/LICENSE.md" "${PROJECT_SOURCE_DIR}/INSTALL.md" "${PROJECT_SOURCE_DIR}/CHANGES.md" "${PROJECT_SOURCE_DIR}/README.md"