From b89ddf33eca4d67b2d2610eba7de7ae15b05fd92 Mon Sep 17 00:00:00 2001
From: Thijs Wenker <me@thoys.nl>
Date: Wed, 8 Apr 2020 12:07:53 +0200
Subject: [PATCH] fix missing url

---
 hifi_qt.py    | 6 +-----
 hifi_utils.py | 4 ++++
 prebuild.py   | 9 ++++++---
 3 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/hifi_qt.py b/hifi_qt.py
index 6cae3bf59d..b046342745 100644
--- a/hifi_qt.py
+++ b/hifi_qt.py
@@ -29,7 +29,7 @@ endif()
         self.configFilePath = os.path.join(args.build_root, 'qt.cmake')
         self.version = os.getenv('VIRCADIA_USE_QT_VERSION', '5.12.3')
 
-        self.assets_url = self.readVar('EXTERNAL_BUILD_ASSETS')
+        self.assets_url = hifi_utils.readEnviromentVariableFromFile(args.build_root, 'EXTERNAL_BUILD_ASSETS')
 
         defaultBasePath = os.path.expanduser('~/hifi/qt')
         self.basePath = os.getenv('HIFI_QT_BASE', defaultBasePath)
@@ -89,10 +89,6 @@ endif()
             print("Machine     : " + platform.machine())
             raise Exception('UNKNOWN OPERATING SYSTEM!!!')
 
-    def readVar(self, var):
-        with open(os.path.join(self.args.build_root, '_env', var + ".txt")) as fp:
-            return fp.read()
-
     def writeConfig(self):
         print("Writing cmake config to {}".format(self.configFilePath))
         # Write out the configuration for use by CMake
diff --git a/hifi_utils.py b/hifi_utils.py
index 3a49f6d52b..157e5858a8 100644
--- a/hifi_utils.py
+++ b/hifi_utils.py
@@ -121,3 +121,7 @@ def downloadAndExtract(url, destPath, hash=None, hasher=hashlib.sha512(), isZip=
         with tarfile.open(tempFileName, 'r:*') as tgz:
             tgz.extractall(destPath)
     os.remove(tempFileName)
+
+def readEnviromentVariableFromFile(buildRootDir, var):
+    with open(os.path.join(buildRootDir, '_env', var + ".txt")) as fp:
+        return fp.read()
diff --git a/prebuild.py b/prebuild.py
index b15c83e4fe..d0bbc75fb7 100644
--- a/prebuild.py
+++ b/prebuild.py
@@ -95,6 +95,7 @@ def parse_args():
     parser.add_argument('--release-type', type=str, default="DEV", help="DEV, PR, or PRODUCTION")
     parser.add_argument('--vcpkg-root', type=str, help='The location of the vcpkg distribution')
     parser.add_argument('--vcpkg-build-type', type=str, help='Could be `release` or `debug`. By default it doesn`t set the build-type')
+    parser.add_argument('--vcpkg-skip-clean', action='store_true', help='Skip the cleanup of vcpkg downloads and packages folders after vcpkg build completition.')
     parser.add_argument('--build-root', required=True, type=str, help='The location of the cmake build')
     parser.add_argument('--ports-path', type=str, default=defaultPortsPath)
     parser.add_argument('--ci-build', action='store_true', default=os.getenv('CI_BUILD') is not None)
@@ -114,6 +115,7 @@ def main():
             del os.environ[var]
 
     args = parse_args()
+    assets_url = hifi_utils.readEnviromentVariableFromFile(args.build_root, 'EXTERNAL_BUILD_ASSETS')
 
     if args.ci_build:
         logging.basicConfig(datefmt='%H:%M:%S', format='%(asctime)s %(guid)s %(message)s', level=logging.INFO)
@@ -126,7 +128,7 @@ def main():
     if 'Windows' == system and 'CI_BUILD' in os.environ and os.environ["CI_BUILD"] == "Github":
         logger.info("Downloading NSIS")
         with timer('NSIS'):
-            hifi_utils.downloadAndExtract('https://athena-public.s3.amazonaws.com/dependencies/NSIS-hifi-plugins-1.0.tgz', "C:/Program Files (x86)")
+            hifi_utils.downloadAndExtract(assets_url + '/dependencies/NSIS-hifi-plugins-1.0.tgz', "C:/Program Files (x86)")
 
     qtInstallPath = ''
     # If not android, install our Qt build
@@ -183,8 +185,9 @@ def main():
         # Fixup the vcpkg cmake to not reset VCPKG_TARGET_TRIPLET
         pm.fixupCmakeScript()
 
-        # Cleanup downloads and packages folders in vcpkg to make it smaller for CI
-        pm.cleanupDevelopmentFiles()
+        if not args.vcpkg_skip_clean:
+            # Cleanup downloads and packages folders in vcpkg to make it smaller for CI
+            pm.cleanupDevelopmentFiles()
 
         # Write the vcpkg config to the build directory last
         with timer('Writing configuration'):