diff options
| author | Marc-André Lureau <marcandre.lureau@gmail.com> | 2013-01-08 22:19:37 +0100 |
|---|---|---|
| committer | Marc-André Lureau <marcandre.lureau@gmail.com> | 2013-01-08 22:19:45 +0100 |
| commit | 4fe4b5fe781b62b93ec484617c92c0581498512e (patch) | |
| tree | 95e87b7e6a1f2d5842dbd568d5ca55858b29fb05 | |
| parent | 1d5b8c092dec49cb888df39946f79665550126f4 (diff) | |
| download | msitools-4fe4b5fe781b62b93ec484617c92c0581498512e.tar.gz msitools-4fe4b5fe781b62b93ec484617c92c0581498512e.tar.xz msitools-4fe4b5fe781b62b93ec484617c92c0581498512e.zip | |
Fix default for some Product fields
| -rw-r--r-- | src/builder.vala | 7 | ||||
| -rw-r--r-- | src/msi.vala | 3 |
2 files changed, 9 insertions, 1 deletions
diff --git a/src/builder.vala b/src/builder.vala index 46f84bb..0cbfdf1 100644 --- a/src/builder.vala +++ b/src/builder.vala @@ -206,6 +206,9 @@ namespace Wixl { if (product.Codepage != null) db.info.set_codepage (int.parse (product.Codepage)); + if (product.Name != null) + db.info.set_subject (product.Name); + db.info.set_author (product.Manufacturer); db.table_property.add ("Manufacturer", product.Manufacturer); @@ -224,6 +227,10 @@ namespace Wixl { if (package.Keywords != null) db.info.set_keywords (package.Keywords); + + if (package.InstallerVersion != null) + db.info.set_property (Libmsi.Property.VERSION, int.parse (package.InstallerVersion)); + } public override void visit_icon (WixIcon icon) throws GLib.Error { diff --git a/src/msi.vala b/src/msi.vala index 5263f47..a2dadaf 100644 --- a/src/msi.vala +++ b/src/msi.vala @@ -438,7 +438,6 @@ namespace Wixl { public void set_comments (string value) throws GLib.Error { set_property (Libmsi.Property.COMMENTS, value); } - } class MsiDatabase: Object { @@ -468,6 +467,8 @@ namespace Wixl { try { info.set_property (Libmsi.Property.TITLE, "Installation Database"); info.set_property (Libmsi.Property.TEMPLATE, "Intel;1033"); + info.set_property (Libmsi.Property.KEYWORDS, "Installer"); + info.set_property (Libmsi.Property.CODEPAGE, 1252); info.set_property (Libmsi.Property.UUID, add_braces (uuid_generate ())); info.set_property (Libmsi.Property.CREATED_TM, |