diff options
| -rw-r--r-- | postprocess/CustomTarget_registry.mk | 2 | ||||
| -rw-r--r-- | sdext/Extension_minimizer.mk | 2 | ||||
| -rw-r--r-- | solenv/gbuild/Configuration.mk | 33 | ||||
| -rw-r--r-- | solenv/gbuild/TargetLocations.mk | 8 | ||||
| -rw-r--r-- | solenv/gbuild/gbuild.mk | 2 |
5 files changed, 15 insertions, 32 deletions
diff --git a/postprocess/CustomTarget_registry.mk b/postprocess/CustomTarget_registry.mk index d0f2e97ffb9e..0d1c10d966d6 100644 --- a/postprocess/CustomTarget_registry.mk +++ b/postprocess/CustomTarget_registry.mk @@ -13,7 +13,7 @@ $(eval $(call gb_CustomTarget_CustomTarget,postprocess/registry)) # Variables # -postprocess_XCS := $(call gb_XcsTarget_get_outdir_target,org/openoffice) +postprocess_XCS := $(call gb_XcsTarget_get_target,org/openoffice) postprocess_XCU := $(call gb_XcuDataTarget_get_target,officecfg/registry/data/org/openoffice) postprocess_MOD := $(call gb_XcuModuleTarget_get_target,officecfg/registry/data) postprocess_DRIVERS := diff --git a/sdext/Extension_minimizer.mk b/sdext/Extension_minimizer.mk index f747d0efe3c9..70bce1607168 100644 --- a/sdext/Extension_minimizer.mk +++ b/sdext/Extension_minimizer.mk @@ -25,7 +25,7 @@ $(eval $(call gb_Extension_add_files,presentation-minimizer,bitmaps,\ $(SRCDIR)/icon-themes/galaxy/minimizer/opt_26.png \ )) -$(eval $(call gb_Extension_add_file,presentation-minimizer,registry/schema/org/openoffice/Office/extension/SunPresentationMinimizer.xcs,$(call gb_XcsTarget_get_target,sdext/source/minimizer/registry/schema/org/openoffice/Office/extension/SunPresentationMinimizer.xcs))) +$(eval $(call gb_Extension_add_file,presentation-minimizer,registry/schema/org/openoffice/Office/extension/SunPresentationMinimizer.xcs,$(call gb_XcsTarget_get_target,org/openoffice/Office/extension/SunPresentationMinimizer.xcs))) $(eval $(call gb_Extension_add_files,presentation-minimizer,registry/data/org/openoffice/Office,\ $(call gb_XcuFile_for_extension,sdext/source/minimizer/registry/data/org/openoffice/Office/Addons.xcu) \ diff --git a/solenv/gbuild/Configuration.mk b/solenv/gbuild/Configuration.mk index eec45fb98461..49864a51096e 100644 --- a/solenv/gbuild/Configuration.mk +++ b/solenv/gbuild/Configuration.mk @@ -48,7 +48,7 @@ gb_Configuration_PRIMARY_REGISTRY_SCHEMA_ROOT = \ gb_Configuration__stringparam_schemaRoot = --stringparam schemaRoot \ $(if $(PRIMARY_REGISTRY), \ $(gb_Configuration_PRIMARY_REGISTRY_SCHEMA_ROOT), \ - $(call gb_XcsTarget_get_outdir_target,)) + $(call gb_XcsTarget_get_target,)) gb_Configuration_XSLTCOMMAND = $(call gb_ExternalExecutable_get_command,xsltproc) gb_Configuration_XSLTCOMMAND_DEPS = $(call gb_ExternalExecutable_get_dependencies,xsltproc) @@ -57,7 +57,7 @@ gb_Configuration_XSLTCOMMAND_DEPS = $(call gb_ExternalExecutable_get_dependencie # need to locate a schema file corresponding to some XCU file in the outdir define gb_XcsTarget_for_XcuTarget -$(call gb_XcsTarget_get_outdir_target,$(basename $(1)).xcs) +$(call gb_XcsTarget_get_target,$(basename $(1)).xcs) endef gb_Configuration_LANGS := en-US $(filter-out en-US,$(gb_WITH_LANG)) @@ -73,8 +73,8 @@ $(call gb_Helper_abbreviate_dirs,\ mkdir -p $(dir $(1)) && \ $(gb_Configuration_XSLTCOMMAND) --nonet \ --noout \ - --stringparam componentName $(subst /,.,$(basename $(XCSFILE))) \ - --stringparam root $(subst $(XCSFILE),,$(3)) \ + --stringparam componentName $(subst /,.,$(basename $(2))) \ + --stringparam root $(subst $(2),,$(3)) \ $(gb_Configuration__stringparam_schemaRoot) \ $(gb_XcsTarget_XSLT_SchemaVal) \ $(3) && \ @@ -96,9 +96,7 @@ $(call gb_XcsTarget_get_target,%) : \ $(call gb_XcsTarget_get_clean_target,%) : $(call gb_Output_announce,$*,$(false),XCS,1) - $(call gb_Helper_abbreviate_dirs,\ - rm -f $(call gb_XcsTarget_get_target,$*) \ - $(call gb_XcsTarget_get_outdir_target,$(XCSFILE))) + rm -f $(call gb_XcsTarget_get_target,$*) # XcuDataTarget class @@ -115,14 +113,12 @@ $(call gb_Helper_abbreviate_dirs,\ --noout \ --stringparam xcs $(call gb_XcsTarget_for_XcuTarget,$(XCUFILE)) \ $(gb_Configuration__stringparam_schemaRoot) \ - --path $(gb_Configuration_registry) \ $(gb_XcuDataTarget_XSLT_DataVal) \ $(3) && \ $(gb_Configuration_XSLTCOMMAND) --nonet \ -o $(1) \ --stringparam xcs $(call gb_XcsTarget_for_XcuTarget,$(XCUFILE)) \ $(gb_Configuration__stringparam_schemaRoot) \ - --path $(gb_Configuration_registry) \ $(gb_XcuTarget_XSLT_AllLang) \ $(3)) endef @@ -145,7 +141,7 @@ $(SRCDIR)/$(basename $(subst -,.,$(basename $(1)))).xcu endef define gb_XcsTarget_for_XcuModuleTarget -$(call gb_XcsTarget_get_outdir_target,$(basename $(subst -,.,$(basename $(1)))).xcs) +$(call gb_XcsTarget_get_target,$(basename $(subst -,.,$(basename $(1)))).xcs) endef define gb_XcuModuleTarget__command @@ -253,7 +249,6 @@ $(call gb_Helper_abbreviate_dirs,\ --stringparam xcs $(call gb_XcsTarget_for_XcuTarget,$(XCUFILE)) \ $(gb_Configuration__stringparam_schemaRoot) \ --stringparam locale $(word 2,$(subst /, ,$(2))) \ - --path $(gb_Configuration_registry) \ $(gb_XcuTarget_XSLT_AllLang) \ $(3)) endef @@ -311,24 +306,16 @@ $(call gb_Helper_make_userfriendly_targets,$(1),Configuration) endef # $(call gb_Configuration_add_schema,configuration,prefix,xcsfile) -# FIXME this is always delivered because commands depend on it... # hopefully extensions do not need to add schemas with same name as officecfg define gb_Configuration_add_schema $(call gb_Configuration_get_clean_target,$(1)) : \ - $(call gb_XcsTarget_get_clean_target,$(2)/$(3)) -$(call gb_XcsTarget_get_target,$(2)/$(3)) : \ + $(call gb_XcsTarget_get_clean_target,$(3)) +$(call gb_XcsTarget_get_target,$(3)) : \ $(SRCDIR)/$(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_XcsTarget_get_target,$(3)) : PRIMARY_REGISTRY := $(filter $(1),$(gb_Configuration_PRIMARY_REGISTRY_NAME)) $(call gb_Configuration_get_target,$(1)) : \ - $(call gb_XcsTarget_get_outdir_target,$(3)) -$(call gb_XcsTarget_get_outdir_target,$(3)) : \ - $(call gb_XcsTarget_get_target,$(2)/$(3)) \ - | $(dir $(call gb_XcsTarget_get_outdir_target,$(3))).dir -$(call gb_Deliver_add_deliverable,$(call gb_XcsTarget_get_outdir_target,$(3)),\ - $(call gb_XcsTarget_get_target,$(2)/$(3)),$(2)/$(3)) + $(call gb_XcsTarget_get_target,$(3)) endef diff --git a/solenv/gbuild/TargetLocations.mk b/solenv/gbuild/TargetLocations.mk index 217f020eddb1..040dfdf4722a 100644 --- a/solenv/gbuild/TargetLocations.mk +++ b/solenv/gbuild/TargetLocations.mk @@ -31,16 +31,14 @@ gb_PackagePart_get_destinations = \ $(OUTDIR)/res \ $(OUTDIR)/share \ $(OUTDIR)/unittest \ - $(OUTDIR)/xml \ gb_InstallScript_get_target = $(OUTDIR)/bin/$(1)$(gb_InstallScript_EXT) gb_ResTarget_get_unittest_target = \ $(OUTDIR)/unittest/install/$(LIBO_SHARE_RESOURCE_FOLDER)/$(1).res gb_UnoApi_get_target = $(OUTDIR)/bin/$(1).rdb gb_Jar_get_outdir_target = $(OUTDIR)/bin/$(1).jar -gb_Configuration_registry = $(OUTDIR)/xml/registry -gb_XcsTarget_get_outdir_target = \ - $(gb_Configuration_registry)/schema$(if $(1),/)$(1) + +# instdir target patterns gb_Executable_get_target = $(gb_Executable__get_linktarget_target) @@ -216,7 +214,7 @@ gb_LexTarget_get_scanner_target = $(WORKDIR)/LexTarget/$(1).cxx gb_LexTarget_get_target = $(WORKDIR)/LexTarget/$(1).done gb_XcdTarget_get_target = $(WORKDIR)/XcdTarget/$(1) -gb_XcsTarget_get_target = $(WORKDIR)/XcsTarget/$(1) +gb_XcsTarget_get_target = $(WORKDIR)/XcsTarget$(if $(1),/)$(1) gb_XcuDataTarget_get_target = $(WORKDIR)/XcuDataTarget/$(1) gb_XcuFilterFiltersTarget_get_target = $(WORKDIR)/XcuFilterFiltersTarget/$(1) gb_XcuFilterInternalTarget_get_target = $(WORKDIR)/XcuFilterInternalTarget/$(1) diff --git a/solenv/gbuild/gbuild.mk b/solenv/gbuild/gbuild.mk index 23e2d09df723..cab99533f1ca 100644 --- a/solenv/gbuild/gbuild.mk +++ b/solenv/gbuild/gbuild.mk @@ -279,8 +279,6 @@ $(eval $(call gb_Deliver_init)) # with $(OUTDIR)/bin/%.res for resources on unix # $(OUTDIR)/lib/%.lib collides # on windows (static and dynamic libs) -# $(OUTDIR)/xml/% for packageparts collides -# with $(OUTDIR)/xml/component/%.component for components # This is less of an issue with GNU Make versions > 3.82 which matches for # shortest stem instead of first match. However, upon intoduction this version # is not available everywhere by default. |