summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorA2va <[email protected]>2024-05-24 17:33:41 +0200
committerA2va <[email protected]>2024-05-24 17:33:41 +0200
commitfa333a9cc927abab2916d45bcf0fc068f035c484 (patch)
tree91e4024e59c89f5e468ab002362dde910830cd34
parent0dbf9be2558b974a04624a0b85717804df68100c (diff)
Use title instead of component name
-rw-r--r--xmake/plugins/pack/wix/main.lua8
1 files changed, 4 insertions, 4 deletions
diff --git a/xmake/plugins/pack/wix/main.lua b/xmake/plugins/pack/wix/main.lua
index 7bad45786..de5e52652 100644
--- a/xmake/plugins/pack/wix/main.lua
+++ b/xmake/plugins/pack/wix/main.lua
@@ -136,14 +136,14 @@ function _get_other_commands(package, cmd, opt)
end
-- get the string of a wix feature
-function _get_feature_string(name, opt)
+function _get_feature_string(name, title, opt)
local level = opt.default and 1 or 2
local description = opt.description or ""
local allow_absent = opt.force and "false" or "true"
local allow_advertise = opt.force and "false" or "true"
local typical_default = [[TypicalDefault="install"]]
local directory = opt.config_dir and [[ConfigurableDirectory="INSTALLFOLDER"]] or ""
- local feature = string.format([[<Feature Id="%s" Title="%s" Description="%s" Level="%d" AllowAdvertise="%s" AllowAbsent="%s" %s %s>]], name:gsub(" ", ""), name, description, level, allow_advertise, allow_absent, typical_default, directory)
+ local feature = string.format([[<Feature Id="%s" Title="%s" Description="%s" Level="%d" AllowAdvertise="%s" AllowAbsent="%s" %s %s>]], name:gsub(" ", ""), title, description, level, allow_advertise, allow_absent, typical_default, directory)
return feature
end
@@ -174,7 +174,7 @@ function _build_feature(package, opt)
local result = {}
local name = opt.name or package:title()
- table.insert(result, _get_feature_string(name, table.join(opt, {default = default, description = package:description()})))
+ table.insert(result, _get_feature_string(name, package:title(), table.join(opt, {default = default, description = package:description()})))
local installcmds = batchcmds.get_installcmds(package):cmds()
local uninstallcmds = batchcmds.get_uninstallcmds(package):cmds()
@@ -210,7 +210,7 @@ end
-- add to path feature
function _add_to_path(package)
local result = {}
- table.insert(result, _get_feature_string("PATH", {default = false, force = false, description = "Add to PATH"}))
+ table.insert(result, _get_feature_string("PATH", "Add to PATH", {default = false, force = false, description = "Add to PATH"}))
table.insert(result, _get_component_string("PATH"))
table.insert(result, [[<Environment Id="PATH" Name="PATH" Value="[INSTALLFOLDER]bin" Permanent="false" Part="last" Action="set" System="true" />]])
table.insert(result, "</Component>")