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

Update new build URLs

Browse source
This commit is contained in:
David Rowe 2020-04-09 16:54:14 +12:00
parent ffeb37e7aa
commit a8b4f22fc6
8 changed files with 18 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
cmake/ports/aristo/portfile.cmake
View file

@ -5,7 +5,7 @@ set(MASTER_COPY_SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src)
if (WIN32) if (WIN32)
vcpkg_download_distfile( vcpkg_download_distfile(
ARISTO_SOURCE_ARCHIVE ARISTO_SOURCE_ARCHIVE
URLS https://hifi-public.s3.amazonaws.com/seth/aristo-0.8.1-windows.zip URLS https://athena-public.s3.amazonaws.com/seth/aristo-0.8.1-windows.zip
SHA512 05179c63b72a1c9f5be8a7a2b7389025da683400dbf819e5a6199dd6473c56774d2885182dc5a11cb6324058d228a4ead832222e8b3e1bebaa4c61982e85f0a8 SHA512 05179c63b72a1c9f5be8a7a2b7389025da683400dbf819e5a6199dd6473c56774d2885182dc5a11cb6324058d228a4ead832222e8b3e1bebaa4c61982e85f0a8
FILENAME aristo-0.8.1-windows.zip FILENAME aristo-0.8.1-windows.zip
) )

4
cmake/ports/glad/portfile.cmake
View file

@ -4,14 +4,14 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
if (ANDROID) if (ANDROID)
vcpkg_download_distfile( vcpkg_download_distfile(
SOURCE_ARCHIVE SOURCE_ARCHIVE
URLS https://public.highfidelity.com/dependencies/glad/glad32es.zip URLS https://athena-public.s3.amazonaws.com/dependencies/glad/glad32es.zip
SHA512 2e02ac633eed8f2ba2adbf96ea85d08998f48dd2e9ec9a88ec3c25f48eaf1405371d258066327c783772fcb3793bdb82bd7375fdabb2ba5e2ce0835468b17f65 SHA512 2e02ac633eed8f2ba2adbf96ea85d08998f48dd2e9ec9a88ec3c25f48eaf1405371d258066327c783772fcb3793bdb82bd7375fdabb2ba5e2ce0835468b17f65
) )
else() else()
# else Linux desktop # else Linux desktop
vcpkg_download_distfile( vcpkg_download_distfile(
SOURCE_ARCHIVE SOURCE_ARCHIVE
URLS https://public.highfidelity.com/dependencies/glad/glad45.zip URLS https://athena-public.s3.amazonaws.com/dependencies/glad/glad45.zip
SHA512 653a7b873f9fbc52e0ab95006cc3143bc7b6f62c6e032bc994e87669273468f37978525c9af5efe36f924cb4acd221eb664ad9af0ce4bf711b4f1be724c0065e SHA512 653a7b873f9fbc52e0ab95006cc3143bc7b6f62c6e032bc994e87669273468f37978525c9af5efe36f924cb4acd221eb664ad9af0ce4bf711b4f1be724c0065e
FILENAME glad45.zip FILENAME glad45.zip
) )

2
cmake/ports/polyvox/portfile.cmake
View file

@ -3,7 +3,7 @@ include(vcpkg_common_functions)
# else Linux desktop # else Linux desktop
vcpkg_download_distfile( vcpkg_download_distfile(
SOURCE_ARCHIVE SOURCE_ARCHIVE
URLS https://public.highfidelity.com/dependencies/polyvox-master-2015-7-15.zip URLS https://athena-public.s3.amazonaws.com/dependencies/polyvox-master-2015-7-15.zip
SHA512 cc04cd43ae74b9c7bb065953540c0048053fcba6b52dc4218b3d9431fba178d65ad4f6c53cc1122ba61d0ab4061e99a7ebbb15db80011d607c5070ebebf8eddc SHA512 cc04cd43ae74b9c7bb065953540c0048053fcba6b52dc4218b3d9431fba178d65ad4f6c53cc1122ba61d0ab4061e99a7ebbb15db80011d607c5070ebebf8eddc
FILENAME polyvox.zip FILENAME polyvox.zip
) )

2
cmake/ports/quazip/portfile.cmake
View file

@ -2,7 +2,7 @@ include(vcpkg_common_functions)
vcpkg_download_distfile( vcpkg_download_distfile(
SOURCE_ARCHIVE SOURCE_ARCHIVE
URLS https://public.highfidelity.com/dependencies/quazip-0.7.3.zip URLS https://athena-public.s3.amazonaws.com/dependencies/quazip-0.7.3.zip
SHA512 b2d812b6346317fd6d8f4f1344ad48b721d697c429acc8b7e7cb776ce5cba15a59efd64b2c5ae1f31b5a3c928014f084aa1379fd55d8a452a6cf4fd510b3afcc SHA512 b2d812b6346317fd6d8f4f1344ad48b721d697c429acc8b7e7cb776ce5cba15a59efd64b2c5ae1f31b5a3c928014f084aa1379fd55d8a452a6cf4fd510b3afcc
FILENAME quazip.zip FILENAME quazip.zip
) )

2
cmake/ports/sranipal/portfile.cmake
View file

@ -5,7 +5,7 @@ set(MASTER_COPY_SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src)
if (WIN32) if (WIN32)
vcpkg_download_distfile( vcpkg_download_distfile(
SRANIPAL_SOURCE_ARCHIVE SRANIPAL_SOURCE_ARCHIVE
URLS https://hifi-public.s3.amazonaws.com/seth/sranipal-1.1.0.1-windows.zip URLS https://athena-public.s3.amazonaws.com/seth/sranipal-1.1.0.1-windows.zip
SHA512 b09ce012abe4e3c71e8e69626bdd7823ff6576601a821ab365275f2764406a3e5f7b65fcf2eb1d0962eff31eb5958a148b00901f67c229dc6ace56eb5e6c9e1b SHA512 b09ce012abe4e3c71e8e69626bdd7823ff6576601a821ab365275f2764406a3e5f7b65fcf2eb1d0962eff31eb5958a148b00901f67c229dc6ace56eb5e6c9e1b
FILENAME sranipal-1.1.0.1-windows.zip FILENAME sranipal-1.1.0.1-windows.zip
) )

2
cmake/ports/vhacd/portfile.cmake
View file

@ -4,7 +4,7 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
# else Linux desktop # else Linux desktop
vcpkg_download_distfile( vcpkg_download_distfile(
SOURCE_ARCHIVE SOURCE_ARCHIVE
URLS https://public.highfidelity.com/dependencies/v-hacd-master.zip URLS https://athena-public.s3.amazonaws.com/dependencies/v-hacd-master.zip
SHA512 5d9bd4872ead9eb3574e4806d6c4f490353a04036fd5f571e1e44f47cb66b709e311abcd53af30bae0015a690152170aeed93209a626c28ebcfd6591f3bb036f SHA512 5d9bd4872ead9eb3574e4806d6c4f490353a04036fd5f571e1e44f47cb66b709e311abcd53af30bae0015a690152170aeed93209a626c28ebcfd6591f3bb036f
FILENAME vhacd.zip FILENAME vhacd.zip
) )

14
hifi_qt.py
View file

@ -29,6 +29,8 @@ endif()
self.configFilePath = os.path.join(args.build_root, 'qt.cmake') self.configFilePath = os.path.join(args.build_root, 'qt.cmake')
self.version = '5.12.3' self.version = '5.12.3'
self.assets_url = self.readVar('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)
if (not os.path.isdir(self.basePath)): if (not os.path.isdir(self.basePath)):
@ -49,19 +51,23 @@ endif()
system = platform.system() system = platform.system()
if 'Windows' == system: if 'Windows' == system:
self.qtUrl = 'https://hifi-public.s3.amazonaws.com/dependencies/vcpkg/qt5-install-5.12.3-windows3.tar.gz?versionId=5ADqP0M0j5ZfimUHrx4zJld6vYceHEsI' self.qtUrl = self.assets_url + '/dependencies/vcpkg/qt5-install-5.12.3-windows3.tar.gz?versionId=5ADqP0M0j5ZfimUHrx4zJld6vYceHEsI'
elif 'Darwin' == system: elif 'Darwin' == system:
self.qtUrl = 'https://hifi-public.s3.amazonaws.com/dependencies/vcpkg/qt5-install-5.12.3-macos.tar.gz?versionId=bLAgnoJ8IMKpqv8NFDcAu8hsyQy3Rwwz' self.qtUrl = self.assets_url + '/dependencies/vcpkg/qt5-install-5.12.3-macos.tar.gz?versionId=bLAgnoJ8IMKpqv8NFDcAu8hsyQy3Rwwz'
elif 'Linux' == system: elif 'Linux' == system:
if platform.linux_distribution()[1][:3] == '16.': if platform.linux_distribution()[1][:3] == '16.':
self.qtUrl = 'https://hifi-public.s3.amazonaws.com/dependencies/vcpkg/qt5-install-5.12.3-ubuntu-16.04-with-symbols.tar.gz' self.qtUrl = self.assets_url + '/dependencies/vcpkg/qt5-install-5.12.3-ubuntu-16.04-with-symbols.tar.gz'
elif platform.linux_distribution()[1][:3] == '18.': elif platform.linux_distribution()[1][:3] == '18.':
self.qtUrl = 'https://hifi-public.s3.amazonaws.com/dependencies/vcpkg/qt5-install-5.12.3-ubuntu-18.04.tar.gz' self.qtUrl = self.assets_url + '/dependencies/vcpkg/qt5-install-5.12.3-ubuntu-18.04.tar.gz'
else: else:
raise Exception('UNKNOWN LINUX VERSION!!!') raise Exception('UNKNOWN LINUX VERSION!!!')
else: else:
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

2
prebuild.py
View file

@ -125,7 +125,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://hifi-public.s3.amazonaws.com/dependencies/NSIS-hifi-plugins-1.0.tgz', "C:/Program Files (x86)") hifi_utils.downloadAndExtract('https://athena-public.s3.amazonaws.com/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