diff options
| author | ruki <[email protected]> | 2025-04-23 22:50:52 +0800 |
|---|---|---|
| committer | ruki <[email protected]> | 2025-04-23 11:30:31 +0800 |
| commit | 09742602185c22140f754e6f734e8bdfc98100df (patch) | |
| tree | 4ea844f1cb00b62c21cce2e8a432f1e32333334b | |
| parent | cc227f968825b85ea3266a57f1d68709cbb890c7 (diff) | |
rename implib name
| -rw-r--r-- | xmake/modules/target/action/clean/main.lua | 14 | ||||
| -rw-r--r-- | xmake/modules/target/action/install/main.lua | 6 | ||||
| -rw-r--r-- | xmake/plugins/pack/batchcmds.lua | 6 | ||||
| -rw-r--r-- | xmake/rules/utils/inherit_links/inherit_links.lua | 6 |
4 files changed, 16 insertions, 16 deletions
diff --git a/xmake/modules/target/action/clean/main.lua b/xmake/modules/target/action/clean/main.lua index ed7aeaafb..33ed3c314 100644 --- a/xmake/modules/target/action/clean/main.lua +++ b/xmake/modules/target/action/clean/main.lua @@ -39,10 +39,10 @@ function main(target) -- @see https://github.com/xmake-io/xmake/issues/3052 if target:is_shared() then if target:is_plat("windows") then - local libfile = target:artifactfile("implib") - local expfile = path.join(path.directory(libfile), path.basename(targetfile) .. ".exp") - if os.isfile(libfile) then - remove_files(libfile) + local implibfile = target:artifactfile("implib") + local expfile = path.join(path.directory(implibfile), path.basename(targetfile) .. ".exp") + if os.isfile(implibfile) then + remove_files(implibfile) end if os.isfile(expfile) then remove_files(expfile) @@ -50,9 +50,9 @@ function main(target) end if target:is_plat("mingw") then - local libfile = target:artifactfile("implib") - if os.isfile(libfile) then - remove_files(libfile) + local implibfile = target:artifactfile("implib") + if os.isfile(implibfile) then + remove_files(implibfile) end end end diff --git a/xmake/modules/target/action/install/main.lua b/xmake/modules/target/action/install/main.lua index 7fef0d59c..470765cb6 100644 --- a/xmake/modules/target/action/install/main.lua +++ b/xmake/modules/target/action/install/main.lua @@ -237,10 +237,10 @@ function _install_shared(target, opt) -- @see https://github.com/xmake-io/xmake/issues/714 os.vcp(target:targetfile(), bindir) local libdir = _get_target_libdir(target, opt) - local target_implib = target:artifactfile("implib") - if os.isfile(target_implib) then + local implibfile = target:artifactfile("implib") + if os.isfile(implibfile) then os.mkdir(libdir) - os.vcp(target_implib, libdir) + os.vcp(implibfile, libdir) end else -- install target with soname and symlink diff --git a/xmake/plugins/pack/batchcmds.lua b/xmake/plugins/pack/batchcmds.lua index d933a3372..7e7313abe 100644 --- a/xmake/plugins/pack/batchcmds.lua +++ b/xmake/plugins/pack/batchcmds.lua @@ -303,10 +303,10 @@ function _on_target_installcmd_shared(target, batchcmds_, opt) -- install *.lib for shared/windows (*.dll) target -- @see https://github.com/xmake-io/xmake/issues/714 - local target_implib = target:artifactfile("implib") - if target_implib and os.isfile(target_implib) then + local implibfile = target:artifactfile("implib") + if implibfile and os.isfile(implibfile) then batchcmds_:mkdir(libdir) - batchcmds_:cp(target_implib, path.join(libdir, path.filename(target_implib))) + batchcmds_:cp(implibfile, path.join(libdir, path.filename(implibfile))) end _install_target_headers(target, batchcmds_, opt) diff --git a/xmake/rules/utils/inherit_links/inherit_links.lua b/xmake/rules/utils/inherit_links/inherit_links.lua index a9acd3c0e..2208927cd 100644 --- a/xmake/rules/utils/inherit_links/inherit_links.lua +++ b/xmake/rules/utils/inherit_links/inherit_links.lua @@ -80,9 +80,9 @@ function main(target) end end - local target_implib = target:artifactfile("implib") - if target_implib then - _add_export_value(target, "linkdirs", path.directory(target_implib)) + local implibfile = target:artifactfile("implib") + if implibfile then + _add_export_value(target, "linkdirs", path.directory(implibfile)) else _add_export_value(target, "linkdirs", path.directory(targetfile)) end |
