Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-05-29 10:39:54 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' of https://github.com/highfidelity/hifi into 19991-MacAppData

Browse source
This commit is contained in:
NissimHadar 2018-11-26 18:11:20 -08:00
commit 4700b94f28
2 changed files with 9 additions and 6 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'

6
tools/dissectors/1-hfudt.lua
View file

@ -39,9 +39,9 @@ p_hfudt.fields = {
local control_types = { local control_types = {
[0] = { "ACK", "Acknowledgement" }, [0] = { "ACK", "Acknowledgement" },
[5] = { "Handshake", "Handshake" }, [1] = { "Handshake", "Handshake" },
[6] = { "HandshakeACK", "Acknowledgement of Handshake" }, [2] = { "HandshakeACK", "Acknowledgement of Handshake" },
[8] = { "HandshakeRequest", "Request a Handshake" } [3] = { "HandshakeRequest", "Request a Handshake" }
} }
local message_positions = { local message_positions = {