diff options
| author | sb <sb@openoffice.org> | 2010-04-07 13:14:23 +0200 |
|---|---|---|
| committer | sb <sb@openoffice.org> | 2010-04-07 13:14:23 +0200 |
| commit | 96ecea0ed2aaf9978fd1e43f4a1e22436966bf82 (patch) | |
| tree | 2f6211e141dd8593d264f299eea146896c294e88 /postprocess | |
| parent | e4505f8155b96104674fabe11d176eaaec64d2c8 (diff) | |
| parent | 53932f011ee82cc0715b520064804749e52f285c (diff) | |
sb118: merged in re/DEV300_next towards DEV300_m76
Diffstat (limited to 'postprocess')
| -rw-r--r-- | postprocess/packregistry/makefile.mk | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/postprocess/packregistry/makefile.mk b/postprocess/packregistry/makefile.mk index 054f98233389..3f3dc26f123c 100644 --- a/postprocess/packregistry/makefile.mk +++ b/postprocess/packregistry/makefile.mk @@ -136,6 +136,7 @@ MY_FILES_lingucomponent = \ MY_FILES_main = \ $(MY_XCS)/FirstStartWizard.xcs \ $(MY_XCS)/Inet.xcs \ + $(MY_XCS)/Interaction.xcs \ $(MY_XCS)/LDAP.xcs \ $(MY_XCS)/Office/Accelerators.xcs \ $(MY_XCS)/Office/Addons.xcs \ @@ -219,6 +220,7 @@ MY_FILES_main = \ $(MY_XCS)/ucb/Store.xcs \ $(MY_XCU)/FirstStartWizard.xcu \ $(MY_XCU)/Inet.xcu \ + $(MY_XCU)/Interaction.xcu \ $(MY_XCU)/Office/Accelerators.xcu \ $(MY_XCU)/Office/Calc.xcu \ $(MY_XCU)/Office/Canvas.xcu \ @@ -499,6 +501,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 +511,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 |