Skip to content

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

gbuild: kill gb_XcuModuleTarget_get_outdir_target 

Change-Id: I1d54d98b8aa50f778de87e6ebb17ec2eed0d65dc
üst db8ac18b
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 21 additions and 58 deletions
filter/Configuration_filter.mk
Dosyayı görüntüle @ f351a985
......@@ -31,11 +31,10 @@ filter_MERGE := $(call gb_ExternalExecutable_get_command,python) \
### types
filter_XcuFilterTypesTarget_get_target = $(WORKDIR)/XcuFilterTypesTarget/$(1)
filter_XcuFilterTypesTarget_get_clean_target = \
$(WORKDIR)/Clean/XcuFilterTypesTarget/$(1)
$(call filter_XcuFilterTypesTarget_get_target,%) : $(filter_MERGE_TARGET)
$(call gb_XcuFilterTypesTarget_get_target,%) : $(filter_MERGE_TARGET)
$(call gb_Output_announce,$*,$(true),FIT,1)
$(call gb_Helper_abbreviate_dirs,\
mkdir -p $(dir $@) && \
......@@ -48,43 +47,32 @@ $(call filter_XcuFilterTypesTarget_get_target,%) : $(filter_MERGE_TARGET)
outdir=$(dir $@) pkg=$@ xmlpackage=Types tcfg=$${RESPONSEFILE} && \
rm -f $${RESPONSEFILE})
# delivering is handled by the rule for gb_XcuModuleTarget_get_outdir_target
$(call filter_XcuFilterTypesTarget_get_clean_target,%) :
$(call gb_Output_announce,$*,$(false),FIT,1)
$(call gb_Helper_abbreviate_dirs,\
rm -f $(call filter_XcuFilterTypesTarget_get_target,$*) \
$(call gb_XcuModuleTarget_get_outdir_target,$*))
rm -f $(call gb_XcuFilterTypesTarget_get_target,$*)
# $(call filter_Configuration__add_module,configuration,module,prefix,xcufiles,target,cleantarget)
define filter_Configuration__add_module
$(call gb_Configuration_get_target,$(1)) : \
$(call gb_XcuModuleTarget_get_outdir_target,$(2))
$(call gb_Configuration_get_target,$(1)) : $(5)
$(call gb_Configuration_get_clean_target,$(1)) : $(6)
$(if $(4),,$(error filter_Configuration__add_module: no input files))
$(5) : \
$(addprefix $(SRCDIR)/$(3)/,$(addsuffix .xcu,$(4)))
$(call gb_XcuModuleTarget_get_outdir_target,$(2)) : $(5)
$(call gb_XcuModuleTarget_get_outdir_target,$(2)) |: $(dir $(call gb_XcuModuleTarget_get_outdir_target,$(2))).dir
$(call gb_Deliver_add_deliverable,\
$(call gb_XcuModuleTarget_get_outdir_target,$(2)),$(5),$(2))
endef
# $(call filter_Configuration_add_types,configuration,typesfile,prefix,xcufiles)
define filter_Configuration_add_types
$(eval $(call filter_Configuration__add_module,$(1),$(2),$(3),$(4),\
$(call filter_XcuFilterTypesTarget_get_target,$(2)),\
$(call gb_XcuFilterTypesTarget_get_target,$(2)),\
$(call filter_XcuFilterTypesTarget_get_clean_target,$(2))))
endef
### filters
filter_XcuFilterFiltersTarget_get_target = \
$(WORKDIR)/XcuFilterFiltersTarget/$(1)
filter_XcuFilterFiltersTarget_get_clean_target = \
$(WORKDIR)/Clean/XcuFilterFiltersTarget/$(1)
$(call filter_XcuFilterFiltersTarget_get_target,%) : $(filter_MERGE_TARGET)
$(call gb_XcuFilterFiltersTarget_get_target,%) : $(filter_MERGE_TARGET)
$(call gb_Output_announce,$*,$(true),FIF,1)
$(call gb_Helper_abbreviate_dirs,\
mkdir -p $(dir $@) && \
......@@ -97,28 +85,23 @@ $(call filter_XcuFilterFiltersTarget_get_target,%) : $(filter_MERGE_TARGET)
outdir=$(dir $@) pkg=$@ xmlpackage=Filter fcfg=$${RESPONSEFILE} && \
rm -f $${RESPONSEFILE})
# delivering is handled by the rule for gb_XcuModuleTarget_get_outdir_target
$(call filter_XcuFilterFiltersTarget_get_clean_target,%) :
$(call gb_Output_announce,$*,$(false),FIF,1)
$(call gb_Helper_abbreviate_dirs,\
rm -f $(call filter_XcuFilterFiltersTarget_get_target,$*) \
$(call gb_XcuModuleTarget_get_outdir_target,$*))
rm -f $(call gb_XcuFilterFiltersTarget_get_target,$*)
# $(call filter_Configuration_add_filters,configuration,typesfile,prefix,xcufiles)
define filter_Configuration_add_filters
$(eval $(call filter_Configuration__add_module,$(1),$(2),$(3),$(4),\
$(call filter_XcuFilterFiltersTarget_get_target,$(2)),\
$(call gb_XcuFilterFiltersTarget_get_target,$(2)),\
$(call filter_XcuFilterFiltersTarget_get_clean_target,$(2))))
endef
### others (frameloaders, contenthandlers)
filter_XcuFilterOthersTarget_get_target = $(WORKDIR)/XcuFilterOthersTarget/$(1)
filter_XcuFilterOthersTarget_get_clean_target = \
$(WORKDIR)/Clean/XcuFilterOthersTarget/$(1)
$(call filter_XcuFilterOthersTarget_get_target,%) : $(filter_MERGE_TARGET)
$(call gb_XcuFilterOthersTarget_get_target,%) : $(filter_MERGE_TARGET)
$(call gb_Output_announce,$*,$(true),FIO,1)
$(call gb_Helper_abbreviate_dirs,\
mkdir -p $(dir $@) && \
......@@ -137,27 +120,21 @@ $(call filter_XcuFilterOthersTarget_get_target,%) : $(filter_MERGE_TARGET)
$(call filter_XcuFilterOthersTarget_get_clean_target,%) :
$(call gb_Output_announce,$*,$(false),FIO,1)
$(call gb_Helper_abbreviate_dirs,\
rm -f $(call filter_XcuFilterOthersTarget_get_target,$*) \
$(call gb_XcuModuleTarget_get_outdir_target,$*))
# delivering is handled by the rule for gb_XcuModuleTarget_get_outdir_target
rm -f $(call gb_XcuFilterOthersTarget_get_target,$*)
# $(call filter_Configuration_add_others,configuration,typesfile,prefix,xcufiles)
define filter_Configuration_add_others
$(eval $(call filter_Configuration__add_module,$(1),$(2),$(3),$(4),\
$(call filter_XcuFilterOthersTarget_get_target,$(2)),\
$(call gb_XcuFilterOthersTarget_get_target,$(2)),\
$(call filter_XcuFilterOthersTarget_get_clean_target,$(2))))
endef
### internal filters
filter_XcuFilterInternalTarget_get_target = \
$(WORKDIR)/XcuFilterInternalTarget/$(1)
filter_XcuFilterInternalTarget_get_clean_target = \
$(WORKDIR)/Clean/XcuFilterInternalTarget/$(1)
$(call filter_XcuFilterInternalTarget_get_target,%) : $(filter_MERGE_TARGET)
$(call gb_XcuFilterInternalTarget_get_target,%) : $(filter_MERGE_TARGET)
$(call gb_Output_announce,$*,$(true),FII,1)
$(call gb_Helper_abbreviate_dirs,\
mkdir -p $(dir $@) && \
......@@ -171,18 +148,14 @@ $(call filter_XcuFilterInternalTarget_get_target,%) : $(filter_MERGE_TARGET)
fcfg=$${RESPONSEFILE} subdir_filters=internalgraphicfilters && \
rm -f $${RESPONSEFILE})
# delivering is handled by the rule for gb_XcuModuleTarget_get_outdir_target
$(call filter_XcuFilterInternalTarget_get_clean_target,%) :
$(call gb_Output_announce,$*,$(false),FII,1)
$(call gb_Helper_abbreviate_dirs,\
rm -f $(call filter_XcuFilterInternalTarget_get_target,$*) \
$(call gb_XcuModuleTarget_get_outdir_target,$*))
rm -f $(call gb_XcuFilterInternalTarget_get_target,$*)
# $(call filter_Configuration_add_internal_filters,configuration,typesfile,prefix,xcufiles)
define filter_Configuration_add_internal_filters
$(eval $(call filter_Configuration__add_module,$(1),$(2),$(3),$(4),\
$(call filter_XcuFilterInternalTarget_get_target,$(2)),\
$(call gb_XcuFilterInternalTarget_get_target,$(2)),\
$(call filter_XcuFilterInternalTarget_get_clean_target,$(2))))
endef
......
solenv/gbuild/Configuration.mk
Dosyayı görüntüle @ f351a985
......@@ -163,13 +163,13 @@ endef
$(call gb_XcuModuleTarget_get_target,%) : $(gb_XcuTarget_XSLT_AllLang) \
| $(gb_Configuration_XSLTCOMMAND_DEPS)
$(if $(filter %.xcu,$^),,$(error There is no target $(call gb_XcuModuleTarget_get_target,$*)))
$(call gb_XcuModuleTarget__command,$@,$*,$(filter %.xcu,$^),$(filter %.xcs,$^))
$(call gb_XcuModuleTarget_get_clean_target,%) :
$(call gb_Output_announce,$*,$(false),XCM,3)
$(call gb_Helper_abbreviate_dirs,\
rm -f $(call gb_XcuModuleTarget_get_target,$*) \
$(call gb_XcuModuleTarget_get_outdir_target,$(XCUFILE)))
rm -f $(call gb_XcuModuleTarget_get_target,$*))
# XcuLangpackTarget class
......@@ -299,9 +299,9 @@ $(call gb_Configuration_get_preparation_target,%) :
$(call gb_Helper_abbreviate_dirs,\
mkdir -p $(dir $@) && touch $@)
# $(call gb_Configuration_Configuration,configuration,repo,nodeliver)
# cannot use target local variable for REPO because it's needed in prereq
# $(call gb_Configuration_Configuration,configuration,nodeliver)
# last parameter may be used to turn off delivering of files
# FIXME: not anymore, no files are delivered now
define gb_Configuration_Configuration
$(eval gb_Configuration_NODELIVER_$(1) := $(2))
......@@ -368,21 +368,8 @@ $(call gb_XcuModuleTarget_get_target,$(2)/$(3)) : \
$(call gb_Configuration_get_preparation_target,$(1)) \
$(call gb_XcsTarget_for_XcuModuleTarget,$(3))
$(call gb_XcuModuleTarget_get_target,$(2)/$(3)) : PRIMARY_REGISTRY := $(filter $(1),$(gb_Configuration_PRIMARY_REGISTRY_NAME))
$(call gb_XcuModuleTarget_get_clean_target,$(2)/$(3)) : XCUFILE := $(3)
ifeq ($(strip $(gb_Configuration_NODELIVER_$(1))),)
$(call gb_Configuration_get_target,$(1)) : \
$(call gb_XcuModuleTarget_get_outdir_target,$(3))
$(call gb_XcuModuleTarget_get_outdir_target,$(3)) : \
$(call gb_XcuModuleTarget_get_target,$(2)/$(3)) \
| $(dir $(call gb_XcuModuleTarget_get_outdir_target,$(3))).dir
$(call gb_Deliver_add_deliverable,\
$(call gb_XcuModuleTarget_get_outdir_target,$(3)),\
$(call gb_XcuModuleTarget_get_target,$(2)/$(3)),\
$(2)/$(3))
else
$(call gb_Configuration_get_target,$(1)) : \
$(call gb_XcuModuleTarget_get_target,$(2)/$(3))
endif
endef
......
solenv/gbuild/TargetLocations.mk
Dosyayı görüntüle @ f351a985
......@@ -41,7 +41,6 @@ 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)
gb_XcuModuleTarget_get_outdir_target = $(gb_Configuration_registry)/spool/$(1)
gb_Executable_get_target = $(gb_Executable__get_linktarget_target)
......@@ -219,6 +218,10 @@ gb_LexTarget_get_target = $(WORKDIR)/LexTarget/$(1).done
gb_XcdTarget_get_target = $(WORKDIR)/XcdTarget/$(1)
gb_XcsTarget_get_target = $(WORKDIR)/XcsTarget/$(1)
gb_XcuDataTarget_get_target = $(WORKDIR)/XcuDataTarget/$(1)
gb_XcuFilterFiltersTarget_get_target = $(WORKDIR)/XcuFilterFiltersTarget/$(1)
gb_XcuFilterInternalTarget_get_target = $(WORKDIR)/XcuFilterInternalTarget/$(1)
gb_XcuFilterOthersTarget_get_target = $(WORKDIR)/XcuFilterOthersTarget/$(1)
gb_XcuFilterTypesTarget_get_target = $(WORKDIR)/XcuFilterTypesTarget/$(1)
gb_XcuLangpackTarget_get_target = $(WORKDIR)/XcuLangpackTarget/$(1)
gb_XcuModuleTarget_get_target = $(WORKDIR)/XcuModuleTarget/$(1)
gb_XcuMergeTarget_get_target = $(WORKDIR)/XcuMergeTarget/$(1)
......
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