diff options
| author | Matúš Kukan <matus.kukan@gmail.com> | 2012-08-08 19:04:25 +0200 |
|---|---|---|
| committer | Matúš Kukan <matus.kukan@gmail.com> | 2012-08-09 16:16:49 +0200 |
| commit | 589ca848c2170ce1a67a33ad3a19a71d8d606e64 (patch) | |
| tree | e5f4c502af3131bebf2430e7c14b64931b13280d /solenv | |
| parent | 8e808a6fa82bac89bc32cbd16544a0dbfc63a365 (diff) | |
gbuild: there are no old components anymore
..and binfilter will die
Change-Id: I9a773f06ed5332c2258f0a29ea39349b27ece2ac
Diffstat (limited to 'solenv')
| -rw-r--r-- | solenv/gbuild/CppunitTest.mk | 25 | ||||
| -rw-r--r-- | solenv/gbuild/Rdb.mk | 16 |
2 files changed, 2 insertions, 39 deletions
diff --git a/solenv/gbuild/CppunitTest.mk b/solenv/gbuild/CppunitTest.mk index a3e91ded5f39..190e40be73c2 100644 --- a/solenv/gbuild/CppunitTest.mk +++ b/solenv/gbuild/CppunitTest.mk @@ -258,31 +258,6 @@ $(foreach component,$(call gb_CppunitTest__filter_not_built_components,$(2)),$(c endef -define gb_CppunitTest_add_old_component -$$(call gb_Output_error,\ - gb_CppunitTest_add_old_component: use gb_CppunitTest_use_old_component instead.) -endef - -define gb_CppunitTest_use_old_component -$(call gb_CppunitTest_get_target,$(1)) : \ - $(call gb_CppunitTest__get_old_component_target,$(2)) -$(call gb_CppunitTest_get_target,$(1)) : \ - UNO_SERVICES += $(call gb_ComponentTarget__get_old_component_target,$(2)) - -endef - -define gb_CppunitTest_add_old_components -$$(call gb_Output_error,\ - gb_CppunitTest_add_old_components: use gb_CppunitTest_use_old_components instead.) -endef - -define gb_CppunitTest_use_old_components -$(foreach component,$(2),$(call gb_CppunitTest_use_old_component,$(1),$(component))) - -endef - -gb_ComponentTarget__get_old_component_target = $(OUTDIR)/xml/$(1).component - define gb_CppunitTest__use_configuration $(call gb_CppunitTest_get_target,$(1)) : CONFIGURATION_LAYERS += $(2):$(call gb_Helper_make_url,$(3)) diff --git a/solenv/gbuild/Rdb.mk b/solenv/gbuild/Rdb.mk index 7a85ff27af75..03281567c805 100644 --- a/solenv/gbuild/Rdb.mk +++ b/solenv/gbuild/Rdb.mk @@ -25,24 +25,12 @@ # in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable # instead of those above. -# Component paths created by the old build system does not contain any -# directories. -gb_Rdb__is_old_component_target = $(if $(findstring /,$(1)),$(false),$(true)) - -gb_Rdb__get_old_component_target = $(OUTDIR)/xml/$(1).component - -define gb_Rdb__get_component_target -$(strip $(if $(call gb_Rdb__is_old_component_target,$(component))\ - ,$(call gb_Rdb__get_old_component_target,$(component))\ - ,$(call gb_ComponentTarget_get_outdir_target,$(component)))) -endef - define gb_Rdb__command $(call gb_Helper_abbreviate_dirs,\ mkdir -p $(dir $@) && \ (\ echo '<list>' && \ - $(foreach component,$(COMPONENTS),echo "<filename>$(call gb_Rdb__get_component_target,$(component))</filename>" &&) \ + $(foreach component,$(COMPONENTS),echo "<filename>$(call gb_ComponentTarget_get_outdir_target,$(component))</filename>" &&) \ echo '</list>' \ ) > $(1).input && \ $(gb_XSLTPROC) --nonet -o $(1) $(SOLARENV)/bin/packcomponents.xslt $(1).input && \ @@ -78,7 +66,7 @@ $$(eval $$(call gb_Module_register_target,$(call gb_Rdb_get_outdir_target,$(1)), endef define gb_Rdb_add_component -$(call gb_Rdb_get_target,$(1)) : $(call gb_Rdb__get_component_target,$(2)) +$(call gb_Rdb_get_target,$(1)) : $(call gb_ComponentTarget_get_outdir_target,$(2)) $(call gb_Rdb_get_target,$(1)) : COMPONENTS += $(2) $(call gb_Rdb_get_clean_target,$(1)) : COMPONENTS += $(2) |