From 3e0bbc751247cbdbbf123701e258612c8ed5c1b7 Mon Sep 17 00:00:00 2001 From: Andrey Lihatskiy Date: Wed, 23 Sep 2026 22:50:20 +0300 Subject: Add Luau license to About info --- indra/cmake/BuildPackagesInfo.cmake | 1 + indra/newview/CMakeLists.txt | 3 +++ indra/newview/luau.txt | 22 ++++++++++++++++++++++ scripts/packages-formatter.py | 3 +++ 4 files changed, 29 insertions(+) create mode 100644 indra/newview/luau.txt diff --git a/indra/cmake/BuildPackagesInfo.cmake b/indra/cmake/BuildPackagesInfo.cmake index 659ba9d579..ee50a21e18 100644 --- a/indra/cmake/BuildPackagesInfo.cmake +++ b/indra/cmake/BuildPackagesInfo.cmake @@ -12,6 +12,7 @@ add_custom_command(OUTPUT packages-info.txt COMMENT "Generating packages-info.txt for the about box" MAIN_DEPENDENCY ${CMAKE_SOURCE_DIR}/../autobuild.xml DEPENDS ${CMAKE_SOURCE_DIR}/../scripts/packages-formatter.py + ${CMAKE_SOURCE_DIR}/newview/luau.txt ${CMAKE_SOURCE_DIR}/../autobuild.xml COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_SOURCE_DIR}/cmake/run_build_test.py -DAUTOBUILD_ADDRSIZE=${ADDRESS_SIZE} -DAUTOBUILD=${AUTOBUILD_EXECUTABLE} diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt index b5443cd96a..657eb75540 100644 --- a/indra/newview/CMakeLists.txt +++ b/indra/newview/CMakeLists.txt @@ -10,6 +10,9 @@ include(Linking) include(Boost) include(bugsplat) include(BuildPackagesInfo) +# Luau isn't an autobuild package, so stage its license separately. +file(MAKE_DIRECTORY "${AUTOBUILD_INSTALL_DIR}/LICENSES") +configure_file("${CMAKE_CURRENT_SOURCE_DIR}/luau.txt" "${AUTOBUILD_INSTALL_DIR}/LICENSES/luau.txt" COPYONLY) include(BuildVersion) include(CMakeCopyIfDifferent) include(CubemapToEquirectangularJS) diff --git a/indra/newview/luau.txt b/indra/newview/luau.txt new file mode 100644 index 0000000000..45d93adef3 --- /dev/null +++ b/indra/newview/luau.txt @@ -0,0 +1,22 @@ +MIT License + +Copyright (c) 2019-2025 Roblox Corporation +Copyright (c) 1994–2019 Lua.org, PUC-Rio. + +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/packages-formatter.py b/scripts/packages-formatter.py index 5d31702e76..549f1a705d 100755 --- a/scripts/packages-formatter.py +++ b/scripts/packages-formatter.py @@ -122,6 +122,9 @@ if any(pkgs for pkgs in list(dups.values())): print("%s %s" % (args.channel, args.version)) print(viewer_copyright) +# Luau is server-side and isn't listed in the viewer's autobuild packages. +with open(os.path.join(os.path.dirname(__file__), "..", "indra", "newview", "luau.txt"), encoding="utf-8") as luau_license: + print("Luau " + " / ".join(line.strip() for line in luau_license if line.startswith("Copyright"))) version = list(info['versions'].items()) version.sort() for pkg, pkg_version in version: -- cgit v1.3