Kaydet (Commit) e5eb6195 authored tarafından David Tardon's avatar David Tardon

fix rebuild of component file for CppunitTest

Change-Id: Ic0de3e77d9f5c05e41e434d7ae2215ba4460f13f
üst 5aebe7b6
...@@ -26,13 +26,13 @@ gb_ComponentTarget_get_source = $(SRCDIR)/$(1).component ...@@ -26,13 +26,13 @@ gb_ComponentTarget_get_source = $(SRCDIR)/$(1).component
# is a mapping from library filenames to direct pointers to the # is a mapping from library filenames to direct pointers to the
# corresponding PREFIX_component_getFactory functions. # corresponding PREFIX_component_getFactory functions.
define gb_ComponentTarget__command define gb_ComponentTarget__command
$(call gb_Output_announce,$(3),$(true),CMP,1) $(call gb_Output_announce,$(2),$(true),CMP,1)
$(if $(LIBFILENAME),,$(call gb_Output_error,No LIBFILENAME set at component target: $(1))) $(if $(LIBFILENAME),,$(call gb_Output_error,No LIBFILENAME set at component target: $(1)))
mkdir -p $(dir $(1)) && \ mkdir -p $(dir $(1)) && \
$(call gb_ExternalExecutable_get_command,xsltproc) --nonet \ $(call gb_ExternalExecutable_get_command,xsltproc) --nonet \
--stringparam uri '$(if $(filter TRUE,$(DISABLE_DYNLOADING)),,$(subst \d,$$,$(COMPONENTPREFIX)))$(LIBFILENAME)' \ --stringparam uri '$(if $(filter TRUE,$(DISABLE_DYNLOADING)),,$(subst \d,$$,$(COMPONENTPREFIX)))$(LIBFILENAME)' \
--stringparam cppu_env $(gb_CPPU_ENV) -o $(1) \ --stringparam cppu_env $(gb_CPPU_ENV) -o $(1) \
$(gb_ComponentTarget_XSLTCOMMANDFILE) $(2) $(gb_ComponentTarget_XSLTCOMMANDFILE) $(COMPONENTSOURCE)
endef endef
...@@ -43,16 +43,18 @@ $(call gb_ComponentTarget_get_clean_target,%) : ...@@ -43,16 +43,18 @@ $(call gb_ComponentTarget_get_clean_target,%) :
# when a library is renamed, the component file needs to be rebuilt to match. # when a library is renamed, the component file needs to be rebuilt to match.
# hence simply depend on Repository{,Fixes}.mk since the command runs quickly. # hence simply depend on Repository{,Fixes}.mk since the command runs quickly.
$(call gb_ComponentTarget_get_target,%) $(call gb_ComponentTarget_get_target,CppunitTest/%) : \ $(call gb_ComponentTarget_get_target,%) : \
$(call gb_ComponentTarget_get_source,%) \
$(SRCDIR)/Repository.mk \ $(SRCDIR)/Repository.mk \
$(SRCDIR)/RepositoryFixes.mk \ $(SRCDIR)/RepositoryFixes.mk \
| $(call gb_ExternalExecutable_get_dependencies,xsltproc) | $(call gb_ExternalExecutable_get_dependencies,xsltproc)
$(call gb_ComponentTarget__command,$@,$<,$*) $(call gb_ComponentTarget__command,$@,$*)
define gb_ComponentTarget_ComponentTarget define gb_ComponentTarget_ComponentTarget
$(call gb_ComponentTarget_get_target,$(1)) : COMPONENTPREFIX := $(2) $(call gb_ComponentTarget_get_target,$(1)) : COMPONENTPREFIX := $(2)
$(call gb_ComponentTarget_get_target,$(1)) : LIBFILENAME := $(3) $(call gb_ComponentTarget_get_target,$(1)) : LIBFILENAME := $(3)
$(call gb_ComponentTarget_get_target,$(1)) : COMPONENTSOURCE := $(call gb_ComponentTarget_get_source,$(patsubst CppunitTest/%,%,$(1)))
$(call gb_ComponentTarget_get_target,$(1)) : $(call gb_ComponentTarget_get_source,$(patsubst CppunitTest/%,%,$(1)))
endef endef
......
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