Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-09 02:56:55 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Make vcpkg build default to home directory on mac

Browse source
This commit is contained in:
Brad Davis 2018-11-26 12:37:11 -08:00
parent 7e2f1ca64a
commit 43b9aa29bc
1 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
prebuild.py
View file

@ -83,12 +83,17 @@ class VcpkgRepo:
self.sourcePortsPath = os.path.join(scriptPath, 'cmake', 'ports') self.sourcePortsPath = os.path.join(scriptPath, 'cmake', 'ports')
# FIXME Revert to ports hash before release # FIXME Revert to ports hash before release
self.id = hashFolder(self.sourcePortsPath)[:8] self.id = hashFolder(self.sourcePortsPath)[:8]
# OS dependent information
system = platform.system()
if args.vcpkg_root is not None: if args.vcpkg_root is not None:
print("override vcpkg path with " + args.vcpkg_root) print("override vcpkg path with " + args.vcpkg_root)
self.path = args.vcpkg_root self.path = args.vcpkg_root
else: else:
defaultBasePath = os.path.join(tempfile.gettempdir(), 'hifi', 'vcpkg') if 'Darwin' == system:
defaultBasePath = os.path.expanduser('~/hifi/vcpkg')
else:
defaultBasePath = os.path.join(tempfile.gettempdir(), 'hifi', 'vcpkg')
basePath = os.getenv('HIFI_VCPKG_BASE', defaultBasePath) basePath = os.getenv('HIFI_VCPKG_BASE', defaultBasePath)
if (not os.path.isdir(basePath)): if (not os.path.isdir(basePath)):
os.makedirs(basePath) os.makedirs(basePath)
@ -101,8 +106,6 @@ class VcpkgRepo:
self.tagContents = "{}_{}".format(self.id, self.version) self.tagContents = "{}_{}".format(self.id, self.version)
print("prebuild path: " + self.path) print("prebuild path: " + self.path)
# OS dependent information
system = platform.system()
if 'Windows' == system: if 'Windows' == system:
self.exe = os.path.join(self.path, 'vcpkg.exe') self.exe = os.path.join(self.path, 'vcpkg.exe')
self.vcpkgUrl = 'https://hifi-public.s3.amazonaws.com/dependencies/vcpkg/vcpkg-win32.tar.gz?versionId=YZYkDejDRk7L_hrK_WVFthWvisAhbDzZ' self.vcpkgUrl = 'https://hifi-public.s3.amazonaws.com/dependencies/vcpkg/vcpkg-win32.tar.gz?versionId=YZYkDejDRk7L_hrK_WVFthWvisAhbDzZ'