diff options
| author | Ivo Hinkelmann <ihi@openoffice.org> | 2010-03-11 17:51:37 +0100 |
|---|---|---|
| committer | Ivo Hinkelmann <ihi@openoffice.org> | 2010-03-11 17:51:37 +0100 |
| commit | 0efb5cdbb9545da62b00497f4a1520536c42c923 (patch) | |
| tree | 0b2d6452fcafe5aac6c351772218e6d34e648656 | |
| parent | 329d26237c3aa729238a99416d0d759c30ad2058 (diff) | |
masterfix DEV300: #i10000# #i110041# --with-lang=ALL: build failure at postprocessooo/DEV300_m75
| -rw-r--r-- | postprocess/packregistry/makefile.mk | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/postprocess/packregistry/makefile.mk b/postprocess/packregistry/makefile.mk index 054f982..ec7c5c0 100644 --- a/postprocess/packregistry/makefile.mk +++ b/postprocess/packregistry/makefile.mk @@ -499,6 +499,9 @@ $(MISC)/lang/Langpack-%.xcd .ERRREMOVE : $(MISC)/lang/fcfg_langpack_{$(alllangiso)}.xcd : $(SOLARPCKDIR)/$$(@:b).zip +# It can happen that localized $(SOLARPCKDIR)/fcfg_langpack_*.zip contain +# zero-sized org/openoffice/TypeDectection/Filter.xcu; filter them out in the +# find shell command below (see issue 110041): $(MISC)/lang/fcfg_langpack_%.xcd .ERRREMOVE : $(MKDIRHIER) $(@:d) rm -rf $(MISC)/$(@:b).unzip @@ -506,7 +509,7 @@ $(MISC)/lang/fcfg_langpack_%.xcd .ERRREMOVE : cd $(MISC)/$(@:b).unzip && unzip $(SOLARPCKDIR)/$(@:b).zip - $(RM) $(MISC)/$(@:b).list echo '<list>' $(foreach,i,$(shell cd $(MISC) && \ - find $(@:b).unzip -name \*.xcu -print) \ + find $(@:b).unzip -name \*.xcu -size +0c -print) \ '<filename>$i</filename>') '</list>' > $(MISC)/$(@:b).list $(XSLTPROC) --nonet -o $@ $(SOLARENV)/bin/packregistry.xslt \ $(MISC)/$(@:b).list |