[Qt] Try mirrors if main server is down (#35029)

microsoft · Nov 14, 2023 · 7b3ea91 · 7b3ea91
1 parent dc3c55f
commit 7b3ea91
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 11 deletions.
diff --git a/ports/qtbase/cmake/qt_install_submodule.cmake b/ports/qtbase/cmake/qt_install_submodule.cmake
@@ -63,9 +63,9 @@ function(qt_download_submodule_impl)
             set(sha512 SHA512 "${${_qarg_SUBMODULE}_HASH}")
         endif()
 
-        qt_get_url_filename("${_qarg_SUBMODULE}" url filename)
+        qt_get_url_filename("${_qarg_SUBMODULE}" urls filename)
         vcpkg_download_distfile(archive
-            URLS "${url}"
+            URLS ${urls}
             FILENAME "${filename}"
             ${sha512}
         )

diff --git a/ports/qtbase/cmake/qt_port_details.cmake b/ports/qtbase/cmake/qt_port_details.cmake
@@ -101,23 +101,31 @@ set(QT_FROM_QT_GIT qtinterfaceframework)
 #set(QT_FROM_QT_GIT ${QT_PORTS})
 #list(POP_FRONT QT_FROM_QT_GIT)
 
-function(qt_get_url_filename qt_port out_url out_filename)
+function(qt_get_url_filename qt_port out_urls out_filename)
     if("${qt_port}" IN_LIST QT_FROM_GITHUB)
-        set(url "https://github.com/qt/${qt_port}/archive/v${QT_VERSION}.tar.gz")
+        set(urls "https://github.com/qt/${qt_port}/archive/v${QT_VERSION}.tar.gz")
         set(filename "qt-${qt_port}-v${QT_VERSION}.tar.gz")
     elseif("${qt_port}" IN_LIST QT_FROM_GITHUB_BRANCH)
-        set(url "https://github.com/qt/${qt_port}/archive/${QT_VERSION}.tar.gz")
+        set(urls "https://github.com/qt/${qt_port}/archive/${QT_VERSION}.tar.gz")
         set(filename "qt-${qt_port}-${QT_VERSION}.tar.gz")
     else()
         string(SUBSTRING "${QT_VERSION}" 0 3 qt_major_minor)
+
         if(NOT QT_DEV_BRANCH)
-            set(url "https://download.qt.io/archive/qt/${qt_major_minor}/${QT_VERSION}/submodules/${qt_port}-everywhere-src-${QT_VERSION}.tar.xz")
+            set(branch_subpath "archive")
         else()
-            set(url "https://download.qt.io/development_releases/qt/${qt_major_minor}/${QT_VERSION}/submodules/${qt_port}-everywhere-src-${QT_VERSION}.tar.xz")
+            set(branch_subpath "development_releases")
         endif()
+
         set(filename "${qt_port}-everywhere-src-${QT_VERSION}.tar.xz")
+        set(mirrors
+            "https://download.qt.io/"
+            "https://mirrors.ocf.berkeley.edu/qt/"
+        )
+        set(url_subpath "${branch_subpath}/qt/${qt_major_minor}/${QT_VERSION}/submodules/${filename}")
+        list(TRANSFORM mirrors APPEND "${url_subpath}" OUTPUT_VARIABLE urls)
     endif()
-    set(${out_url} "${url}" PARENT_SCOPE)
+    set(${out_urls} ${urls} PARENT_SCOPE)
     set(${out_filename} "${filename}" PARENT_SCOPE)
 endfunction()
 
@@ -145,9 +153,9 @@ if(QT_UPDATE_VERSION)
             string(SUBSTRING "${out}" 0 40 tag_sha)
             string(APPEND msg "set(${qt_port}_REF ${tag_sha})\n")
         else()
-            qt_get_url_filename("${qt_port}" url filename)
+            qt_get_url_filename("${qt_port}" urls filename)
             vcpkg_download_distfile(archive
-                URLS "${url}"
+                URLS ${urls}
                 FILENAME "${filename}"
                 SKIP_SHA512
             )

diff --git a/ports/qtbase/vcpkg.json b/ports/qtbase/vcpkg.json
@@ -1,6 +1,7 @@
 {
   "name": "qtbase",
   "version": "6.6.0",
+  "port-version": 1,
   "description": "Qt Application Framework Base Module. Includes Core, GUI, Widgets, Networking, SQL, Concurrent and other essential qt components.",
   "homepage": "https://www.qt.io/",
   "license": null,

diff --git a/versions/baseline.json b/versions/baseline.json
@@ -7054,7 +7054,7 @@
     },
     "qtbase": {
       "baseline": "6.6.0",
-      "port-version": 0
+      "port-version": 1
     },
     "qtcharts": {
       "baseline": "6.6.0",

diff --git a/versions/q-/qtbase.json b/versions/q-/qtbase.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "11861d085aeee91737a5dede66bb78845d99b0e7",
+      "version": "6.6.0",
+      "port-version": 1
+    },
     {
       "git-tree": "eb1e1a00df34c350c817ee3d9ab90d2c52ced194",
       "version": "6.6.0",