Mirrors/overte-AleziaKurdis
3
0
Fork 0
mirror of https://github.com/AleziaKurdis/overte.git synced 2025-04-05 14:51:52 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix prebuild.py code ordering to make --get-vcpkg-id and --get-vcpkg-path correctly in the repo root

Browse source
This commit is contained in:
Dale Glass 2024-02-26 20:07:00 +01:00
parent c19142c844
commit e6ed4f4ebc
2 changed files with 23 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
hifi_vcpkg.py
View file

@ -41,7 +41,13 @@ endif()
else: else:
self.id = hifi_utils.hashFolder(self.sourcePortsPath)[:8] self.id = hifi_utils.hashFolder(self.sourcePortsPath)[:8]
self.configFilePath = os.path.join(args.build_root, 'vcpkg.cmake') self.configFilePath = os.path.join(args.build_root, 'vcpkg.cmake')
self.assets_url = self.readVar('EXTERNAL_BUILD_ASSETS')
if args.get_vcpkg_id or args.get_vcpkg_path:
# With these arguments no assets will be downloaded, and they may be used in conditions
# where the _env hack doesn't work.
self.assets_url = "http://no_assets.invalid"
else:
self.assets_url = self.readVar('EXTERNAL_BUILD_ASSETS')
# The noClean flag indicates we're doing weird dependency maintenance stuff # The noClean flag indicates we're doing weird dependency maintenance stuff
# i.e. we've got an explicit checkout of vcpkg and we don't want the script to # i.e. we've got an explicit checkout of vcpkg and we don't want the script to

28
prebuild.py
View file

@ -104,16 +104,30 @@ def main():
args = parse_args() args = parse_args()
if args.get_vcpkg_id or args.get_vcpkg_path:
# These arguments need quiet mode to avoid confusing scripts that use them.
args.quiet = True
if not args.quiet: if not args.quiet:
print(sys.argv) print(sys.argv)
assets_url = hifi_utils.readEnviromentVariableFromFile(args.build_root, 'EXTERNAL_BUILD_ASSETS')
if args.ci_build: if args.ci_build:
logging.basicConfig(datefmt='%H:%M:%S', format='%(asctime)s %(guid)s %(message)s', level=logging.INFO) logging.basicConfig(datefmt='%H:%M:%S', format='%(asctime)s %(guid)s %(message)s', level=logging.INFO)
logger.info('start') logger.info('start')
pm = hifi_vcpkg.VcpkgRepo(args)
if args.get_vcpkg_id:
print(pm.id)
exit(0)
if args.get_vcpkg_path:
print(pm.path)
exit(0)
assets_url = hifi_utils.readEnviromentVariableFromFile(args.build_root, 'EXTERNAL_BUILD_ASSETS')
# OS dependent information # OS dependent information
system = platform.system() system = platform.system()
if 'Windows' == system and 'CI_BUILD' in os.environ and os.environ["CI_BUILD"] == "Github": if 'Windows' == system and 'CI_BUILD' in os.environ and os.environ["CI_BUILD"] == "Github":
@ -143,16 +157,6 @@ def main():
else: else:
raise Exception("Internal error: System Qt not selected, but hifi_qt.py failed to return a cmake path") raise Exception("Internal error: System Qt not selected, but hifi_qt.py failed to return a cmake path")
pm = hifi_vcpkg.VcpkgRepo(args)
if args.get_vcpkg_id:
print(pm.id)
exit(0)
if args.get_vcpkg_path:
print(pm.path)
exit(0)
if qtInstallPath is not None: if qtInstallPath is not None:
pm.writeVar('QT_CMAKE_PREFIX_PATH', qtInstallPath) pm.writeVar('QT_CMAKE_PREFIX_PATH', qtInstallPath)