diff options
| author | Ivo Hinkelmann <ihi@openoffice.org> | 2011-03-29 19:12:02 +0200 |
|---|---|---|
| committer | Ivo Hinkelmann <ihi@openoffice.org> | 2011-03-29 19:12:02 +0200 |
| commit | 0ba16aab92d45223bffd857403e95dcd94be952e (patch) | |
| tree | 6ca4ec04e2f35d2791f1f12894d1d5a99853ee5d | |
| parent | 715aa8b390fe6c71feae2eeec3e56a9ee7b264e1 (diff) | |
| parent | 1393c989f05a245485718b4441530b5e2d2925b8 (diff) | |
CWS-TOOLING: integrate CWS ause127ooo/DEV300_m106ooo/DEV300_m105
| -rw-r--r-- | postprocess/packregistry/makefile.mk | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/postprocess/packregistry/makefile.mk b/postprocess/packregistry/makefile.mk index a688178..60bb9f3 100644 --- a/postprocess/packregistry/makefile.mk +++ b/postprocess/packregistry/makefile.mk @@ -515,14 +515,16 @@ $(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 mkdir $(MISC)/$(@:b).unzip cd $(MISC)/$(@:b).unzip && unzip $(SOLARPCKDIR)/$(@:b).zip - $(RM) $(MISC)/$(@:b).list + # filter out filenames starting with "." echo '<list>' $(foreach,i,$(shell cd $(MISC) && \ - find $(@:b).unzip -name \*.xcu -size +0c -print) \ + find $(@:b).unzip -name \[!.\]\*.xcu -size +0c -print) \ '<filename>$i</filename>') '</list>' > $(MISC)/$(@:b).list $(XSLTPROC) --nonet --stringparam prefix $(PWD)/$(MISC)/ -o $@ \ $(SOLARENV)/bin/packregistry.xslt $(MISC)/$(@:b).list @@ -540,8 +542,9 @@ $(MISC)/lang/registry_%.xcd .ERRREMOVE : cd $(MISC)/fcfg_drivers_$*.unzip && \ unzip $(SOLARPCKDIR)/fcfg_drivers_$*.zip - $(RM) $(MISC)/$(@:b).list + # filter out filenames starting with "." echo '<list>' $(foreach,i,$(shell cd $(MISC) && \ - find $(@:b).unzip fcfg_drivers_$*.unzip -name \*.xcu -print) \ + find $(@:b).unzip fcfg_drivers_$*.unzip -name \[!.\]\*.xcu -print) \ '<filename>$i</filename>') '</list>' > $(MISC)/$(@:b).list $(XSLTPROC) --nonet --stringparam prefix $(PWD)/$(MISC)/ -o $@ \ $(SOLARENV)/bin/packregistry.xslt $(MISC)/$(@:b).list |