diff options
author | Hans-Joachim Lankenau <hjs@openoffice.org> | 2011-03-23 11:30:01 +0100 |
---|---|---|
committer | Hans-Joachim Lankenau <hjs@openoffice.org> | 2011-03-23 11:30:01 +0100 |
commit | 5ebd29ba88ff986e5256f4a940006bdb40ec7ad1 (patch) | |
tree | 987e0eb2bf367e0749484b77cbb1adac222a459c | |
parent | 981e76f631cc591e356c0242943f114804f907db (diff) |
ause127: #i117376# filter out files starting with '.' - now quoted
-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 a6881783776a..60bb9f3cd579 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 |