diff options
author | Paolo Bonzini <pbonzini@redhat.com> | 2012-12-11 12:13:02 +0100 |
---|---|---|
committer | Paolo Bonzini <pbonzini@redhat.com> | 2012-12-11 12:13:02 +0100 |
commit | d9cc5b91c4d6c0ced0a2e405c919184d75c23a34 (patch) | |
tree | 069993eb0746983aab528af83b37a7e5bbf7c511 /tools | |
parent | 7027445dfef246f9173f158a0093240ebd2e44f3 (diff) | |
parent | 90268e748868a15ae100f69949b6a3214f0fd6b9 (diff) | |
download | msitools-d9cc5b91c4d6c0ced0a2e405c919184d75c23a34.tar.gz msitools-d9cc5b91c4d6c0ced0a2e405c919184d75c23a34.tar.xz msitools-d9cc5b91c4d6c0ced0a2e405c919184d75c23a34.zip |
Merge branch 'pre-gsf'
Conflicts:
libmsi/libmsi-summary-info.c
Diffstat (limited to 'tools')
-rw-r--r-- | tools/msibuild.c | 24 | ||||
-rw-r--r-- | tools/msiinfo.c | 36 |
2 files changed, 30 insertions, 30 deletions
diff --git a/tools/msibuild.c b/tools/msibuild.c index b2ab565..3f5d318 100644 --- a/tools/msibuild.c +++ b/tools/msibuild.c @@ -34,23 +34,23 @@ static void init_suminfo(LibmsiSummaryInfo *si) { - libmsi_summary_info_set_property(si, MSI_PID_TITLE, + libmsi_summary_info_set_property(si, LIBMSI_PROPERTY_TITLE, LIBMSI_PROPERTY_TYPE_STRING, 0, NULL, "Installation Database"); - libmsi_summary_info_set_property(si, MSI_PID_KEYWORDS, + libmsi_summary_info_set_property(si, LIBMSI_PROPERTY_KEYWORDS, LIBMSI_PROPERTY_TYPE_STRING, 0, NULL, "Installer, MSI"); - libmsi_summary_info_set_property(si, MSI_PID_TEMPLATE, + libmsi_summary_info_set_property(si, LIBMSI_PROPERTY_TEMPLATE, LIBMSI_PROPERTY_TYPE_STRING, 0, NULL, ";1033"); - libmsi_summary_info_set_property(si, MSI_PID_APPNAME, + libmsi_summary_info_set_property(si, LIBMSI_PROPERTY_APPNAME, LIBMSI_PROPERTY_TYPE_STRING, 0, NULL, "libmsi msibuild"); - libmsi_summary_info_set_property(si, MSI_PID_MSIVERSION, + libmsi_summary_info_set_property(si, LIBMSI_PROPERTY_VERSION, LIBMSI_PROPERTY_TYPE_INT, 200, NULL, NULL); - libmsi_summary_info_set_property(si, MSI_PID_MSISOURCE, + libmsi_summary_info_set_property(si, LIBMSI_PROPERTY_SOURCE, LIBMSI_PROPERTY_TYPE_INT, 0, NULL, NULL); - libmsi_summary_info_set_property(si, MSI_PID_MSIRESTRICT, + libmsi_summary_info_set_property(si, LIBMSI_PROPERTY_RESTRICT, LIBMSI_PROPERTY_TYPE_INT, 0, NULL, NULL); #ifdef HAVE_LIBUUID @@ -61,7 +61,7 @@ static void init_suminfo(LibmsiSummaryInfo *si) uustr[0] = '{'; uuid_unparse_upper(uu, uustr + 1); strcat(uustr, "}"); - libmsi_summary_info_set_property(si, MSI_PID_REVNUMBER, + libmsi_summary_info_set_property(si, LIBMSI_PROPERTY_UUID, LIBMSI_PROPERTY_TYPE_STRING, 0, NULL, uustr); } #endif @@ -142,21 +142,21 @@ static int import_table(char *table) static int add_summary_info(const char *name, const char *author, const char *template, const char *uuid) { - libmsi_summary_info_set_property(si, MSI_PID_SUBJECT, + libmsi_summary_info_set_property(si, LIBMSI_PROPERTY_SUBJECT, LIBMSI_PROPERTY_TYPE_STRING, 0, NULL, name); if (author) { - libmsi_summary_info_set_property(si, MSI_PID_AUTHOR, + libmsi_summary_info_set_property(si, LIBMSI_PROPERTY_AUTHOR, LIBMSI_PROPERTY_TYPE_STRING, 0, NULL, author); } if (template) { - libmsi_summary_info_set_property(si, MSI_PID_TEMPLATE, + libmsi_summary_info_set_property(si, LIBMSI_PROPERTY_TEMPLATE, LIBMSI_PROPERTY_TYPE_STRING, 0, NULL, template); } if (uuid) { - libmsi_summary_info_set_property(si, MSI_PID_REVNUMBER, + libmsi_summary_info_set_property(si, LIBMSI_PROPERTY_UUID, LIBMSI_PROPERTY_TYPE_STRING, 0, NULL, uuid); } diff --git a/tools/msiinfo.c b/tools/msiinfo.c index 5a6dfc8..2a53f7d 100644 --- a/tools/msiinfo.c +++ b/tools/msiinfo.c @@ -324,24 +324,24 @@ static int cmd_suminfo(struct Command *cmd, int argc, char **argv) print_libmsi_error(r); } - print_suminfo(si, MSI_PID_TITLE, "Title"); - print_suminfo(si, MSI_PID_SUBJECT, "Subject"); - print_suminfo(si, MSI_PID_AUTHOR, "Author"); - print_suminfo(si, MSI_PID_KEYWORDS, "Keywords"); - print_suminfo(si, MSI_PID_COMMENTS, "Comments"); - print_suminfo(si, MSI_PID_TEMPLATE, "Template"); - print_suminfo(si, MSI_PID_LASTAUTHOR, "Last author"); - print_suminfo(si, MSI_PID_REVNUMBER, "Revision number"); - print_suminfo(si, MSI_PID_EDITTIME, "Edittime"); - print_suminfo(si, MSI_PID_LASTPRINTED, "Last printed"); - print_suminfo(si, MSI_PID_CREATE_DTM, "Created"); - print_suminfo(si, MSI_PID_LASTSAVE_DTM, "Last saved"); - print_suminfo(si, MSI_PID_MSIVERSION, "Version"); - print_suminfo(si, MSI_PID_MSISOURCE, "Source"); - print_suminfo(si, MSI_PID_MSIRESTRICT, "Restrict"); - print_suminfo(si, MSI_PID_THUMBNAIL, "Thumbnail"); - print_suminfo(si, MSI_PID_APPNAME, "Application"); - print_suminfo(si, MSI_PID_SECURITY, "Security"); + print_suminfo(si, LIBMSI_PROPERTY_TITLE, "Title"); + print_suminfo(si, LIBMSI_PROPERTY_SUBJECT, "Subject"); + print_suminfo(si, LIBMSI_PROPERTY_AUTHOR, "Author"); + print_suminfo(si, LIBMSI_PROPERTY_KEYWORDS, "Keywords"); + print_suminfo(si, LIBMSI_PROPERTY_COMMENTS, "Comments"); + print_suminfo(si, LIBMSI_PROPERTY_TEMPLATE, "Template"); + print_suminfo(si, LIBMSI_PROPERTY_LASTAUTHOR, "Last author"); + print_suminfo(si, LIBMSI_PROPERTY_UUID, "Revision number (UUID)"); + print_suminfo(si, LIBMSI_PROPERTY_EDITTIME, "Edittime"); + print_suminfo(si, LIBMSI_PROPERTY_LASTPRINTED, "Last printed"); + print_suminfo(si, LIBMSI_PROPERTY_CREATED_TM, "Created"); + print_suminfo(si, LIBMSI_PROPERTY_LASTSAVED_TM, "Last saved"); + print_suminfo(si, LIBMSI_PROPERTY_VERSION, "Version"); + print_suminfo(si, LIBMSI_PROPERTY_SOURCE, "Source"); + print_suminfo(si, LIBMSI_PROPERTY_RESTRICT, "Restrict"); + print_suminfo(si, LIBMSI_PROPERTY_THUMBNAIL, "Thumbnail"); + print_suminfo(si, LIBMSI_PROPERTY_APPNAME, "Application"); + print_suminfo(si, LIBMSI_PROPERTY_SECURITY, "Security"); g_object_unref(db); g_object_unref(si); |