diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2013-02-27 13:48:06 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2013-02-27 13:48:06 +0100 |
| commit | 1ab01b025014975b0f2bb831d9a986ae5c3c7430 (patch) | |
| tree | 3b3d459e4db09b5416ce5aa710f294db13bcf365 /officecfg | |
| parent | 5eb65e1ec21c3dadec486df79849d899de62ab1d (diff) | |
Do not depend on (not-yet) delivered .xcs files in --stringparam schemaRoot
.xcs/.xcu files can reference other .xcs files via oor:component attributes, and
the various xsltproc scripts called from solenv/gbuild/Configure.mk try to load
the referenced .xcs files, locating them via --stringparam schemaRoot arguments.
These references among .xcs/.xcu files are not tracked via dependencies in the
build system. When building the primary registry in module officecfg,
schemaRoot must therefore not reference solver, as any referenced .xcs files
need not yet be delivered.
In the old dmake build system, this was solved by basing the schemaRoot argument
on an ABSXCSROOT variable that was set differently in
officecfg/util/makefile.pmk (pointing into officecfg/ itself) than in other
modules (like in connectivity/makefile.pmk, pointing into solver/).
Reproduced that hack in the new gbuild system now, too (which already had that
hack partially implemented for .xcs files).
Change-Id: Ib2300686c4de144f0b1e18d0e985e6fc7d9f64ae
Diffstat (limited to 'officecfg')
| -rw-r--r-- | officecfg/Configuration_officecfg.mk | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/officecfg/Configuration_officecfg.mk b/officecfg/Configuration_officecfg.mk index 5252f4e5661a..eba42f0f886d 100644 --- a/officecfg/Configuration_officecfg.mk +++ b/officecfg/Configuration_officecfg.mk @@ -16,6 +16,8 @@ # the License at http://www.apache.org/licenses/LICENSE-2.0 . # +# The name "registry" needs to match gb_Configuration_PRIMARY_REGISTRY_NAME in +# solenv/gbuild/Configuration.mk: $(eval $(call gb_Configuration_Configuration,registry)) $(eval $(call gb_Configuration_add_schemas,registry,officecfg/registry/schema,\ |