diff options
| author | A2va <[email protected]> | 2024-05-08 13:36:40 +0200 |
|---|---|---|
| committer | A2va <[email protected]> | 2024-05-08 13:36:40 +0200 |
| commit | cd3b9b037ece3d8dce7711f4143351733ce2a2ba (patch) | |
| tree | f08d093ee0ac63f733832c965cae008beacdcd4d | |
| parent | 88e54f59fb02d94cbd669e03848b7c09057d66ae (diff) | |
Fixes
| -rw-r--r-- | xmake/plugins/pack/wix/main.lua | 6 | ||||
| -rw-r--r-- | xmake/scripts/xpack/wix/msi.wxs | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/xmake/plugins/pack/wix/main.lua b/xmake/plugins/pack/wix/main.lua index 5455b7cfc..403ccca3e 100644 --- a/xmake/plugins/pack/wix/main.lua +++ b/xmake/plugins/pack/wix/main.lua @@ -125,7 +125,7 @@ function _get_feature_string(name, opt) 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 = opt.force and [[TypicalDefault="install"]] or "" + 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, name, description, level, allow_advertise, allow_absent, typical_default, directory) return feature @@ -179,7 +179,7 @@ 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_component_string("PATH")) - table.insert(result, [[<Environment Id="PATH" Name="PATH" Value="[INSTALLDIR]/bin" Permanent="yes" Part="last" Action="set" System="yes" />]]) + table.insert(result, [[<Environment Id="PATH" Name="PATH" Value="[INSTALLFOLDER]bin" Permanent="false" Part="last" Action="set" System="true" />]]) table.insert(result, "</Component>") table.insert(result, "</Feature>") return result @@ -199,7 +199,7 @@ function _get_specvars(package) table.join2(features, _build_feature(component, {name = "Install " .. name})) end - specvars.PACKAGE_CMDS = table.concat(features, "\n ") + specvars.PACKAGE_WIX_CMDS = table.concat(features, "\n ") specvars.PACKAGE_WIX_UPGRADECODE = hash.uuid(package:name()) -- company cannot be empty with wix diff --git a/xmake/scripts/xpack/wix/msi.wxs b/xmake/scripts/xpack/wix/msi.wxs index 0e4727117..6bbab6457 100644 --- a/xmake/scripts/xpack/wix/msi.wxs +++ b/xmake/scripts/xpack/wix/msi.wxs @@ -29,6 +29,6 @@ <Directory Id="INSTALLFOLDER" Name="$(PackageName)"/> </Directory> </StandardDirectory> - ${PACKAGE_CMDS} + ${PACKAGE_WIX_CMDS} </Package> </Wix>
\ No newline at end of file |