diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2012-05-11 13:08:51 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2012-05-11 13:10:27 +0200 |
| commit | 3f5ddf2e873b76abe3e166089fac2cfcb358d346 (patch) | |
| tree | bbe698d541f10698f036b464f795cd5d38e13bd9 /extensions | |
| parent | d4e161e87ba11bf13256f66bce7fa96082db4f52 (diff) | |
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
Diffstat (limited to 'extensions')
| -rw-r--r-- | extensions/Configuration_updchk.mk | 8 | ||||
| -rw-r--r-- | extensions/source/update/check/org/openoffice/Office/Addons.xcu | 2 | ||||
| -rw-r--r-- | extensions/source/update/check/org/openoffice/Office/Jobs.xcu | 2 |
3 files changed, 9 insertions, 3 deletions
diff --git a/extensions/Configuration_updchk.mk b/extensions/Configuration_updchk.mk index 1b3cbd350022..0cd2104970b7 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 8794ce858073..60043ec62c05 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 840d630698cb..cf2e1cc6f47d 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> |