openoffice-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ar...@apache.org
Subject svn commit: r1409425 - in /incubator/ooo/branches/gbuild/main/solenv/gbuild: CustomTarget.mk Package.mk
Date Wed, 14 Nov 2012 21:33:45 GMT
Author: arist
Date: Wed Nov 14 21:33:44 2012
New Revision: 1409425

URL: http://svn.apache.org/viewvc?rev=1409425&view=rev
Log:
writerfilter10_01_a639061a46c8.patch
# HG changeset patch
# User Michael Stahl <mst@openoffice.org>
# Date 1301994318 0
# Node ID a639061a46c82826c1f79f4bc20b071933221b8b
# Parent  1bdfec44e7ce902365aa7d9cb632f0adeb86262e
gnumake4: #i117340#: CustomTarget: replace broken multi-repo support


Modified:
    incubator/ooo/branches/gbuild/main/solenv/gbuild/CustomTarget.mk
    incubator/ooo/branches/gbuild/main/solenv/gbuild/Package.mk

Modified: incubator/ooo/branches/gbuild/main/solenv/gbuild/CustomTarget.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/solenv/gbuild/CustomTarget.mk?rev=1409425&r1=1409424&r2=1409425&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/solenv/gbuild/CustomTarget.mk (original)
+++ incubator/ooo/branches/gbuild/main/solenv/gbuild/CustomTarget.mk Wed Nov 14 21:33:44 2012
@@ -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: incubator/ooo/branches/gbuild/main/solenv/gbuild/Package.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/solenv/gbuild/Package.mk?rev=1409425&r1=1409424&r2=1409425&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/solenv/gbuild/Package.mk (original)
+++ incubator/ooo/branches/gbuild/main/solenv/gbuild/Package.mk Wed Nov 14 21:33:44 2012
@@ -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
 



Mime
View raw message