extensions/Configuration_updchk.mk | 8 + extensions/source/update/check/org/openoffice/Office/Addons.xcu | 2 extensions/source/update/check/org/openoffice/Office/Jobs.xcu | 2 postprocess/packregistry/makefile.mk | 49 ++++++---- solenv/gbuild/Configuration.mk | 2 5 files changed, 43 insertions(+), 20 deletions(-)
New commits: commit 3f5ddf2e873b76abe3e166089fac2cfcb358d346 Author: Stephan Bergmann <[email protected]> Date: Fri May 11 13:08:51 2012 +0200 Fix updchk xcu data after gbuild'ification For one, install:module was missing from xcu files that are processed with gb_Configuration_add_spool_modules, resulting in effectively empty output xcu files. For another, localization from Addons.xcu is now merged into per-lang registry_*.xcd in postprocess/packregistry/makefile.mk. Change-Id: Ie87edbad163b124d18090ab36aa36de560a20cbc diff --git a/extensions/Configuration_updchk.mk b/extensions/Configuration_updchk.mk index 1b3cbd3..0cd2104 100644 --- a/extensions/Configuration_updchk.mk +++ b/extensions/Configuration_updchk.mk @@ -34,8 +34,14 @@ $(eval $(call gb_Configuration_add_spool_modules,updchk,extensions/source/update org/openoffice/Office/Addons-onlineupdate.xcu \ )) +# The resulting solver/*/pck/updchk_*.zip are merged into registry_*.xcd in +# postprocess/packregistry/makefile.mk (in principle, localizations of an +# install:module should go into their own per-lang xcd files, but they are +# currently all merged into a global per-lang registry_*.xcd, see e.g. how +# localized "Title" property values of +# /org.openoffice.Office.Common/Menus/New/m0 (install:module="writer") end up in +# registry_*.xcd instead of a, say, writer_*.xcd): $(eval $(call gb_Configuration_add_localized_datas,updchk,extensions/source/update/check,\ - org/openoffice/Office/Jobs.xcu \ org/openoffice/Office/Addons.xcu \ )) diff --git a/extensions/source/update/check/org/openoffice/Office/Addons.xcu b/extensions/source/update/check/org/openoffice/Office/Addons.xcu index 8794ce8..60043ec 100644 --- a/extensions/source/update/check/org/openoffice/Office/Addons.xcu +++ b/extensions/source/update/check/org/openoffice/Office/Addons.xcu @@ -1,7 +1,7 @@ <?xml version='1.0' encoding='UTF-8'?> <oor:component-data oor:name="Addons" oor:package="org.openoffice.Office" xmlns:install="http://openoffice.org/2004/installation"; xmlns:oor="http://openoffice.org/2001/registry"; xmlns:xs="http://www.w3.org/2001/XMLSchema"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";> - <node oor:name="AddonUI"> + <node oor:name="AddonUI" install:module="onlineupdate"> <node oor:name="OfficeHelp"> <node oor:name="UpdateCheckJob" oor:op="replace"> <prop oor:name="URL" oor:type="xs:string"> diff --git a/extensions/source/update/check/org/openoffice/Office/Jobs.xcu b/extensions/source/update/check/org/openoffice/Office/Jobs.xcu index 840d630..cf2e1cc 100644 --- a/extensions/source/update/check/org/openoffice/Office/Jobs.xcu +++ b/extensions/source/update/check/org/openoffice/Office/Jobs.xcu @@ -1,7 +1,7 @@ <?xml version='1.0' encoding='UTF-8'?> <oor:component-data oor:name="Jobs" oor:package="org.openoffice.Office" xmlns:install="http://openoffice.org/2004/installation"; xmlns:oor="http://openoffice.org/2001/registry"; xmlns:xs="http://www.w3.org/2001/XMLSchema"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";> - <node oor:name="Jobs"> + <node oor:name="Jobs" install:module="onlineupdate"> <node oor:name="UpdateCheck" oor:op="replace"> <prop oor:name="Service"> <value>com.sun.star.setup.UpdateCheck</value> diff --git a/postprocess/packregistry/makefile.mk b/postprocess/packregistry/makefile.mk index c9a73bd..0f05cd6 100644 --- a/postprocess/packregistry/makefile.mk +++ b/postprocess/packregistry/makefile.mk @@ -531,30 +531,47 @@ $(MISC)/lang/fcfg_langpack_%.xcd .ERRREMOVE : $(MISC)/lang/registry_{$(alllangiso)}.xcd : $(SOLARPCKDIR)/$$(@:b).zip .IF "$(BUILD_TYPE)" != "$(BUILD_TYPE:s/DBCONNECTIVITY//)" -$(MISC)/lang/registry_{$(alllangiso)}.xcd : $(SOLARPCKDIR)/fcfg_drivers_$$(@:b:s/registry_//).zip -.ENDIF +$(MISC)/lang/registry_{$(alllangiso)}.xcd : \ + $(SOLARPCKDIR)/fcfg_drivers_$$(@:b:s/registry_//).zip +.END + +.IF "$(ENABLE_ONLINE_UPDATE)" == "TRUE" +$(MISC)/lang/registry_{$(alllangiso)}.xcd : \ + $(SOLARPCKDIR)/updchk_$$(@:b:s/registry_//).zip +.END $(MISC)/lang/registry_%.xcd .ERRREMOVE : $(MKDIRHIER) $(@:d) + - $(RM) $(MISC)/$(@:b).list + echo '<list>' > $(MISC)/$(@:b).list + # Add registry_*.zip content to *.list: rm -rf $(MISC)/$(@:b).unzip mkdir $(MISC)/$(@:b).unzip cd $(MISC)/$(@:b).unzip && unzip $(SOLARPCKDIR)/$(@:b).zip + # Filter out filenames starting with ".": + echo $(foreach,i,$(shell cd $(MISC) && \ + find $(@:b).unzip -name \[!.\]\*.xcu -print) \ + '<filename>$i</filename>') >> $(MISC)/$(@:b).list .IF "$(BUILD_TYPE)" != "$(BUILD_TYPE:s/DBCONNECTIVITY//)" + # Add fcfg_drivers_*.zip content to *.list: rm -rf $(MISC)/fcfg_drivers_$*.unzip mkdir $(MISC)/fcfg_drivers_$*.unzip - cd $(MISC)/fcfg_drivers_$*.unzip && \ - unzip $(SOLARPCKDIR)/fcfg_drivers_$*.zip -.ENDIF - - $(RM) $(MISC)/$(@:b).list - # filter out filenames starting with "." -.IF "$(BUILD_TYPE)" != "$(BUILD_TYPE:s/DBCONNECTIVITY//)" - echo '<list>' $(foreach,i,$(shell cd $(MISC) && \ - find $(@:b).unzip fcfg_drivers_$*.unzip -name \[!.\]\*.xcu -print) \ - '<filename>$i</filename>') '</list>' > $(MISC)/$(@:b).list -.ELSE - echo '<list>' $(foreach,i,$(shell cd $(MISC) && \ - find $(@:b).unzip -name \[!.\]\*.xcu -print) \ - '<filename>$i</filename>') '</list>' > $(MISC)/$(@:b).list -.ENDIF + cd $(MISC)/fcfg_drivers_$*.unzip && unzip $(SOLARPCKDIR)/fcfg_drivers_$*.zip + # Filter out filenames starting with ".": + echo $(foreach,i,$(shell cd $(MISC) && \ + find fcfg_drivers_$*.unzip -name \[!.\]\*.xcu -print) \ + '<filename>$i</filename>') >> $(MISC)/$(@:b).list +.END +.IF "$(ENABLE_ONLINE_UPDATE)" == "TRUE" + # Add updchk_*.zip content to *.list: + rm -rf $(MISC)/updchk_$*.unzip + mkdir $(MISC)/updchk_$*.unzip + cd $(MISC)/updchk_$*.unzip && unzip $(SOLARPCKDIR)/updchk_$*.zip + # Filter out filenames starting with ".": + echo $(foreach,i,$(shell cd $(MISC) && \ + find updchk_$*.unzip -name \[!.\]\*.xcu -print) \ + '<filename>$i</filename>') >> $(MISC)/$(@:b).list +.END + echo '</list>' >> $(MISC)/$(@:b).list $(XSLTPROC) --nonet --stringparam prefix $(PWD)/$(MISC)/ -o $@ \ $(SOLARENV)/bin/packregistry.xslt $(MISC)/$(@:b).list commit d4e161e87ba11bf13256f66bce7fa96082db4f52 Author: Stephan Bergmann <[email protected]> Date: Fri May 11 12:52:29 2012 +0200 Typo Change-Id: Ia7d13e9e91f12a6f98eb51ed7d92ff14a5c8454d diff --git a/solenv/gbuild/Configuration.mk b/solenv/gbuild/Configuration.mk index 02d87a6..bbe3884 100644 --- a/solenv/gbuild/Configuration.mk +++ b/solenv/gbuild/Configuration.mk @@ -404,7 +404,7 @@ endif endef -#$(call gb_Configuration_add_schemas,zipfile,prefix,xcufiles) +#$(call gb_Configuration_add_datas,zipfile,prefix,xcufiles) define gb_Configuration_add_datas $(foreach xcu,$(3),$(call gb_Configuration_add_data,$(1),$(2),$(xcu))) _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
