sid
/
NazaraEngine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

XMake: Move aqt to a separate package to fix MinGW installation

This commit is contained in:
Jérôme Leclercq 2022-02-23 23:23:39 +01:00
parent 40a9d75bb7
commit 13bb4cc6ee
2 changed files with 39 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
xmake-repo/packages/a/aqt/xmake.lua Normal file
View File

@ -0,0 +1,37 @@
package("aqt")
set_kind("binary")
set_homepage("https://github.com/miurahr/aqtinstall")
set_description("aqt: Another (unofficial) Qt CLI Installer on multi-platforms")
set_license("MIT")
if is_host("windows") then
if os.arch() == "x86" then
add_urls("https://github.com/miurahr/aqtinstall/releases/download/v$(version)/aqt_x86.exe")
add_versions("2.0.6", "b980985cfeb1cefef1d2ebab91ae4e648873a27fae8831deff8144661480c56a")
else
add_urls("https://github.com/miurahr/aqtinstall/releases/download/v$(version)/aqt_x64.exe")
add_versions("2.0.6", "b0ad07fe8fd2c094425449f3053598959e467833dadf509da948571259510078")
end
else
add_deps("python >=3.6", "7z")
end
on_install(function (package)
if is_host("windows") then
os.mv(package:originfile(), path.join(package:installdir("bin"), "aqt.exe"))
else
-- ensurepip has been dropped in recent releases
try
{
function () os.vrunv("python3", {"-m", "ensurepip"}) end
}
os.vrunv("python3", {"-m", "pip", "install", "-U", "pip"})
os.vrunv("python3", {"-m", "pip", "install", "aqtinstall"})
end
end)
on_test(function (package)
os.vrun("aqt -h")
end)

13
xmake-repo/packages/q/qt5base/xmake.lua
View File

@ -8,7 +8,7 @@ package("qt5base")
add_versions("5.15.2", "dummy")
add_versions("5.12.5", "dummy")
add_deps("python >=3.6", "7z", {private=true}) -- only required for installation
add_deps("aqt", {private=true}) -- only required for installation
on_fetch(function (package, opt)
local qt = package:data("qtdir")
@ -51,15 +51,6 @@ package("qt5base")
end)
on_install("windows", "linux", "macosx", "mingw", "android", "iphoneos", function (package)
-- ensurepip has been dropped in recent releases
try
{
function () os.vrunv("python3", {"-m", "ensurepip"}) end
}
os.vrunv("python3", {"-m", "pip", "install", "-U", "pip"})
os.vrunv("python3", {"-m", "pip", "install", "aqtinstall"})
local installdir = package:installdir()
local version = package:version() or semver.new("5.15.2")
@ -149,7 +140,7 @@ package("qt5base")
end
end
os.vrunv("python3", {"-m", "aqt", "install-qt", "-O", installdir, host, target, version:shortstr(), arch})
os.vrunv("aqt", {"install-qt", "-O", installdir, host, target, version:shortstr(), arch})
-- move files to root
local subdirs = {}