浏览代码

update scripts

ruki 2 年之前
父节点
当前提交
64134295c4
共有 2 个文件被更改,包括 3 次插入3 次删除
  1. 1 1
      scripts/build_artifacts.lua
  2. 2 2
      scripts/packages.lua

+ 1 - 1
scripts/build_artifacts.lua

@@ -44,7 +44,7 @@ function main()
            local packagedir = path.directory(file)
            local packagename = path.filename(packagedir)
            if #path.filename(path.directory(packagedir)) == 1 then
-               local instance = package.load_from_repository(packagename, nil, packagedir, file)
+               local instance = package.load_from_repository(packagename, nil, packagedir, {packagefile = file})
                if instance and packages.is_supported(instance, "windows")
                   and (instance.is_headeronly and not instance:is_headeronly()) then
                    local versions = instance:versions()

+ 2 - 2
scripts/packages.lua

@@ -63,12 +63,12 @@ function main(opt)
     for _, packagedir in ipairs(os.dirs(path.join("packages", "*", "*"))) do
         local packagename = path.filename(packagedir)
         local packagefile = path.join(packagedir, "xmake.lua")
-        local instance = package.load_from_repository(packagename, nil, packagedir, packagefile)
+        local instance = package.load_from_repository(packagename, nil, packagedir, {packagefile = packagefile})
         local basename = instance:get("base")
         if instance and basename then
             local basedir = path.join("packages", basename:sub(1, 1):lower(), basename:lower())
             local basefile = path.join(basedir, "xmake.lua")
-            instance._BASE = package.load_from_repository(basename, nil, basedir, basefile)
+            instance._BASE = package.load_from_repository(basename, nil, basedir, {packagefile = basefile})
         end
         if instance then
             for _, plat in ipairs({"windows", "linux", "macosx", "iphoneos", "android", "mingw", "msys", "bsd", "wasm", "cross"}) do