Author: arist
Date: Wed Nov 14 22:36:28 2012
New Revision: 1409486
URL: http://svn.apache.org/viewvc?rev=1409486&view=rev
Log:
gnumake4_005_7c93bbb7dc0c.patch
# HG changeset patch
# User mba
# Date 1298394172 -3600
# Node ID 7c93bbb7dc0cdc487c1ddb78857b78a535f907b2
# Parent 173b945e185031b730cd81640cb306726f9883b9
CWS gnumake4: dependencies of JavaClassSets to referenced jar files
Modified:
incubator/ooo/branches/gbuild/main/solenv/gbuild/JavaClassSet.mk
Modified: incubator/ooo/branches/gbuild/main/solenv/gbuild/JavaClassSet.mk
URL:
http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/solenv/gbuild/JavaClassSet.mk?rev=1409486&r1=1409485&r2=1409486&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/solenv/gbuild/JavaClassSet.mk (original)
+++ incubator/ooo/branches/gbuild/main/solenv/gbuild/JavaClassSet.mk Wed Nov 14
22:36:28 2012
@@ -27,14 +27,16 @@ gb_JavaClassSet_JAVACCOMMAND := $(JAVACO
define gb_JavaClassSet__command
$(call gb_Helper_abbreviate_dirs_native,\
mkdir -p $(dir $(1)) && \
- $(gb_JavaClassSet_JAVACCOMMAND) -cp "$(CLASSPATH)" -d $(call
gb_JavaClassSet_get_classdir,$(2)) $(3) && \
+ $(gb_JavaClassSet_JAVACCOMMAND) -cp "$(CLASSPATH)" -d $(call
gb_JavaClassSet_get_classdir,$(2)) $(if $(filter-out $(JARDEPS),$(3)),\
+ $(filter-out $(JARDEPS),$(3)),\
+ $(filter-out $(JARDEPS),$(4))) &&\
touch $(1))
endef
define gb_JavaClassSet__rules
$$(call gb_JavaClassSet_get_repo_target,$(1),%) :
- $$(call gb_JavaClassSet__command,$$@,$$*,$$?)
+ $$(call gb_JavaClassSet__command,$$@,$$*,$$?,$$^)
$$(call gb_JavaClassSet_get_target,%) : $$(call
gb_JavaClassSet_get_repo_target,$(1),%)
$$(call gb_Output_announce,$$*,$$(true),JCS,3)
@@ -52,6 +54,7 @@ $(foreach reponame,$(gb_JavaClassSet_REP
# no initialization of scoped variable CLASSPATH as it is "inherited" from
controlling instance (e.g. JUnitTest, Jar)
define gb_JavaClassSet_JavaClassSet
+$(call gb_JavaClassSet_get_target,$(1)) : JARDEPS :=
endef
define gb_JavaClassSet__get_sourcefile
@@ -75,7 +78,8 @@ endef
# build order dependency is a hack to get these prerequisites out of the way
in the build command
define gb_JavaClassSet_add_jar
$(foreach reponame,$(gb_JavaClassSet_REPOSITORYNAMES),\
- $(eval $(call gb_JavaClassSet_get_repo_target,$(reponame),$(1)) :|
$(2)))
+$(eval $(call gb_JavaClassSet_get_repo_target,$(reponame),$(1)) : $(2))
+$(eval $(call gb_JavaClassSet_get_repo_target,$(reponame),$(1)) : JARDEPS +=
$(2)))
endef
