diff options
author | Fabiano FidĂȘncio <fidencio@redhat.com> | 2014-10-30 11:31:03 +0100 |
---|---|---|
committer | Fabiano FidĂȘncio <fidencio@redhat.com> | 2014-10-30 13:26:29 +0100 |
commit | d4393ea18c244a78d223db3d380bfb79256a873f (patch) | |
tree | 84a50ee6dff131442a34cfaac9f4d25fbb32cc36 /tools | |
parent | 98909729dbd12bb5cca4d0c5c52e0e24ff607bff (diff) | |
download | msitools-d4393ea18c244a78d223db3d380bfb79256a873f.tar.gz msitools-d4393ea18c244a78d223db3d380bfb79256a873f.tar.xz msitools-d4393ea18c244a78d223db3d380bfb79256a873f.zip |
Add option to make packages win64-aware
For this, each component should have Win64="$(var.Win64)", what can be
added by passing --win64 option to wixl-heat
Diffstat (limited to 'tools')
-rw-r--r-- | tools/wixl/wixl-heat.vala | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/tools/wixl/wixl-heat.vala b/tools/wixl/wixl-heat.vala index ef426ec..7aeff92 100644 --- a/tools/wixl/wixl-heat.vala +++ b/tools/wixl/wixl-heat.vala @@ -6,6 +6,7 @@ static string prefix; static string vardir; [CCode (array_length = false, array_null_terminated = true)] static string[] exclude; +static bool win64; private const OptionEntry[] options = { { "directory-ref", 0, 0, OptionArg.STRING, ref dr, N_("Directory Ref"), null }, @@ -13,6 +14,7 @@ private const OptionEntry[] options = { { "var", 0, 0, OptionArg.STRING, ref vardir, N_("Variable for source dir"), null }, { "prefix", 'p', 0, OptionArg.STRING, ref prefix, N_("Prefix"), null }, { "exclude", 'x', 0, OptionArg.STRING_ARRAY, ref exclude, N_("Exclude prefix"), null }, + { "win64", 0, 0, OptionArg.NONE, ref win64, N_("Add Win64 Component"), null }, { null } }; @@ -97,7 +99,10 @@ public int main (string[] args) { if (!is_directory) { var id = generate_id ("cmp", 1, file); cmpref.append (id); - stdout.printf (indent + "<Component Id=\"%s\" Guid=\"*\">\n".printf (id)); + if (win64) + stdout.printf (indent + "<Component Win64=\"$(var.Win64)\" Id=\"%s\" Guid=\"*\">\n".printf (id)); + else + stdout.printf (indent + "<Component Id=\"%s\" Guid=\"*\">\n".printf (id)); file = sourcedir + Path.DIR_SEPARATOR_S + file; stdout.printf (indent + " <File Id=\"%s\" KeyPath=\"yes\" Source=\"%s\"/>\n".printf (generate_id ("fil", 1, file), file)); stdout.printf (indent + "</Component>\n"); @@ -127,4 +132,4 @@ public int main (string[] args) { stdout.printf ("<!-- generated with %s -->\n", Config.PACKAGE_STRING); stdout.printf ("<!-- %s -->\n", cmdline.replace ("--", "-")); return 0; -}
\ No newline at end of file +} |