rename libpathes to libfiles

4 files changed, 14 insertions, 14 deletions

diff --git a/xmake/actions/install/install/windows.lua b/xmake/actions/install/install/windows.lua
index ca34debe4..3441587d5 100644
--- a/xmake/actions/install/install/windows.lua
+++ b/xmake/actions/install/install/windows.lua
@@ -40,7 +40,7 @@ end
 
 -- install shared libraries for package
 function _install_shared_for_package(target, pkg, outputdir)
-    for _, dllpath in ipairs(table.wrap(pkg:get("libpathes"))) do
+    for _, dllpath in ipairs(table.wrap(pkg:get("libfiles"))) do
         if dllpath:endswith(".dll") then
             if os.isfile(path.join(outputdir, dllname)) then
                 wprint("'%s' already exists in install dir, overwriting it from package(%s).", dllname, pkg:name())
@@ -57,7 +57,7 @@ function _install_shared_for_packages(target, outputdir)
         if not _g.installed_packages[pkg:name()] then
             local extrainfo = pkg:extrainfo() or {}
             local has_shared = extrainfo.configs and extrainfo.configs.shared
-            if has_shared and pkg:enabled() and pkg:get("libpathes") then
+            if has_shared and pkg:enabled() and pkg:get("libfiles") then
                 _install_shared_for_package(target, pkg, outputdir)
             end
             _g.installed_packages[pkg:name()] = true
diff --git a/xmake/actions/uninstall/uninstall/windows.lua b/xmake/actions/uninstall/uninstall/windows.lua
index 405cb7f43..a6235c88d 100644
--- a/xmake/actions/uninstall/uninstall/windows.lua
+++ b/xmake/actions/uninstall/uninstall/windows.lua
@@ -29,7 +29,7 @@ end
 
 -- uninstall shared libraries for package
 function _uninstall_shared_for_package(target, pkg, outputdir)
-    for _, dllpath in ipairs(table.wrap(pkg:get("libpathes"))) do
+    for _, dllpath in ipairs(table.wrap(pkg:get("libfiles"))) do
         if dllpath:endswith(".dll") then
             os.vrm(path.join(outputdir, dllname))
         end
@@ -43,7 +43,7 @@ function _uninstall_shared_for_packages(target, outputdir)
         if not _g.uninstalled_packages[pkg:name()] then
             local extrainfo = pkg:extrainfo() or {}
             local has_shared = extrainfo.configs and extrainfo.configs.shared
-            if has_shared and pkg:enabled() and pkg:get("libpathes") then
+            if has_shared and pkg:enabled() and pkg:get("libfiles") then
                 _uninstall_shared_for_package(target, pkg, outputdir)
             end
             _g.uninstalled_packages[pkg:name()] = true
diff --git a/xmake/modules/package/manager/vcpkg/find_package.lua b/xmake/modules/package/manager/vcpkg/find_package.lua
index 4a22c6c11..2b589f7bd 100644
--- a/xmake/modules/package/manager/vcpkg/find_package.lua
+++ b/xmake/modules/package/manager/vcpkg/find_package.lua
@@ -88,10 +88,10 @@ function main(name, opt)
                     result = result or {}
                     result.links = result.links or {}
                     result.linkdirs = result.linkdirs or {}
-                    result.libpathes = result.libpathes or {}
+                    result.libfiles = result.libfiles or {}
                     table.insert(result.linkdirs, path.join(installdir, path.directory(line)))
                     table.insert(result.links, target.linkname(path.filename(line)))
-                    table.insert(result.libpathes, path.join(installdir, path.directory(line), path.filename(line)))
+                    table.insert(result.libfiles, path.join(installdir, path.directory(line), path.filename(line)))
                 end
             end
 
@@ -100,9 +100,9 @@ function main(name, opt)
                 if line:find(plat .. (mode == "debug" and "/debug" or "") .. "/bin/", 1, true) then
                     result = result or {}
                     result.linkdirs = result.linkdirs or {}
-                    result.libpathes = result.libpathes or {}
+                    result.libfiles = result.libfiles or {}
                     table.insert(result.linkdirs, path.join(installdir, path.directory(line)))
-                    table.insert(result.libpathes, path.join(installdir, path.directory(line), path.filename(line)))
+                    table.insert(result.libfiles, path.join(installdir, path.directory(line), path.filename(line)))
                 end
             end
         end
diff --git a/xmake/modules/package/manager/xmake/find_package.lua b/xmake/modules/package/manager/xmake/find_package.lua
index 9cdaa3885..84be52fcd 100644
--- a/xmake/modules/package/manager/xmake/find_package.lua
+++ b/xmake/modules/package/manager/xmake/find_package.lua
@@ -70,7 +70,7 @@ function _find_package_from_repo(name, opt)
     -- get links and link directories
     local links = {}
     local linkdirs = {}
-    local libpathes = {}
+    local libfiles = {}
     for _, linkdir in ipairs(vars.linkdirs) do
         table.insert(linkdirs, path.join(installdir, linkdir))
     end
@@ -105,7 +105,7 @@ function _find_package_from_repo(name, opt)
     end
     if opt.plat == "windows" then
         for _, file in ipairs(os.files(path.join(installdir, "bin", "*.dll"))) do
-            table.insert(libpathes, file)
+            table.insert(libfiles, file)
         end
     end
 
@@ -125,14 +125,14 @@ function _find_package_from_repo(name, opt)
         if libinfo then
             result.links     = table.join(result.links or {}, libinfo.link)
             result.linkdirs  = table.join(result.linkdirs or {}, libinfo.linkdir)
-            result.libpathes = table.join(result.libpathes or {}, path.join(libinfo.linkdir, libinfo.filename))
+            result.libfiles = table.join(result.libfiles or {}, path.join(libinfo.linkdir, libinfo.filename))
         end
     end
     if result.links then
         result.links = table.unique(result.links)
     end
-    if result.libpathes then
-        result.libpathes = table.join(result.libpathes, libpathes)
+    if result.libfiles then
+        result.libfiles = table.join(result.libfiles, libfiles)
     end
 
     -- inherit the other prefix variables
@@ -236,7 +236,7 @@ function _find_package_from_packagedirs(name, opt)
             result          = result or {}
             result.links    = table.join(result.links or {}, libinfo.link)
             result.linkdirs = table.join(result.linkdirs or {}, libinfo.linkdir)
-            result.libpathes = table.join(result.libpathes or {}, path.join(libinfo.linkdir, libinfo.filename))
+            result.libfiles = table.join(result.libfiles or {}, path.join(libinfo.linkdir, libinfo.filename))
         end
     end