Author: damjan Date: Tue Feb 23 04:48:45 2016 New Revision: 1731788 URL: http://svn.apache.org/viewvc?rev=1731788&view=rev Log: Merge r1409425 from branches/gbuild: #i117340#: CustomTarget: replace broken multi-repo support
BUILDS Modified: openoffice/branches/gbuild-reintegration/ (props changed) openoffice/branches/gbuild-reintegration/main/solenv/gbuild/CustomTarget.mk openoffice/branches/gbuild-reintegration/main/solenv/gbuild/Package.mk Propchange: openoffice/branches/gbuild-reintegration/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Tue Feb 23 04:48:45 2016 @@ -1,4 +1,4 @@ -/incubator/ooo/branches/gbuild:1409313-1409411,1409470 +/incubator/ooo/branches/gbuild:1409313-1409425,1409470 /openoffice/branches/AOO400:1503684 /openoffice/branches/AOO410:1572480,1573601,1583349,1583635,1583666 /openoffice/branches/alg_writerframes:1556289-1579189 Modified: openoffice/branches/gbuild-reintegration/main/solenv/gbuild/CustomTarget.mk URL: http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/solenv/gbuild/CustomTarget.mk?rev=1731788&r1=1731787&r2=1731788&view=diff ============================================================================== --- openoffice/branches/gbuild-reintegration/main/solenv/gbuild/CustomTarget.mk (original) +++ openoffice/branches/gbuild-reintegration/main/solenv/gbuild/CustomTarget.mk Tue Feb 23 04:48:45 2016 @@ -32,56 +32,44 @@ define gb_CustomTarget__command endef -define gb_CustomTarget__rules -$$(call gb_CustomTarget_get_repo_target,$(1),%) : - $$(call gb_Output_announce,$$*,$$(true),MAK,3) - $$(call gb_CustomTarget__command,$$@,$$*) - -$$(call gb_CustomTarget_get_target,%) : $$(call gb_CustomTarget_get_repo_target,$(1),%) - $$(call gb_Helper_abbreviate_dirs,\ - touch $$@) - -endef +$(call gb_CustomTarget_get_target,%) : + $(call gb_Output_announce,$*,$(true),MAK,3) + $(call gb_CustomTarget__command,$@,$*) .PHONY: $(call gb_CustomTarget_get_clean_target,%) $(call gb_CustomTarget_get_clean_target,%) : $(call gb_Output_announce,$*,$(false),MAK,3) $(call gb_Helper_abbreviate_dirs,\ rm -rf $(call gb_CustomTarget_get_workdir,$*) && \ - rm -f $(call gb_CustomTarget_get_target,$*) \ - $(foreach reponame,$(gb_CustomTarget_REPOSITORYNAMES),$(call gb_CustomTarget_get_repo_target,$(reponame),$*))) - - -$(foreach reponame,$(gb_CustomTarget_REPOSITORYNAMES),$(eval $(call gb_CustomTarget__rules,$(reponame)))) + rm -f $(call gb_CustomTarget_get_target,$*)) define gb_CustomTarget__get_makefile $(1)/$(2)/Makefile endef define gb_CustomTarget_CustomTarget -$(foreach reponame,$(gb_CustomTarget_REPOSITORYNAMES),\ - $(eval $(call gb_CustomTarget_get_repo_target,$(reponame),$(1)) : $(call gb_CustomTarget__get_makefile,$($(reponame)),$(1)))) - -$(call gb_CustomTarget_get_workdir,$(1))/% : $(call gb_CustomTarget_get_target,$(1)) - +$(if $(filter $(2),$(gb_CustomTarget_REPOSITORYNAMES)),,\ + $(error CustomTarget: no or invalid repository given; known repositories: \ + $(gb_JavaClassSet_REPOSITORYNAMES))) +gb_CustomTarget_REPO_$(1) := $(2) +$(call gb_CustomTarget_get_target,$(1)) : \ + $(call gb_CustomTarget__get_makefile,$($(2)),$(1)) +$(call gb_CustomTarget_get_workdir,$(1))/% : \ + $(call gb_CustomTarget_get_target,$(1)) endef define gb_CustomTarget_add_dependency -$(foreach reponame,$(gb_CustomTarget_REPOSITORYNAMES),\ - $(eval $(call gb_CustomTarget_get_repo_target,$(reponame),$(1)) : $($(reponame))/$(2))) - +$(eval $(call gb_CustomTarget_get_target,$(1)) : \ + $($(gb_CustomTarget_REPO_$(1)))/$(2)) endef define gb_CustomTarget_add_dependencies $(foreach dependency,$(2),$(call gb_CustomTarget_add_dependency,$(1),$(dependency))) - endef define gb_CustomTarget_add_outdir_dependency -$(foreach reponame,$(gb_CustomTarget_REPOSITORYNAMES),\ - $(eval $(call gb_CustomTarget_get_repo_target,$(reponame),$(1)) : $(2))) - +$(eval $(call gb_CustomTarget_get_target,$(1)) : $(2)) endef define gb_CustomTarget_add_outdir_dependencies Modified: openoffice/branches/gbuild-reintegration/main/solenv/gbuild/Package.mk URL: http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/solenv/gbuild/Package.mk?rev=1731788&r1=1731787&r2=1731788&view=diff ============================================================================== --- openoffice/branches/gbuild-reintegration/main/solenv/gbuild/Package.mk (original) +++ openoffice/branches/gbuild-reintegration/main/solenv/gbuild/Package.mk Tue Feb 23 04:48:45 2016 @@ -76,7 +76,7 @@ endef define gb_Package_add_customtarget $(call gb_Package_get_preparation_target,$(1)) : $(call gb_CustomTarget_get_target,$(2)) $(call gb_Package_get_clean_target,$(1)) : $(call gb_CustomTarget_get_clean_target,$(2)) -$(call gb_CustomTarget_CustomTarget,$(2)) +$(eval $(call gb_CustomTarget_CustomTarget,$(2),$(3))) endef