summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorAndrey Lihatskiy <alihatskiy@productengine.com>2023-03-20 01:23:16 +0200
committerAndrey Lihatskiy <alihatskiy@productengine.com>2023-03-20 01:23:16 +0200
commitdca3c83cd9f8d1ac8165707b080a420bf9a9a132 (patch)
treec73c0e7e4146c5191a9caf0b54ceb2b566fd5eb6 /scripts
parentffa8d83eaf11b11a091743c6d666cc6c74553671 (diff)
parentf7838ca17c7e4a5a595f5cb898c70a18be4c9cd9 (diff)
Merge branch 'DRTVWR-568' into DRTVWR-573-maint-R
# Conflicts: # indra/cmake/Copy3rdPartyLibs.cmake # indra/cmake/FindOpenJPEG.cmake # indra/cmake/OpenJPEG.cmake # indra/integration_tests/llui_libtest/CMakeLists.txt # indra/newview/CMakeLists.txt
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/packages-formatter.py5
1 files changed, 3 insertions, 2 deletions
diff --git a/scripts/packages-formatter.py b/scripts/packages-formatter.py
index ff7c892577..4449111e46 100755
--- a/scripts/packages-formatter.py
+++ b/scripts/packages-formatter.py
@@ -34,6 +34,7 @@ import argparse
parser = argparse.ArgumentParser(description='Format dependency version and copyright information for the viewer About box content')
parser.add_argument('channel', help='viewer channel name')
parser.add_argument('version', help='viewer version number')
+parser.add_argument('install_dir', help="install dir of packages")
args = parser.parse_args()
_autobuild=os.getenv('AUTOBUILD', 'autobuild')
@@ -74,8 +75,8 @@ def add_info(key, pkg, lines):
else:
dups[key].add(pkg)
-versions=autobuild('install', '--versions')
-copyrights=autobuild('install', '--copyrights')
+versions=autobuild('install', '--versions', '--install-dir', args.install_dir)
+copyrights=autobuild('install', '--copyrights', '--install-dir', args.install_dir)
viewer_copyright = copyrights.readline() # first line is the copyright for the viewer itself
# Two different autobuild outputs, but we treat them essentially the same way: