diff options
| author | sb <sb@openoffice.org> | 2010-03-15 10:14:33 +0100 |
|---|---|---|
| committer | sb <sb@openoffice.org> | 2010-03-15 10:14:33 +0100 |
| commit | ab4f2ee918d26c68eca2ba0c9c07820162718cd1 (patch) | |
| tree | 5bb8c7d195bd29ec27671098990697eee791e466 /postprocess | |
| parent | 0ea4aa9eb88c19fb911f51448c431f6afc9561f5 (diff) | |
| parent | f9dcd6804f7a15de47239a61ea149cbed4baa62d (diff) | |
sb121: merged in DEV300_m75
Diffstat (limited to 'postprocess')
| -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 88eb56d39f09..f9d2b27f935a 100644 --- a/postprocess/packregistry/makefile.mk +++ b/postprocess/packregistry/makefile.mk @@ -498,6 +498,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 @@ -505,7 +508,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 |