improve qt5base (#1902)

* improve qt5base

* remove localcache

* remove configs

* add path

packages/q/qt5base/xmake.lua

@@ -1,35 +1,23 @@
-local function qt_table(sdkdir, version)
-    return {
-        version = version,
-        sdkdir = sdkdir,
-        sdkver = version,
-        bindir = path.join(sdkdir, "bin"),
-        includedir = path.join(sdkdir, "include"),
-        libdir = path.join(sdkdir, "lib"),
-        libexecdir = path.join(sdkdir, "libexec"),
-        mkspecsdir = path.join(sdkdir, "mkspecs"),
-        qmldir = path.join(sdkdir, "qml"),
-        pluginsdir = path.join(sdkdir, "plugins")
-    }
-end
-
 package("qt5base")
     set_kind("phony")
     set_homepage("https://www.qt.io")
     set_description("Qt is the faster, smarter way to create innovative devices, modern UIs & applications for multiple screens. Cross-platform software development at its best.")
     set_license("LGPL-3")
 
-    add_configs("shared", {description = "Download shared binaries.", default = true, type = "boolean", readonly = true})
-    add_configs("vs_runtime", {description = "Set vs compiler runtime.", default = "MD", readonly = true})
-
     add_versions("5.15.2", "dummy")
     add_versions("5.12.5", "dummy")
 
+    add_configs("shared", {description = "Download shared binaries.", default = true, type = "boolean", readonly = true})
+    add_configs("vs_runtime", {description = "Set vs compiler runtime.", default = "MD", readonly = true})
+
     add_deps("aqt")
 
+    on_load(function (package)
+        package:addenv("PATH", "bin")
+    end)
+
     on_fetch(function (package, opt)
         import("core.base.semver")
-        import("core.cache.localcache")
         import("detect.sdks.find_qt")
 
         local qt = package:data("qt")
@@ -37,18 +25,11 @@ package("qt5base")
             return qt
         end
 
-        if os.isfile(package:manifest_file()) then
-            local installdir = package:installdir()
-            local qt = qt_table(installdir, package:version():shortstr())
-            package:data_set("qt", qt)
-            return qt
-        end
-
+        local sdkdir
         if not opt.system then
-            return
+            sdkdir = package:installdir()
         end
-
-        local qt = find_qt()
+        local qt = find_qt(sdkdir, {force = opt.force})
         if not qt then
             return
         end
@@ -193,8 +174,6 @@ package("qt5base")
                 end
             end
         end
-
-        package:data_set("qt", qt_table(installdir, versionstr))
     end)
 
     on_test(function (package)

packages/q/qt5gui/xmake.lua

@@ -12,7 +12,7 @@ package("qt5gui")
             package:data_set("links", "qtharfbuzz")
             package:data_set("syslinks", {"qtlibpng", "z"})
         end
-    
+
         package:base():script("load")(package)
         package:set("kind", "library")
     end)