diff options
| author | Jan-Marek Glogowski <glogow@fbihome.de> | 2015-10-01 17:57:33 +0200 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2015-10-17 23:23:15 +0200 |
| commit | 23f7e908677b53a05cf6670711d6225229972fb1 (patch) | |
| tree | f713539a879fb1ae377251fa266bca51a69cbd6a /instsetoo_native | |
| parent | 144500985d796f877993539a390926a35792bc8c (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
(cherry picked from commit d526f5d739bbf923a6c882cb9a92a15f590a3388)
Reviewed-on: https://gerrit.libreoffice.org/19098
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
(cherry picked from commit e0b2971d93e0c64d1ab57b66d6f590dd1bb6a797)
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 badf9c50438f..f0eeed1c61b2 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 |