diff options
| author | ruki <[email protected]> | 2026-03-29 22:49:37 +0800 |
|---|---|---|
| committer | ruki <[email protected]> | 2026-03-29 22:49:41 +0800 |
| commit | 1bccfc273af2b1d579d033324bca481e15c58653 (patch) | |
| tree | 192697793bd61d48b4423da0ac4a1eab804d80dc /xmake/plugins/pack | |
| parent | f4513cc28aa778e1ad0d050511cc7e295fe81e32 (diff) | |
fix const limit on lua5.5
Diffstat (limited to 'xmake/plugins/pack')
| -rw-r--r-- | xmake/plugins/pack/deb/main.lua | 2 | ||||
| -rw-r--r-- | xmake/plugins/pack/nsis/main.lua | 2 | ||||
| -rw-r--r-- | xmake/plugins/pack/runself/main.lua | 1 | ||||
| -rw-r--r-- | xmake/plugins/pack/srpm/main.lua | 2 | ||||
| -rw-r--r-- | xmake/plugins/pack/wix/main.lua | 3 |
5 files changed, 10 insertions, 0 deletions
diff --git a/xmake/plugins/pack/deb/main.lua b/xmake/plugins/pack/deb/main.lua index cfcdb0dfd..930dcb225 100644 --- a/xmake/plugins/pack/deb/main.lua +++ b/xmake/plugins/pack/deb/main.lua @@ -81,6 +81,7 @@ function _get_customcmd(package, installcmds, cmd) elseif cmd.program then local argv = {} for _, arg in ipairs(cmd.argv) do + local arg = arg if path.instance_of(arg) then arg = arg:clone():set(_translate_filepath(package, arg:rawstr())):str() elseif path.is_absolute(arg) then @@ -206,6 +207,7 @@ function _pack_deb(debuild, package) end) end for _, name in ipairs(specvars_names) do + local name = name name = name:trim() if specvars_values[name] == nil then local value = specvars[name] diff --git a/xmake/plugins/pack/nsis/main.lua b/xmake/plugins/pack/nsis/main.lua index 3dc579608..f566296c5 100644 --- a/xmake/plugins/pack/nsis/main.lua +++ b/xmake/plugins/pack/nsis/main.lua @@ -99,6 +99,7 @@ function _get_command_strings(package, cmd, opt) -- match files and directories local srcitems = os.filedirs(srcpath) for _, srcitem in ipairs(srcitems) do + local srcitem = srcitem if os.isdir(srcitem) then -- copy directory recursively srcitem = path.normalize(srcitem) @@ -283,6 +284,7 @@ function _pack_nsis(makensis, package) table.insert(specvars_names, name) end, {encoding = "ansi"}) for _, name in ipairs(specvars_names) do + local name = name name = name:trim() if specvars_values[name] == nil then local value = specvars[name] diff --git a/xmake/plugins/pack/runself/main.lua b/xmake/plugins/pack/runself/main.lua index 31f88f9dd..32b376684 100644 --- a/xmake/plugins/pack/runself/main.lua +++ b/xmake/plugins/pack/runself/main.lua @@ -123,6 +123,7 @@ function _pack_runself(makeself, package) table.insert(specvars_names, name) end) for _, name in ipairs(specvars_names) do + local name = name name = name:trim() if specvars_values[name] == nil then local value = specvars[name] diff --git a/xmake/plugins/pack/srpm/main.lua b/xmake/plugins/pack/srpm/main.lua index 5b570844d..dec2dfdfa 100644 --- a/xmake/plugins/pack/srpm/main.lua +++ b/xmake/plugins/pack/srpm/main.lua @@ -102,6 +102,7 @@ function _get_customcmd(package, installcmds, cmd) elseif cmd.program then local argv = {} for _, arg in ipairs(cmd.argv) do + local arg = arg if path.instance_of(arg) then arg = arg:clone():set(_translate_filepath(package, arg:rawstr())):str() elseif path.is_absolute(arg) then @@ -218,6 +219,7 @@ function _pack_srpm(rpmbuild, package) table.insert(specvars_names, name) end) for _, name in ipairs(specvars_names) do + local name = name name = name:trim() if specvars_values[name] == nil then local value = specvars[name] diff --git a/xmake/plugins/pack/wix/main.lua b/xmake/plugins/pack/wix/main.lua index 896ea2339..a3055bc0c 100644 --- a/xmake/plugins/pack/wix/main.lua +++ b/xmake/plugins/pack/wix/main.lua @@ -82,11 +82,13 @@ function _get_cp_kind_table(package, cmds, opt) -- match files and directories local srcitems = os.filedirs(cmd.srcpath) for _, srcitem in ipairs(srcitems) do + local srcitem = srcitem if os.isdir(srcitem) then -- for directory, recursively collect all files in it local rootdir = option.rootdir or srcitem local files = os.files(path.join(srcitem, "**")) for _, srcfile in ipairs(files) do + local srcfile = srcfile -- the destination is directory? append the relative path local dstfile = cmd.dstpath if option.rootdir then @@ -300,6 +302,7 @@ function _pack_wix(wix, package) table.insert(specvars_names, name) end) for _, name in ipairs(specvars_names) do + local name = name name = name:trim() if specvars_values[name] == nil then local value = specvars[name] |
