diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2026-09-24 00:49:40 +0300 |
|---|---|---|
| committer | Andrey Lihatskiy <118752495+marchcat@users.noreply.github.com> | 2026-09-24 00:59:30 +0300 |
| commit | 818c337afa685221611a1beb67ca171437c6ec1d (patch) | |
| tree | 41594b2495a6c4749e1b299e5f2868b659fa9f13 | |
| parent | 3e0bbc751247cbdbbf123701e258612c8ed5c1b7 (diff) | |
Fix Luau license packaging and formatting
| -rw-r--r-- | indra/cmake/BuildPackagesInfo.cmake | 2 | ||||
| -rwxr-xr-x | indra/newview/viewer_manifest.py | 3 | ||||
| -rwxr-xr-x | scripts/packages-formatter.py | 1 |
3 files changed, 5 insertions, 1 deletions
diff --git a/indra/cmake/BuildPackagesInfo.cmake b/indra/cmake/BuildPackagesInfo.cmake index ee50a21e18..9a615ad3cd 100644 --- a/indra/cmake/BuildPackagesInfo.cmake +++ b/indra/cmake/BuildPackagesInfo.cmake @@ -15,7 +15,7 @@ add_custom_command(OUTPUT packages-info.txt ${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} + ${CMAKE_SOURCE_DIR}/cmake/run_build_test.py -DAUTOBUILD_ADDRSIZE=${ADDRESS_SIZE} -DAUTOBUILD=${AUTOBUILD_EXECUTABLE} -DPYTHONIOENCODING=utf-8 ${PYTHON_EXECUTABLE} ${CMAKE_SOURCE_DIR}/../scripts/packages-formatter.py "${VIEWER_CHANNEL}" "${VIEWER_SHORT_VERSION}.${VIEWER_VERSION_REVISION}" "${AUTOBUILD_INSTALL_DIR}" > packages-info.txt ) diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py index 326b3adaaf..f451b28475 100755 --- a/indra/newview/viewer_manifest.py +++ b/indra/newview/viewer_manifest.py @@ -143,6 +143,9 @@ class ViewerManifest(LLManifest): "settings_install.xml", src="environment") + # Include the full Luau license in the packaged viewer. + with self.prefix(src=pkgdir): + self.path("LICENSES/luau.txt") with self.prefix(src_dst="character"): self.path("*.llm") diff --git a/scripts/packages-formatter.py b/scripts/packages-formatter.py index 549f1a705d..340792158e 100755 --- a/scripts/packages-formatter.py +++ b/scripts/packages-formatter.py @@ -125,6 +125,7 @@ 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"))) +print() version = list(info['versions'].items()) version.sort() for pkg, pkg_version in version: |