diff options
| author | David Tardon <dtardon@redhat.com> | 2012-09-30 14:17:16 +0200 |
|---|---|---|
| committer | David Tardon <dtardon@redhat.com> | 2012-10-01 07:21:08 +0200 |
| commit | 898c34603555b64b330ef5a45b7e60eb82e25b66 (patch) | |
| tree | ab638652855751821946e2552cce43601a38bf59 | |
| parent | 6e9c84461a5b86275b61003de8753a6699fad1ba (diff) | |
do not rely on target-spec. var. inheritance
The whole idea of having two paths to look for schemas (one local, for
module, and one global, in $(OUTDIR)) is bad anyway, because there is no
way to do it in XSLT without warning if the checked schema does not
exist in the first path. I see two ways out of that:
1. rewrite schema_val.xsl in a decent language
2. split the node reference check in schema_val.xsl into two phases: the
first phase returns a list of subpaths to check, a helper script
processes that, finds the real paths and feeds it to the second phase
XSL, which does the internal check.
Change-Id: Icfe3f9ec0960cfd3423c1223ad8f495d7634b25a
| -rw-r--r-- | solenv/gbuild/Configuration.mk | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/solenv/gbuild/Configuration.mk b/solenv/gbuild/Configuration.mk index e02d0dad0a79..f8b511484b98 100644 --- a/solenv/gbuild/Configuration.mk +++ b/solenv/gbuild/Configuration.mk @@ -54,6 +54,8 @@ # gb_Configuration__get_source = $(SRCDIR)/$(2) +# The main LibreOffice registry +gb_Configuration_PRIMARY_REGISTRY_NAME := registry # XcsTarget class @@ -77,7 +79,7 @@ $(call gb_Helper_abbreviate_dirs,\ --noout \ --stringparam componentName $(subst /,.,$(basename $(XCSFILE))) \ --stringparam root $(subst $(XCSFILE),,$(3)) \ - $(if $(SCHEMA_ROOT),--stringparam schemaRoot $(SCHEMA_ROOT)) \ + $(if $(PRIMARY_REGISTRY),,--stringparam schemaRoot $(call gb_XcsTarget_get_outdir_target,)) \ $(gb_XcsTarget_XSLT_SchemaVal) \ $(3) && \ $(gb_XSLTPROC) --nonet \ @@ -353,8 +355,6 @@ $(foreach lang,$(gb_Configuration_LANGS),$(eval \ $(call gb_Configuration_get_clean_target,$(1)) : \ $(call gb_Zip_get_clean_target,$(1)_$(lang)))) -$(call gb_Configuration_get_target,$(1)) : SCHEMA_ROOT := - $$(eval $$(call gb_Module_register_target,$(call gb_Configuration_get_target,$(1)),$(call gb_Configuration_get_clean_target,$(1)))) endef @@ -368,6 +368,7 @@ $(call gb_Configuration_get_clean_target,$(1)) : \ $(call gb_XcsTarget_get_target,$(2)/$(3)) : \ $(call gb_Configuration__get_source,$(1),$(2)/$(3)) \ $(call gb_Configuration_get_preparation_target,$(1)) +$(call gb_XcsTarget_get_target,$(2)/$(3)) : PRIMARY_REGISTRY := $(filter $(1),$(gb_Configuration_PRIMARY_REGISTRY_NAME)) $(call gb_XcsTarget_get_target,$(2)/$(3)) : XCSFILE := $(3) $(call gb_XcsTarget_get_clean_target,$(2)/$(3)) : XCSFILE := $(3) $(call gb_Configuration_get_target,$(1)) : \ @@ -508,7 +509,6 @@ endef # $(eval $(call gb_Configuration_use_configuration,foo,registry)) define gb_Configuration_use_configuration $(call gb_Configuration_get_preparation_target,$(1)) : $(call gb_Configuration_get_target,$(2)) -$(call gb_Configuration_get_target,$(1)) : SCHEMA_ROOT := $(gb_Configuration_registry)/schema endef |