Skip to content

Commit bcd2162

Browse files
committed
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 <[email protected]>
1 parent 1afa2ca commit bcd2162

File tree

4 files changed

+4
-6
lines changed

4 files changed

+4
-6
lines changed

CMakeLists.txt

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -514,12 +514,10 @@ set (CPACK_PACKAGE_VENDOR ${PROJECT_AUTHORS})
514514
set (CPACK_PACKAGE_DESCRIPTION_SUMMARY "OpenShadingLanguage is...")
515515
set (CPACK_PACKAGE_DESCRIPTION_FILE "${PROJECT_SOURCE_DIR}/src/doc/Description.txt")
516516
set (CPACK_PACKAGE_FILE_NAME ${PROJECT_NAME}-${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH}-${platform})
517-
file (COPY "${PROJECT_SOURCE_DIR}/LICENSE" DESTINATION "${CMAKE_BINARY_DIR}")
518-
file (RENAME "${CMAKE_BINARY_DIR}/LICENSE" "${CMAKE_BINARY_DIR}/License.txt")
519-
set (CPACK_RESOURCE_FILE_LICENSE "${CMAKE_BINARY_DIR}/License.txt")
517+
file (COPY "${PROJECT_SOURCE_DIR}/LICENSE.md" DESTINATION "${CMAKE_BINARY_DIR}")
518+
set (CPACK_RESOURCE_FILE_LICENSE "${CMAKE_BINARY_DIR}/LICENSE.md")
520519
file (COPY "${PROJECT_SOURCE_DIR}/README.md" DESTINATION "${CMAKE_BINARY_DIR}")
521-
file (RENAME "${CMAKE_BINARY_DIR}/README.md" "${CMAKE_BINARY_DIR}/Readme.txt")
522-
set (CPACK_RESOURCE_FILE_README "${CMAKE_BINARY_DIR}/Readme.txt")
520+
set (CPACK_RESOURCE_FILE_README "${CMAKE_BINARY_DIR}/README.md")
523521
set (CPACK_RESOURCE_FILE_WELCOME "${PROJECT_SOURCE_DIR}/src/doc/Welcome.txt")
524522
#set (CPACK_PACKAGE_EXECUTABLES I'm not sure what this is for)
525523
#set (CPACK_STRIP_FILES Do we need this?)
File renamed without changes.
File renamed without changes.

src/doc/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ set (public_docs osl-languagespec.pdf
1111

1212
install (FILES ${public_docs} DESTINATION ${CMAKE_INSTALL_DOCDIR} COMPONENT documentation)
1313

14-
install ( FILES "${PROJECT_SOURCE_DIR}/LICENSE"
14+
install ( FILES "${PROJECT_SOURCE_DIR}/LICENSE.md"
1515
"${PROJECT_SOURCE_DIR}/INSTALL.md"
1616
"${PROJECT_SOURCE_DIR}/CHANGES.md"
1717
"${PROJECT_SOURCE_DIR}/README.md"

0 commit comments

Comments
 (0)