Browse Source

aqt: Add version 3.1.17 (#4782)

* aqt: Add version 3.1.17

and drop support for signed versions as they're no longer produced

* Update xmake.lua
Jérôme Leclercq 1 year ago
parent
commit
5fe0269799
1 changed files with 23 additions and 13 deletions
  1. 23 13
      packages/a/aqt/xmake.lua

+ 23 - 13
packages/a/aqt/xmake.lua

@@ -4,24 +4,31 @@ package("aqt")
     set_description("aqt: Another (unofficial) Qt CLI Installer on multi-platforms")
     set_description("aqt: Another (unofficial) Qt CLI Installer on multi-platforms")
     set_license("MIT")
     set_license("MIT")
 
 
+    add_configs("shared", {description = "Download shared binaries.", default = true, type = "boolean", readonly = true})
+
     if is_host("windows") and (os.arch() == "x64" or os.arch() == "x86") then
     if is_host("windows") and (os.arch() == "x64" or os.arch() == "x86") then
-        add_configs("shared", {description = "Download shared binaries.", default = true, type = "boolean", readonly = true})
         add_configs("runtimes", {description = "Set compiler runtimes.", default = "MD", readonly = true})
         add_configs("runtimes", {description = "Set compiler runtimes.", default = "MD", readonly = true})
 
 
         if os.arch() == "x86" then
         if os.arch() == "x86" then
-            add_urls("https://github.com/miurahr/aqtinstall/releases/download/v$(version)/aqt_x86_signed.exe", { alias = "signed" })
-            add_urls("https://github.com/miurahr/aqtinstall/releases/download/v$(version)/aqt_x86.exe", { alias = "regular" })
-            add_versions("signed:3.1.6", "dc675b64caceaacaf2d2bd711fb7a005ab2bcf7f6a28702e52408965f65718ec")
-            add_versions("regular:3.1.6", "093b536fab2e3726a792cdb60292313c0c8950b8aa9b56ccdeff7adb1146f964")
-            add_versions("regular:3.0.2", "aac5d8949eed3f231bfc589736afe0f88372dc590182c8b3a2bed7c78952b944")
-            add_versions("regular:2.0.6", "b980985cfeb1cefef1d2ebab91ae4e648873a27fae8831deff8144661480c56a")
+            add_urls("https://github.com/miurahr/aqtinstall/releases/download/v$(version)/aqt_x86.exe")
+            add_versions("3.1.17", "d3abbd3378907f2e3ebf3af3387590245bb04175e1a720d04463b047732e1cd2")
+            add_versions("3.1.6", "093b536fab2e3726a792cdb60292313c0c8950b8aa9b56ccdeff7adb1146f964")
+            add_versions("3.0.2", "aac5d8949eed3f231bfc589736afe0f88372dc590182c8b3a2bed7c78952b944")
+            add_versions("2.0.6", "b980985cfeb1cefef1d2ebab91ae4e648873a27fae8831deff8144661480c56a")
+        else
+            add_urls("https://github.com/miurahr/aqtinstall/releases/download/v$(version)/aqt_x64.exe")
+            add_versions("3.1.17", "02acc10c6317a2a9f76464d5c26b129b836531f81938b2b222498c495d69fcdb")
+            add_versions("3.1.6", "4f7e3fbc2d155f903ed9597b7929201681ffb7628e97765511cc7efa8a60f3e6")
+            add_versions("3.0.2", "96e46eca0d18a899db00a26facd20c799f2400645aef6445d49f4bd0aeab0a3f")
+            add_versions("2.0.6", "b0ad07fe8fd2c094425449f3053598959e467833dadf509da948571259510078")
+        end
+    elseif is_host("macosx") and (os.arch() == "arm64" or os.arch() == "x86_64") then
+        if os.arch() == "arm64" then
+            add_urls("https://github.com/miurahr/aqtinstall/releases/download/v$(version)/aqt-macos")
+            add_versions("3.1.17", "cb51decbc12500d2e3e4b743dd4abb86a91fd9f25a916cafe54572963acf0690")
         else
         else
-            add_urls("https://github.com/miurahr/aqtinstall/releases/download/v$(version)/aqt_x64_signed.exe", { alias = "signed" })
-            add_urls("https://github.com/miurahr/aqtinstall/releases/download/v$(version)/aqt_x64.exe", { alias = "regular" })
-            add_versions("signed:3.1.6", "ca988c2aedaed379d1672e95ed38f91be5e803a5f2947b25c29e8b28fb2bd5c8")
-            add_versions("regular:3.1.6", "4f7e3fbc2d155f903ed9597b7929201681ffb7628e97765511cc7efa8a60f3e6")
-            add_versions("regular:3.0.2", "96e46eca0d18a899db00a26facd20c799f2400645aef6445d49f4bd0aeab0a3f")
-            add_versions("regular:2.0.6", "b0ad07fe8fd2c094425449f3053598959e467833dadf509da948571259510078")
+            add_urls("https://github.com/miurahr/aqtinstall/releases/download/v$(version)/aqt-macos")
+            add_versions("3.1.17", "cb51decbc12500d2e3e4b743dd4abb86a91fd9f25a916cafe54572963acf0690")
         end
         end
     else
     else
         add_deps("7z")
         add_deps("7z")
@@ -31,6 +38,9 @@ package("aqt")
     on_install("@macosx", "@linux", "@windows", "@msys", function (package)
     on_install("@macosx", "@linux", "@windows", "@msys", function (package)
         if is_host("windows") and (os.arch() == "x64" or os.arch() == "x86") then
         if is_host("windows") and (os.arch() == "x64" or os.arch() == "x86") then
             os.cp(package:originfile(), path.join(package:installdir("bin"), "aqt.exe"))
             os.cp(package:originfile(), path.join(package:installdir("bin"), "aqt.exe"))
+        elseif is_host("macosx") and (os.arch() == "arm64" or os.arch() == "x86_64") then
+            os.cp(package:originfile(), path.join(package:installdir("bin"), "aqt"))
+            os.vrunv("chmod", {"+x", path.join(package:installdir("bin"), "aqt")})
         else
         else
             -- ensurepip has been dropped in recent releases
             -- ensurepip has been dropped in recent releases
             try {function () os.vrunv("python3", {"-m", "ensurepip"}) end}
             try {function () os.vrunv("python3", {"-m", "ensurepip"}) end}