Skip to content
Snippets Groups Projects
Commit cca7e12e authored by Nicky's avatar Nicky
Browse files

Bring packages formater step on par with 3p installation:

- When installing a 3P via use_prebuilt_binary it will pass --installdir=${AUTOBUILD_INSTALL_DIR} to
autobuild. On the other hand packages-formater was not passing this option, this could lead to subtle
errors when AUTOBUILD_INSTALL_DIR is different to what autobuild.xml stipulates.
parent 603ad5a4
No related branches found
No related tags found
2 merge requests!3Update to main branch,!2Rebase onto current main branch
...@@ -16,5 +16,5 @@ add_custom_command(OUTPUT packages-info.txt ...@@ -16,5 +16,5 @@ add_custom_command(OUTPUT packages-info.txt
COMMAND ${PYTHON_EXECUTABLE} 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}
${PYTHON_EXECUTABLE} ${PYTHON_EXECUTABLE}
${CMAKE_SOURCE_DIR}/../scripts/packages-formatter.py "${VIEWER_CHANNEL}" "${VIEWER_SHORT_VERSION}.${VIEWER_VERSION_REVISION}" > packages-info.txt ${CMAKE_SOURCE_DIR}/../scripts/packages-formatter.py "${VIEWER_CHANNEL}" "${VIEWER_SHORT_VERSION}.${VIEWER_VERSION_REVISION}" "${AUTOBUILD_INSTALL_DIR}" > packages-info.txt
) )
...@@ -34,6 +34,7 @@ ...@@ -34,6 +34,7 @@
parser = argparse.ArgumentParser(description='Format dependency version and copyright information for the viewer About box content') 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('channel', help='viewer channel name')
parser.add_argument('version', help='viewer version number') parser.add_argument('version', help='viewer version number')
parser.add_argument('install_dir', help="install dir of packages")
args = parser.parse_args() args = parser.parse_args()
_autobuild=os.getenv('AUTOBUILD', 'autobuild') _autobuild=os.getenv('AUTOBUILD', 'autobuild')
...@@ -74,8 +75,8 @@ def add_info(key, pkg, lines): ...@@ -74,8 +75,8 @@ def add_info(key, pkg, lines):
else: else:
dups[key].add(pkg) dups[key].add(pkg)
versions=autobuild('install', '--versions') versions=autobuild('install', '--versions', '--install-dir', args.install_dir)
copyrights=autobuild('install', '--copyrights') copyrights=autobuild('install', '--copyrights', '--install-dir', args.install_dir)
viewer_copyright = copyrights.readline() # first line is the copyright for the viewer itself 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: # Two different autobuild outputs, but we treat them essentially the same way:
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment