Update windows build with symbols for release qt-5.12.3

hifi_vcpkg.py will now download a new version of qt that contains release symbols. made minor changes to bullet3/portfile.cmake to trigger a new vkpkg hash.
hifi-archive · May 23, 2019 · a7874fa · a7874fa
1 parent 4735b9f
commit a7874fa
Show file tree

Hide file tree

Showing 4 changed files with 198 additions and 204 deletions.
diff --git a/cmake/ports/bullet3/portfile.cmake b/cmake/ports/bullet3/portfile.cmake
@@ -25,14 +25,13 @@ vcpkg_from_github(
     HEAD_REF master
 )
 
-
 vcpkg_configure_cmake(
     SOURCE_PATH ${SOURCE_PATH}
     OPTIONS
         -DCMAKE_WINDOWS_EXPORT_ALL_SYMBOLS=ON
         -DUSE_MSVC_RUNTIME_LIBRARY_DLL=ON
-        -DUSE_GLUT=0 
-        -DUSE_DX11=0	
+        -DUSE_GLUT=0
+        -DUSE_DX11=0
         -DBUILD_DEMOS=OFF
         -DBUILD_OPENGL3_DEMOS=OFF
         -DBUILD_BULLET3=OFF

diff --git a/hifi_vcpkg.py b/hifi_vcpkg.py
@@ -258,18 +258,13 @@ def installQt(self):
 
             url = 'NOT DEFINED'
             if platform.system() == 'Windows':
-                # TODO: figure out how to download with versionId
-                #url = 'https://hifi-public.s3.amazonaws.com/dependencies/vcpkg/qt5-install-5.12.3-windows.tar.gz?versionId=Etx8novAe0.IxQ7AosLFtop7fZur.cx9'
-                url = 'https://hifi-public.s3.amazonaws.com/dependencies/vcpkg/qt5-install-5.12.3-windows.tar.gz'
+                url = 'https://hifi-public.s3.amazonaws.com/dependencies/vcpkg/qt5-install-5.12.3-windows2.tar.gz'
             elif platform.system() == 'Darwin':
-                #url = 'https://hifi-public.s3.amazonaws.com/dependencies/vcpkg/qt5-install-5.12.3-macos.tar.gz?versionId=QrGxwssB.WwU_z3QCyG7ghP1_VjTkQeK'
                 url = 'https://hifi-public.s3.amazonaws.com/dependencies/vcpkg/qt5-install-5.12.3-macos.tar.gz'
             elif platform.system() == 'Linux':
                 if platform.linux_distribution()[1] == '16.04':
-                    #url = 'https://hifi-public.s3.amazonaws.com/dependencies/vcpkg/qt5-install-5.12.3-ubuntu-16.04.tar.gz?versionId=c9j7PW4uBDPLif7DKmgIhorh9WBMjZRB'
                     url = 'https://hifi-public.s3.amazonaws.com/dependencies/vcpkg/qt5-install-5.12.3-ubuntu-16.04.tar.gz'
                 elif platform.linux_distribution()[1] == '18.04':
-                    #url = 'https://hifi-public.s3.amazonaws.com/dependencies/vcpkg/qt5-install-5.12.3-ubuntu-18.04.tar.gz?versionId=Z3TojPFdb5pXdahF3oi85jjKocpL0xqw'
                     url = 'https://hifi-public.s3.amazonaws.com/dependencies/vcpkg/qt5-install-5.12.3-ubuntu-18.04.tar.gz'
                 else:
                     print('UNKNOWN LINUX VERSION!!!')