diff options
| author | Jan Holesovsky <kendy@collabora.com> | 2014-12-09 16:41:53 +0100 |
|---|---|---|
| committer | Jan Holesovsky <kendy@collabora.com> | 2014-12-09 16:49:36 +0100 |
| commit | ac403251e72826c7414d644c5e90fa7909189b92 (patch) | |
| tree | 67c0c9ef3fcd9bb818eb2921fcc1298b6f355d4a /instsetoo_native | |
| parent | 7ca08a8bed21bfa6db083b4bcd1c206a149b4811 (diff) | |
Allow comments is .idt files, and comment that "Excecution" is _necessary_.
Change-Id: I10d0f32fedd842023bf94b252bcb48bfc2264dd4
Diffstat (limited to 'instsetoo_native')
| -rw-r--r-- | instsetoo_native/CustomTarget_install.mk | 2 | ||||
| -rw-r--r-- | instsetoo_native/inc_openoffice/windows/msi_templates/_Validat.idt | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/instsetoo_native/CustomTarget_install.mk b/instsetoo_native/CustomTarget_install.mk index 2d6f5370c559..f894ae547732 100644 --- a/instsetoo_native/CustomTarget_install.mk +++ b/instsetoo_native/CustomTarget_install.mk @@ -65,7 +65,7 @@ define instsetoo_native_msitemplates TEMPLATE_DIR=$(dir $@)msi_templates \ && rm -rf $${TEMPLATE_DIR} \ && mkdir -p $${TEMPLATE_DIR}/Binary \ -&& $(GNUCOPY) $(SRCDIR)/instsetoo_native/inc_$(1)/windows/msi_templates/*.* $${TEMPLATE_DIR} \ +&& for I in $(SRCDIR)/instsetoo_native/inc_$(1)/windows/msi_templates/*.* ; do $(GREP) -v '^#' "$$I" > $${TEMPLATE_DIR}/`basename $$I` ; done \ && $(GNUCOPY) $(SRCDIR)/instsetoo_native/inc_common/windows/msi_templates/Binary/*.* $${TEMPLATE_DIR}/Binary endef else diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/_Validat.idt b/instsetoo_native/inc_openoffice/windows/msi_templates/_Validat.idt index d937499fe089..e1b061440d55 100644 --- a/instsetoo_native/inc_openoffice/windows/msi_templates/_Validat.idt +++ b/instsetoo_native/inc_openoffice/windows/msi_templates/_Validat.idt @@ -111,6 +111,7 @@ CreateFolder Component_ N Component 1 Identifier Foreign key into the Compone CreateFolder Directory_ N Directory 1 Identifier Primary key, could be foreign key into the Directory table. CustomAction Action N Identifier Primary key, name of action, normally appears in sequence table unless private use. CustomAction Source Y CustomSource The table reference of the source of the code. +# DON'T YOU EVEN ATTEMPT to fix the "Excecution" typo below - the MSI tools depend on that, and will fail if you change it. CustomAction Target Y Formatted Excecution parameter, depends on the type of custom action CustomAction Type N 1 32767 The numeric custom action type, consisting of source location, code type, entry, option flags. Dialog Attributes Y 0 2147483647 A 32-bit word that specifies the attribute flags to be applied to this dialog. |