Skip to content

C
core
Kaydet (Commit) 1f82c0a4 authored tarafından Matúš Kukan's avatar Matúš Kukan
Dosyalara gözat
Seçenekler

gbuild: kill gb_XcsTarget_get_outdir_target 

No idea what the '--path $(gb_Configuration_registry)' parameter was for.

Change-Id: I892e178a62fa2ea971101815ea558f79d32f85ed
üst e5525abb
Hide whitespace changes
Inline Side-by-side
Showing with 15 additions and 32 deletions
postprocess/CustomTarget_registry.mk
Dosyayı görüntüle @ 1f82c0a4
...@@ -13,7 +13,7 @@ $(eval $(call gb_CustomTarget_CustomTarget,postprocess/registry)) ...@@ -13,7 +13,7 @@ $(eval $(call gb_CustomTarget_CustomTarget,postprocess/registry))
# Variables # 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_XCU := $(call gb_XcuDataTarget_get_target,officecfg/registry/data/org/openoffice)
postprocess_MOD := $(call gb_XcuModuleTarget_get_target,officecfg/registry/data) postprocess_MOD := $(call gb_XcuModuleTarget_get_target,officecfg/registry/data)
postprocess_DRIVERS := postprocess_DRIVERS :=
......
sdext/Extension_minimizer.mk
Dosyayı görüntüle @ 1f82c0a4
...@@ -25,7 +25,7 @@ $(eval $(call gb_Extension_add_files,presentation-minimizer,bitmaps,\ ...@@ -25,7 +25,7 @@ $(eval $(call gb_Extension_add_files,presentation-minimizer,bitmaps,\
$(SRCDIR)/icon-themes/galaxy/minimizer/opt_26.png \ $(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,\ $(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) \ $(call gb_XcuFile_for_extension,sdext/source/minimizer/registry/data/org/openoffice/Office/Addons.xcu) \
......
solenv/gbuild/Configuration.mk
Dosyayı görüntüle @ 1f82c0a4
...@@ -48,7 +48,7 @@ gb_Configuration_PRIMARY_REGISTRY_SCHEMA_ROOT = \ ...@@ -48,7 +48,7 @@ gb_Configuration_PRIMARY_REGISTRY_SCHEMA_ROOT = \
gb_Configuration__stringparam_schemaRoot = --stringparam schemaRoot \ gb_Configuration__stringparam_schemaRoot = --stringparam schemaRoot \
$(if $(PRIMARY_REGISTRY), \ $(if $(PRIMARY_REGISTRY), \
$(gb_Configuration_PRIMARY_REGISTRY_SCHEMA_ROOT), \ $(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 = $(call gb_ExternalExecutable_get_command,xsltproc)
gb_Configuration_XSLTCOMMAND_DEPS = $(call gb_ExternalExecutable_get_dependencies,xsltproc) gb_Configuration_XSLTCOMMAND_DEPS = $(call gb_ExternalExecutable_get_dependencies,xsltproc)
...@@ -57,7 +57,7 @@ gb_Configuration_XSLTCOMMAND_DEPS = $(call gb_ExternalExecutable_get_dependencie ...@@ -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 # need to locate a schema file corresponding to some XCU file in the outdir
define gb_XcsTarget_for_XcuTarget define gb_XcsTarget_for_XcuTarget
$(call gb_XcsTarget_get_outdir_target,$(basename $(1)).xcs) $(call gb_XcsTarget_get_target,$(basename $(1)).xcs)
endef endef
gb_Configuration_LANGS := en-US $(filter-out en-US,$(gb_WITH_LANG)) gb_Configuration_LANGS := en-US $(filter-out en-US,$(gb_WITH_LANG))
...@@ -73,8 +73,8 @@ $(call gb_Helper_abbreviate_dirs,\ ...@@ -73,8 +73,8 @@ $(call gb_Helper_abbreviate_dirs,\
mkdir -p $(dir $(1)) && \ mkdir -p $(dir $(1)) && \
$(gb_Configuration_XSLTCOMMAND) --nonet \ $(gb_Configuration_XSLTCOMMAND) --nonet \
--noout \ --noout \
--stringparam componentName $(subst /,.,$(basename $(XCSFILE))) \ --stringparam componentName $(subst /,.,$(basename $(2))) \
--stringparam root $(subst $(XCSFILE),,$(3)) \ --stringparam root $(subst $(2),,$(3)) \
$(gb_Configuration__stringparam_schemaRoot) \ $(gb_Configuration__stringparam_schemaRoot) \
$(gb_XcsTarget_XSLT_SchemaVal) \ $(gb_XcsTarget_XSLT_SchemaVal) \
$(3) && \ $(3) && \
...@@ -96,9 +96,7 @@ $(call gb_XcsTarget_get_target,%) : \ ...@@ -96,9 +96,7 @@ $(call gb_XcsTarget_get_target,%) : \
$(call gb_XcsTarget_get_clean_target,%) : $(call gb_XcsTarget_get_clean_target,%) :
$(call gb_Output_announce,$*,$(false),XCS,1) $(call gb_Output_announce,$*,$(false),XCS,1)
$(call gb_Helper_abbreviate_dirs,\ rm -f $(call gb_XcsTarget_get_target,$*)
rm -f $(call gb_XcsTarget_get_target,$*) \
$(call gb_XcsTarget_get_outdir_target,$(XCSFILE)))
# XcuDataTarget class # XcuDataTarget class
...@@ -115,14 +113,12 @@ $(call gb_Helper_abbreviate_dirs,\ ...@@ -115,14 +113,12 @@ $(call gb_Helper_abbreviate_dirs,\
--noout \ --noout \
--stringparam xcs $(call gb_XcsTarget_for_XcuTarget,$(XCUFILE)) \ --stringparam xcs $(call gb_XcsTarget_for_XcuTarget,$(XCUFILE)) \
$(gb_Configuration__stringparam_schemaRoot) \ $(gb_Configuration__stringparam_schemaRoot) \
--path $(gb_Configuration_registry) \
$(gb_XcuDataTarget_XSLT_DataVal) \ $(gb_XcuDataTarget_XSLT_DataVal) \
$(3) && \ $(3) && \
$(gb_Configuration_XSLTCOMMAND) --nonet \ $(gb_Configuration_XSLTCOMMAND) --nonet \
-o $(1) \ -o $(1) \
--stringparam xcs $(call gb_XcsTarget_for_XcuTarget,$(XCUFILE)) \ --stringparam xcs $(call gb_XcsTarget_for_XcuTarget,$(XCUFILE)) \
$(gb_Configuration__stringparam_schemaRoot) \ $(gb_Configuration__stringparam_schemaRoot) \
--path $(gb_Configuration_registry) \
$(gb_XcuTarget_XSLT_AllLang) \ $(gb_XcuTarget_XSLT_AllLang) \
$(3)) $(3))
endef endef
...@@ -145,7 +141,7 @@ $(SRCDIR)/$(basename $(subst -,.,$(basename $(1)))).xcu ...@@ -145,7 +141,7 @@ $(SRCDIR)/$(basename $(subst -,.,$(basename $(1)))).xcu
endef endef
define gb_XcsTarget_for_XcuModuleTarget 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 endef
define gb_XcuModuleTarget__command define gb_XcuModuleTarget__command
...@@ -253,7 +249,6 @@ $(call gb_Helper_abbreviate_dirs,\ ...@@ -253,7 +249,6 @@ $(call gb_Helper_abbreviate_dirs,\
--stringparam xcs $(call gb_XcsTarget_for_XcuTarget,$(XCUFILE)) \ --stringparam xcs $(call gb_XcsTarget_for_XcuTarget,$(XCUFILE)) \
$(gb_Configuration__stringparam_schemaRoot) \ $(gb_Configuration__stringparam_schemaRoot) \
--stringparam locale $(word 2,$(subst /, ,$(2))) \ --stringparam locale $(word 2,$(subst /, ,$(2))) \
--path $(gb_Configuration_registry) \
$(gb_XcuTarget_XSLT_AllLang) \ $(gb_XcuTarget_XSLT_AllLang) \
$(3)) $(3))
endef endef
...@@ -311,24 +306,16 @@ $(call gb_Helper_make_userfriendly_targets,$(1),Configuration) ...@@ -311,24 +306,16 @@ $(call gb_Helper_make_userfriendly_targets,$(1),Configuration)
endef endef
# $(call gb_Configuration_add_schema,configuration,prefix,xcsfile) # $(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 # hopefully extensions do not need to add schemas with same name as officecfg
define gb_Configuration_add_schema define gb_Configuration_add_schema
$(call gb_Configuration_get_clean_target,$(1)) : \ $(call gb_Configuration_get_clean_target,$(1)) : \
$(call gb_XcsTarget_get_clean_target,$(2)/$(3)) $(call gb_XcsTarget_get_clean_target,$(3))
$(call gb_XcsTarget_get_target,$(2)/$(3)) : \ $(call gb_XcsTarget_get_target,$(3)) : \
$(SRCDIR)/$(2)/$(3) \ $(SRCDIR)/$(2)/$(3) \
$(call gb_Configuration_get_preparation_target,$(1)) $(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,$(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)) : \ $(call gb_Configuration_get_target,$(1)) : \
$(call gb_XcsTarget_get_outdir_target,$(3)) $(call gb_XcsTarget_get_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))
endef endef
......
solenv/gbuild/TargetLocations.mk
Dosyayı görüntüle @ 1f82c0a4
...@@ -31,16 +31,14 @@ gb_PackagePart_get_destinations = \ ...@@ -31,16 +31,14 @@ gb_PackagePart_get_destinations = \
$(OUTDIR)/res \ $(OUTDIR)/res \
$(OUTDIR)/share \ $(OUTDIR)/share \
$(OUTDIR)/unittest \ $(OUTDIR)/unittest \
$(OUTDIR)/xml \
gb_InstallScript_get_target = $(OUTDIR)/bin/$(1)$(gb_InstallScript_EXT) gb_InstallScript_get_target = $(OUTDIR)/bin/$(1)$(gb_InstallScript_EXT)
gb_ResTarget_get_unittest_target = \ gb_ResTarget_get_unittest_target = \
$(OUTDIR)/unittest/install/$(LIBO_SHARE_RESOURCE_FOLDER)/$(1).res $(OUTDIR)/unittest/install/$(LIBO_SHARE_RESOURCE_FOLDER)/$(1).res
gb_UnoApi_get_target = $(OUTDIR)/bin/$(1).rdb gb_UnoApi_get_target = $(OUTDIR)/bin/$(1).rdb
gb_Jar_get_outdir_target = $(OUTDIR)/bin/$(1).jar gb_Jar_get_outdir_target = $(OUTDIR)/bin/$(1).jar
gb_Configuration_registry = $(OUTDIR)/xml/registry
gb_XcsTarget_get_outdir_target = \ # instdir target patterns
$(gb_Configuration_registry)/schema$(if $(1),/)$(1)
gb_Executable_get_target = $(gb_Executable__get_linktarget_target) gb_Executable_get_target = $(gb_Executable__get_linktarget_target)
...@@ -216,7 +214,7 @@ gb_LexTarget_get_scanner_target = $(WORKDIR)/LexTarget/$(1).cxx ...@@ -216,7 +214,7 @@ gb_LexTarget_get_scanner_target = $(WORKDIR)/LexTarget/$(1).cxx
gb_LexTarget_get_target = $(WORKDIR)/LexTarget/$(1).done gb_LexTarget_get_target = $(WORKDIR)/LexTarget/$(1).done
gb_XcdTarget_get_target = $(WORKDIR)/XcdTarget/$(1) 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_XcuDataTarget_get_target = $(WORKDIR)/XcuDataTarget/$(1)
gb_XcuFilterFiltersTarget_get_target = $(WORKDIR)/XcuFilterFiltersTarget/$(1) gb_XcuFilterFiltersTarget_get_target = $(WORKDIR)/XcuFilterFiltersTarget/$(1)
gb_XcuFilterInternalTarget_get_target = $(WORKDIR)/XcuFilterInternalTarget/$(1) gb_XcuFilterInternalTarget_get_target = $(WORKDIR)/XcuFilterInternalTarget/$(1)
......
solenv/gbuild/gbuild.mk
Dosyayı görüntüle @ 1f82c0a4
...@@ -279,8 +279,6 @@ $(eval $(call gb_Deliver_init)) ...@@ -279,8 +279,6 @@ $(eval $(call gb_Deliver_init))
# with $(OUTDIR)/bin/%.res for resources on unix # with $(OUTDIR)/bin/%.res for resources on unix
# $(OUTDIR)/lib/%.lib collides # $(OUTDIR)/lib/%.lib collides
# on windows (static and dynamic libs) # 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 # 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 # shortest stem instead of first match. However, upon intoduction this version
# is not available everywhere by default. # is not available everywhere by default.
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment