Mirrors/overte-thingvellir
3
0
Fork 0
mirror of https://thingvellir.net/git/overte synced 2025-03-27 23:52:03 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix missing url

Browse source
This commit is contained in:
Thijs Wenker 2020-04-08 12:07:53 +02:00
parent 25932d3ab5
commit b89ddf33ec
3 changed files with 11 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
hifi_qt.py
View file

@ -29,7 +29,7 @@ endif()
self.configFilePath = os.path.join(args.build_root, 'qt.cmake') self.configFilePath = os.path.join(args.build_root, 'qt.cmake')
self.version = os.getenv('VIRCADIA_USE_QT_VERSION', '5.12.3') 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') defaultBasePath = os.path.expanduser('~/hifi/qt')
self.basePath = os.getenv('HIFI_QT_BASE', defaultBasePath) self.basePath = os.getenv('HIFI_QT_BASE', defaultBasePath)
@ -89,10 +89,6 @@ endif()
print("Machine : " + platform.machine()) print("Machine : " + platform.machine())
raise Exception('UNKNOWN OPERATING SYSTEM!!!') 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): def writeConfig(self):
print("Writing cmake config to {}".format(self.configFilePath)) print("Writing cmake config to {}".format(self.configFilePath))
# Write out the configuration for use by CMake # Write out the configuration for use by CMake

4
hifi_utils.py
View file

@ -121,3 +121,7 @@ def downloadAndExtract(url, destPath, hash=None, hasher=hashlib.sha512(), isZip=
with tarfile.open(tempFileName, 'r:*') as tgz: with tarfile.open(tempFileName, 'r:*') as tgz:
tgz.extractall(destPath) tgz.extractall(destPath)
os.remove(tempFileName) os.remove(tempFileName)
def readEnviromentVariableFromFile(buildRootDir, var):
with open(os.path.join(buildRootDir, '_env', var + ".txt")) as fp:
return fp.read()

9
prebuild.py
View file

@ -95,6 +95,7 @@ def parse_args():
parser.add_argument('--release-type', type=str, default="DEV", help="DEV, PR, or PRODUCTION") 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-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-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('--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('--ports-path', type=str, default=defaultPortsPath)
parser.add_argument('--ci-build', action='store_true', default=os.getenv('CI_BUILD') is not None) 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] del os.environ[var]
args = parse_args() args = parse_args()
assets_url = hifi_utils.readEnviromentVariableFromFile(args.build_root, 'EXTERNAL_BUILD_ASSETS')
if args.ci_build: if args.ci_build:
logging.basicConfig(datefmt='%H:%M:%S', format='%(asctime)s %(guid)s %(message)s', level=logging.INFO) 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": if 'Windows' == system and 'CI_BUILD' in os.environ and os.environ["CI_BUILD"] == "Github":
logger.info("Downloading NSIS") logger.info("Downloading NSIS")
with timer('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 = '' qtInstallPath = ''
# If not android, install our Qt build # If not android, install our Qt build
@ -183,8 +185,9 @@ def main():
# Fixup the vcpkg cmake to not reset VCPKG_TARGET_TRIPLET # Fixup the vcpkg cmake to not reset VCPKG_TARGET_TRIPLET
pm.fixupCmakeScript() pm.fixupCmakeScript()
# Cleanup downloads and packages folders in vcpkg to make it smaller for CI if not args.vcpkg_skip_clean:
pm.cleanupDevelopmentFiles() # Cleanup downloads and packages folders in vcpkg to make it smaller for CI
pm.cleanupDevelopmentFiles()
# Write the vcpkg config to the build directory last # Write the vcpkg config to the build directory last
with timer('Writing configuration'): with timer('Writing configuration'):