From 09e0413faf1101182b9f91a1beb9a4cef456229d Mon Sep 17 00:00:00 2001 From: Dale Glass Date: Mon, 4 Dec 2023 22:02:13 +0100 Subject: [PATCH] Update Linux vcpkg to the same as the Windows version --- hifi_vcpkg.py | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/hifi_vcpkg.py b/hifi_vcpkg.py index a45975e7a5..45712922e0 100644 --- a/hifi_vcpkg.py +++ b/hifi_vcpkg.py @@ -13,7 +13,7 @@ from os import path print = functools.partial(print, flush=True) -# Encapsulates the vcpkg system +# Encapsulates the vcpkg system class VcpkgRepo: CMAKE_TEMPLATE = """ # this file auto-generated by hifi_vcpkg.py @@ -80,7 +80,7 @@ endif() self.lockFile = os.path.join(lockDir, lockName) self.tagFile = os.path.join(self.path, '.id') self.prebuildTagFile = os.path.join(self.path, '.prebuild') - # A format version attached to the tag file... increment when you want to force the build systems to rebuild + # A format version attached to the tag file... increment when you want to force the build systems to rebuild # without the contents of the ports changing self.version = 1 self.tagContents = "{}_{}".format(self.id, self.version) @@ -114,8 +114,8 @@ endif() else: self.exe = os.path.join(self.path, 'vcpkg') self.bootstrapCmds = [ os.path.join(self.path, 'bootstrap-vcpkg.sh'), '-disableMetrics' ] - self.vcpkgUrl = self.assets_url + '/dependencies/vcpkg/vcpkg-linux_amd64_2022.07.25.tar.xz' - self.vcpkgHash = '6a1ce47ef6621e699a4627e8821ad32528c82fce62a6939d35b205da2d299aaa405b5f392df4a9e5343dd6a296516e341105fbb2dd8b48864781d129d7fba10d' + self.vcpkgUrl = self.assets_url + '/dependencies/vcpkg/vcpkg-linux_amd64_2023.10.19.tar.xz' + self.vcpkgHash = '67e1ae7e00a7e5812790619cccfbd85982094f4b54170c9c39b4546bb3ab34860e7f67c9065ccecd650f3036c3ceeb675753902f3114f6f27d2ee78736574240' self.hostTriplet = 'x64-linux' if self.args.android: @@ -188,7 +188,7 @@ endif() if not downloadVcpkg and not os.path.isfile(self.exe): print("Missing executable, boot-strapping") downloadVcpkg = True - + # Make sure we have a vcpkg executable testFile = os.path.join(self.path, '.vcpkg-root') if not downloadVcpkg and not os.path.isfile(testFile): @@ -241,7 +241,7 @@ endif() hifi_utils.downloadAndExtract(self.prebuiltArchive, self.path) self.writePrebuildTag() return - + if qt is not None: self.buildEnv['QT_CMAKE_PREFIX_PATH'] = qt @@ -327,12 +327,12 @@ endif() write_obj.write(line) else: isFileChanged = True - + if isFileChanged: shutil.move(newCmakeScript, cmakeScript) else: os.remove(newCmakeScript) - + def writeConfig(self): print("Writing cmake config to {}".format(self.configFilePath)) @@ -352,7 +352,7 @@ endif() f.write(cmakeConfig) def cleanOldBuilds(self): - # FIXME because we have the base directory, and because a build will - # update the tag file on every run, we can scan the base dir for sub directories containing + # FIXME because we have the base directory, and because a build will + # update the tag file on every run, we can scan the base dir for sub directories containing # a tag file that is older than N days, and if found, delete the directory, recovering space print("Not implemented")