diff options
| author | David Tardon <dtardon@redhat.com> | 2014-08-02 16:11:44 +0200 |
|---|---|---|
| committer | David Tardon <dtardon@redhat.com> | 2014-08-02 19:16:37 +0200 |
| commit | 18d2a0ff95a271d7500a1a3d777e6d7ac7f0d8d7 (patch) | |
| tree | e23cf26b29b35b9be78e82a9cbaeaaf92a35774f /solenv | |
| parent | 00daa1f560676ed15583f0a4353e7be18a917f91 (diff) | |
gbuild: ensure py files for a component are there
... when the component is used by a unit test.
Change-Id: I5e3b1770c18d8f7dd8166f30f82bbbba1aa72dc1
Diffstat (limited to 'solenv')
| -rw-r--r-- | solenv/gbuild/Pyuno.mk | 13 | ||||
| -rw-r--r-- | solenv/gbuild/TargetLocations.mk | 1 |
2 files changed, 10 insertions, 4 deletions
diff --git a/solenv/gbuild/Pyuno.mk b/solenv/gbuild/Pyuno.mk index 25f8c8fe9485..b9ccb49a3e2e 100644 --- a/solenv/gbuild/Pyuno.mk +++ b/solenv/gbuild/Pyuno.mk @@ -23,10 +23,13 @@ $(call gb_Pyuno_get_target,%) : $(call gb_Output_announce,$*,$(true),PYU,3) touch $@ +$(call gb_Pyuno_get_final_target,%) : + touch $@ + .PHONY : $(call gb_Pyuno_get_clean_target,%) $(call gb_Pyuno_get_clean_target,%) : $(call gb_Output_announce,$*,$(false),PYU,3) - rm -f $(call gb_Pyuno_get_target,$*) + rm -f $(call gb_Pyuno_get_target,$*) $(call gb_Pyuno_get_final_target,$*) gb_Pyuno_get_packagename = Pyuno/$(1) @@ -34,12 +37,13 @@ gb_Pyuno_get_packagename = Pyuno/$(1) define gb_Pyuno_Pyuno $(call gb_Package_Package_internal,$(call gb_Pyuno_get_packagename,$(1)),$(2)) +$(call gb_Pyuno_get_final_target,$(1)) : $(call gb_Pyuno_get_target,$(1)) $(call gb_Pyuno_get_target,$(1)) : $(call gb_Package_get_target,$(call gb_Pyuno_get_packagename,$(1))) $(call gb_Pyuno_get_target,$(1)) :| $(dir $(call gb_Pyuno_get_target,$(1))).dir $(call gb_Pyuno_get_clean_target,$(1)) : $(call gb_Package_get_clean_target,$(call gb_Pyuno_get_packagename,$(1))) -$$(eval $$(call gb_Module_register_target,$(call gb_Pyuno_get_target,$(1)),$(call gb_Pyuno_get_clean_target,$(1)))) -$(call gb_Helper_make_userfriendly_targets,$(1),Pyuno) +$$(eval $$(call gb_Module_register_target,$(call gb_Pyuno_get_final_target,$(1)),$(call gb_Pyuno_get_clean_target,$(1)))) +$(call gb_Helper_make_userfriendly_targets,$(1),Pyuno,$(call gb_Pyuno_get_final_target,$(1))) endef @@ -59,7 +63,8 @@ gb_Pyuno__COMPONENTPREFIX := vnd.openoffice.pymodule: define gb_Pyuno_set_componentfile_full $(call gb_ComponentTarget_ComponentTarget,$(2),$(3),$(4)) -$(call gb_Pyuno_get_target,$(1)) : $(call gb_ComponentTarget_get_target,$(2)) +$(call gb_Pyuno_get_final_target,$(1)) : $(call gb_ComponentTarget_get_target,$(2)) +$(call gb_ComponentTarget_get_target,$(2)) : $(call gb_Pyuno_get_target,$(1)) $(call gb_Pyuno_get_clean_target,$(1)) : $(call gb_ComponentTarget_get_clean_target,$(2)) endef diff --git a/solenv/gbuild/TargetLocations.mk b/solenv/gbuild/TargetLocations.mk index 0157cd343dff..68b9e16d0273 100644 --- a/solenv/gbuild/TargetLocations.mk +++ b/solenv/gbuild/TargetLocations.mk @@ -133,6 +133,7 @@ gb_PrecompiledHeader_get_dep_target = $(WORKDIR)/Dep/PrecompiledHeader/$(gb_Prec gb_PrecompiledHeader_get_target = $(WORKDIR)/PrecompiledHeader/$(gb_PrecompiledHeader_DEBUGDIR)/$(1).hxx.gch gb_PrecompiledHeader_get_timestamp = $(WORKDIR)/PrecompiledHeader/$(gb_PrecompiledHeader_DEBUGDIR)/Timestamps/$(1) gb_PropertiesTranslateTarget_get_target = $(WORKDIR)/PropertiesTranslateTarget/$(1).properties +gb_Pyuno_get_final_target = $(WORKDIR)/Pyuno/$(1).final gb_Pyuno_get_target = $(WORKDIR)/Pyuno/$(1).done gb_Rdb_get_target = $(WORKDIR)/Rdb/$(1).rdb gb_Rdb_get_target_for_build = $(WORKDIR_FOR_BUILD)/Rdb/$(1).rdb |