diff options
| author | Jan-Marek Glogowski <glogow@fbihome.de> | 2015-10-01 17:57:33 +0200 |
|---|---|---|
| committer | Jan-Marek Glogowski <glogow@fbihome.de> | 2015-10-02 16:05:35 +0200 |
| commit | d526f5d739bbf923a6c882cb9a92a15f590a3388 (patch) | |
| tree | 67884494ad29829f6fd26e36dc394c5be05347f1 /instsetoo_native | |
| parent | c95ba3ef2613e9d5abd2f19ab2432c7bc1a40fe7 (diff) | |
Ignore grep return code for MSI builds
So "grep -v" returns != 0, if your input or output file is empty.
which breaks the Jenkins build, because Jenkins runs scripts with
-xe per default.
The "strip comments" grep currently fails for the empty file
instsetoo_native/inc_openoffice/windows/msi_templates/components.txt
Change-Id: I53a477702dbcc3c00c4a23263c3b402cb936250a
Diffstat (limited to 'instsetoo_native')
| -rw-r--r-- | instsetoo_native/CustomTarget_install.mk | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/instsetoo_native/CustomTarget_install.mk b/instsetoo_native/CustomTarget_install.mk index a74a2177240b..0fb97da1486b 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 \ -&& for I in $(SRCDIR)/instsetoo_native/inc_$(1)/windows/msi_templates/*.* ; do $(GREP) -v '^#' "$$I" > $${TEMPLATE_DIR}/`basename $$I` ; done \ +&& for I in $(SRCDIR)/instsetoo_native/inc_$(1)/windows/msi_templates/*.* ; do $(GREP) -v '^#' "$$I" > $${TEMPLATE_DIR}/`basename $$I` || true ; done \ && $(GNUCOPY) $(SRCDIR)/instsetoo_native/inc_common/windows/msi_templates/Binary/*.* $${TEMPLATE_DIR}/Binary endef else |