[Libreoffice-commits] core.git: 2 commits - instsetoo_native/CustomTarget_install.mk instsetoo_native/inc_openoffice solenv/bin

[Jan Holesovsky]

 instsetoo_native/CustomTarget_install.mk                           |    2 +-
 instsetoo_native/inc_openoffice/windows/msi_templates/_Validat.idt |    1 +
 solenv/bin/modules/installer/windows/mergemodule.pm                |    2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

New commits:
commit ac403251e72826c7414d644c5e90fa7909189b92
Author: Jan Holesovsky <kendy at collabora.com>
Date:   Tue Dec 9 16:41:53 2014 +0100

    Allow comments is .idt files, and comment that "Excecution" is _necessary_.
    
    Change-Id: I10d0f32fedd842023bf94b252bcb48bfc2264dd4

diff --git a/instsetoo_native/CustomTarget_install.mk b/instsetoo_native/CustomTarget_install.mk
index 2d6f537..f894ae5 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 d937499..e1b0614 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.
commit 7ca08a8bed21bfa6db083b4bcd1c206a149b4811
Author: Jan Holesovsky <kendy at collabora.com>
Date:   Tue Dec 9 16:22:02 2014 +0100

    A bit better error message.
    
    Change-Id: Ia3ea8ae38aab0080d01932d586b921599adbaf21

diff --git a/solenv/bin/modules/installer/windows/mergemodule.pm b/solenv/bin/modules/installer/windows/mergemodule.pm
index 8922f7c..68bb203 100644
--- a/solenv/bin/modules/installer/windows/mergemodule.pm
+++ b/solenv/bin/modules/installer/windows/mergemodule.pm
@@ -377,7 +377,7 @@ sub merge_mergemodules_into_msi_database
             {
                 $infoline = "ERROR: Could not execute $systemcall . Returnvalue: $returnvalue!\n";
                 push( @installer::globals::logfileinfo, $infoline);
-                installer::exiter::exit_program("ERROR: Could not merge msm file into database: $mergemodulehash->{'mergefilepath'} !", "merge_mergemodules_into_msi_database");
+                installer::exiter::exit_program("Could not merge msm file into database: $mergemodulehash->{'mergefilepath'}\n$infoline", "merge_mergemodules_into_msi_database");
             }
             else
             {