Mercurial > jdk8-mips64-public / changeset
changeset
6855174: Improve log output when builds transition from one workspace to another
Thu, 03 Sep 2009 17:44:28 -0700
- author
- ohair
- date
- Thu, 03 Sep 2009 17:44:28 -0700
- changeset 128
- e76b72562a98
- parent 123
- 4c36e9853dda
- child 129
- 931f7f7501da
6855174: Improve log output when builds transition from one workspace to another
Reviewed-by: jjg
1.1 --- a/make/Defs-internal.gmk Mon Aug 24 22:39:34 2009 -0700 1.2 +++ b/make/Defs-internal.gmk Thu Sep 03 17:44:28 2009 -0700 1.3 @@ -28,6 +28,23 @@ 1.4 # not contain rules. 1.5 # 1.6 1.7 +# Indicate that we are visiting a separate repo or component 1.8 +define MakeStart 1.9 +$(PRINTF) "\n\n%s\n%s\n##### %-60.60s #####\n%s\n" \ 1.10 +"########################################################################" \ 1.11 +"########################################################################" \ 1.12 +"Entering $1 for target $2" \ 1.13 +"########################################################################" 1.14 +endef 1.15 + 1.16 +define MakeFinish 1.17 +$(PRINTF) "%s\n##### %-60.60s #####\n%s\n%s\n\n" \ 1.18 +"########################################################################" \ 1.19 +"Leaving $1 for target $2" \ 1.20 +"########################################################################" \ 1.21 +"########################################################################" 1.22 +endef 1.23 + 1.24 ifdef OPENJDK 1.25 ifneq ($(OPENJDK),true) 1.26 x:=$(error "OPENJDK (if defined) can only be set to true")
2.1 --- a/make/corba-rules.gmk Mon Aug 24 22:39:34 2009 -0700 2.2 +++ b/make/corba-rules.gmk Thu Sep 03 17:44:28 2009 -0700 2.3 @@ -40,13 +40,17 @@ 2.4 corba: corba-build 2.5 corba-build: 2.6 $(MKDIR) -p $(CORBA_OUTPUTDIR) 2.7 + @$(call MakeStart, corba, all) 2.8 ($(CD) $(CORBA_TOPDIR)/make && \ 2.9 $(MAKE) $(CORBA_BUILD_ARGUMENTS) all) 2.10 + @$(call MakeFinish, corba, all) 2.11 2.12 corba-clobber:: 2.13 $(MKDIR) -p $(CORBA_OUTPUTDIR) 2.14 + @$(call MakeStart, corba, clobber) 2.15 ($(CD) $(CORBA_TOPDIR)/make && \ 2.16 $(MAKE) $(CORBA_BUILD_ARGUMENTS) clobber) 2.17 + @$(call MakeFinish, corba, clobber) 2.18 2.19 .PHONY: corba corba-build corba-clobber 2.20
3.1 --- a/make/deploy-rules.gmk Mon Aug 24 22:39:34 2009 -0700 3.2 +++ b/make/deploy-rules.gmk Thu Sep 03 17:44:28 2009 -0700 3.3 @@ -121,14 +121,18 @@ 3.4 3.5 deploy-build: 3.6 ifeq ($(BUILD_DEPLOY), true) 3.7 + @$(call MakeStart, deploy, $(DEPLOY_BUILD_TARGETS)) 3.8 ($(CD) $(DEPLOY_TOPDIR)/make && \ 3.9 - $(MAKE) $(DEPLOY_BUILD_TARGETS) $(DEPLOY_BUILD_ARGUMENTS)) 3.10 + $(MAKE) $(DEPLOY_BUILD_TARGETS) $(DEPLOY_BUILD_ARGUMENTS)) 3.11 + @$(call MakeFinish, deploy, $(DEPLOY_BUILD_TARGETS)) 3.12 endif 3.13 3.14 deploy-clobber:: 3.15 ifeq ($(BUILD_DEPLOY), true) 3.16 + @$(call MakeStart, deploy, clobber) 3.17 ($(CD) $(DEPLOY_TOPDIR)/make && \ 3.18 - $(MAKE) clobber $(DEPLOY_BUILD_ARGUMENTS)) 3.19 + $(MAKE) clobber $(DEPLOY_BUILD_ARGUMENTS)) 3.20 + @$(call MakeFinish, deploy, clobber) 3.21 endif 3.22 3.23 deploy-sanity::
4.1 --- a/make/hotspot-rules.gmk Mon Aug 24 22:39:34 2009 -0700 4.2 +++ b/make/hotspot-rules.gmk Thu Sep 03 17:44:28 2009 -0700 4.3 @@ -88,8 +88,10 @@ 4.4 hotspot-build:: 4.5 $(MKDIR) -p $(HOTSPOT_OUTPUTDIR) 4.6 $(MKDIR) -p $(HOTSPOT_EXPORT_PATH) 4.7 + @$(call MakeStart, hotspot, $(HOTSPOT_TARGET)) 4.8 $(CD) $(HOTSPOT_TOPDIR)/make && \ 4.9 $(MAKE) $(HOTSPOT_BUILD_ARGUMENTS) $(HOTSPOT_TARGET) 4.10 + @$(call MakeFinish, hotspot, $(HOTSPOT_TARGET)) 4.11 4.12 ##################### 4.13 # .PHONY
5.1 --- a/make/install-rules.gmk Mon Aug 24 22:39:34 2009 -0700 5.2 +++ b/make/install-rules.gmk Thu Sep 03 17:44:28 2009 -0700 5.3 @@ -57,38 +57,48 @@ 5.4 5.5 install-build: 5.6 ifeq ($(BUILD_INSTALL), true) 5.7 + @$(call MakeStart, install, $(INSTALL_BUILD_TARGETS)) 5.8 ($(CD) $(INSTALL_TOPDIR)/make && \ 5.9 $(MAKE) $(INSTALL_BUILD_TARGETS) $(INSTALL_BUILD_ARGUMENTS)) 5.10 + @$(call MakeFinish, install, $(INSTALL_BUILD_TARGETS)) 5.11 endif 5.12 5.13 update-patcher: 5.14 ifeq ($(BUILD_INSTALL), true) 5.15 if [ -r $(INSTALL_TOPDIR)/make/update/Makefile ]; then \ 5.16 + $(call MakeStart, install update, all); \ 5.17 ( $(CD) $(INSTALL_TOPDIR)/make/update && \ 5.18 $(MAKE) all $(INSTALL_BUILD_ARGUMENTS) ); \ 5.19 + $(call MakeFinish, install, all); \ 5.20 fi 5.21 endif 5.22 5.23 update-patchgen: 5.24 ifeq ($(BUILD_INSTALL), true) 5.25 if [ -r $(INSTALL_TOPDIR)/make/update/Makefile ]; then \ 5.26 + $(call MakeStart, install update, patchgen); \ 5.27 ( $(CD) $(INSTALL_TOPDIR)/make/update && \ 5.28 $(MAKE) patchgen $(INSTALL_BUILD_ARGUMENTS) ); \ 5.29 + $(call MakeFinish, install, patchgen); \ 5.30 fi 5.31 endif 5.32 5.33 installer: 5.34 ifeq ($(BUILD_INSTALL), true) 5.35 if [ -r $(INSTALL_TOPDIR)/make/installer/Makefile ]; then \ 5.36 + $(call MakeStart, install installer, all); \ 5.37 ( $(CD) $(INSTALL_TOPDIR)/make/installer && \ 5.38 $(MAKE) all $(INSTALL_BUILD_ARGUMENTS) ); \ 5.39 + $(call MakeFinish, install, all); \ 5.40 fi 5.41 endif 5.42 5.43 install-clobber: 5.44 ifeq ($(BUILD_INSTALL), true) 5.45 + @$(call MakeStart, install, clobber) 5.46 ($(CD) $(INSTALL_TOPDIR)/make && \ 5.47 $(MAKE) clobber $(INSTALL_BUILD_ARGUMENTS)) 5.48 + @$(call MakeFinish, install, clobber) 5.49 endif 5.50 5.51 install-sanity::
6.1 --- a/make/jaxp-rules.gmk Mon Aug 24 22:39:34 2009 -0700 6.2 +++ b/make/jaxp-rules.gmk Thu Sep 03 17:44:28 2009 -0700 6.3 @@ -40,13 +40,17 @@ 6.4 jaxp: jaxp-build 6.5 jaxp-build: 6.6 $(MKDIR) -p $(JAXP_OUTPUTDIR) 6.7 + @$(call MakeStart, jaxp, all) 6.8 ($(CD) $(JAXP_TOPDIR)/make && \ 6.9 $(MAKE) $(JAXP_BUILD_ARGUMENTS) all) 6.10 + @$(call MakeFinish, jaxp, all) 6.11 6.12 jaxp-clobber:: 6.13 $(MKDIR) -p $(JAXP_OUTPUTDIR) 6.14 + @$(call MakeStart, jaxp, clobber) 6.15 ($(CD) $(JAXP_TOPDIR)/make && \ 6.16 $(MAKE) $(JAXP_BUILD_ARGUMENTS) clobber) 6.17 + @$(call MakeFinish, jaxp, clobber) 6.18 6.19 .PHONY: jaxp jaxp-build jaxp-clobber 6.20
7.1 --- a/make/jaxws-rules.gmk Mon Aug 24 22:39:34 2009 -0700 7.2 +++ b/make/jaxws-rules.gmk Thu Sep 03 17:44:28 2009 -0700 7.3 @@ -40,13 +40,17 @@ 7.4 jaxws: jaxws-build 7.5 jaxws-build: 7.6 $(MKDIR) -p $(JAXWS_OUTPUTDIR) 7.7 + @$(call MakeStart, jaxws, all) 7.8 ($(CD) $(JAXWS_TOPDIR)/make && \ 7.9 $(MAKE) $(JAXWS_BUILD_ARGUMENTS) all) 7.10 + @$(call MakeFinish, jaxws, all) 7.11 7.12 jaxws-clobber:: 7.13 $(MKDIR) -p $(JAXWS_OUTPUTDIR) 7.14 + @$(call MakeStart, jaxws, clobber) 7.15 ($(CD) $(JAXWS_TOPDIR)/make && \ 7.16 $(MAKE) $(JAXWS_BUILD_ARGUMENTS) clobber) 7.17 + @$(call MakeFinish, jaxws, clobber) 7.18 7.19 .PHONY: jaxws jaxws-build jaxws-clobber 7.20
8.1 --- a/make/jdk-rules.gmk Mon Aug 24 22:39:34 2009 -0700 8.2 +++ b/make/jdk-rules.gmk Thu Sep 03 17:44:28 2009 -0700 8.3 @@ -98,12 +98,16 @@ 8.4 8.5 jdk: jdk-build 8.6 jdk-build: 8.7 + @$(call MakeStart, jdk, $(JDK_BUILD_TARGETS)) 8.8 ( $(CD) $(JDK_TOPDIR)/make && \ 8.9 $(MAKE) $(JDK_BUILD_TARGETS) $(JDK_BUILD_ARGUMENTS) ; ) 8.10 + @$(call MakeFinish, jdk, $(JDK_BUILD_TARGETS)) 8.11 8.12 jdk-clobber:: 8.13 + @$(call MakeStart, jdk, $(JDK_CLOBBER_TARGETS)) 8.14 ( $(CD) $(JDK_TOPDIR)/make && \ 8.15 $(MAKE) $(JDK_CLOBBER_TARGETS) $(JDK_BUILD_ARGUMENTS) ; ) 8.16 + @$(call MakeFinish, jdk, $(JDK_CLOBBER_TARGETS)) 8.17 8.18 jdk-sanity:: 8.19 ( $(CD) $(JDK_TOPDIR)/make && \ 8.20 @@ -111,13 +115,17 @@ 8.21 8.22 compare-images: compare-image 8.23 compare-image: 8.24 + @$(call MakeStart, jdk, compare-image) 8.25 ( $(CD) $(JDK_TOPDIR)/make && \ 8.26 $(MAKE) ALT_OUTPUTDIR=$(ABS_OUTPUTDIR) compare-image ) 8.27 + @$(call MakeFinish, jdk, compare-image) 8.28 8.29 compare-images-clobber: compare-image-clobber 8.30 compare-image-clobber: 8.31 + @$(call MakeStart, jdk, compare-image-clobber) 8.32 ( $(CD) $(JDK_TOPDIR)/make && \ 8.33 $(MAKE) ALT_OUTPUTDIR=$(ABS_OUTPUTDIR) compare-image-clobber ) 8.34 + @$(call MakeFinish, jdk, compare-image-clobber) 8.35 8.36 .PHONY: jdk jdk-build jdk-clobber jdk-sanity 8.37
9.1 --- a/make/langtools-rules.gmk Mon Aug 24 22:39:34 2009 -0700 9.2 +++ b/make/langtools-rules.gmk Thu Sep 03 17:44:28 2009 -0700 9.3 @@ -35,13 +35,17 @@ 9.4 langtools: langtools-build 9.5 langtools-build: 9.6 $(MKDIR) -p $(LANGTOOLS_OUTPUTDIR) 9.7 + @$(call MakeStart, langtools, all) 9.8 ($(CD) $(LANGTOOLS_TOPDIR)/make && \ 9.9 - $(MAKE) $(LANGTOOLS_BUILD_ARGUMENTS) all) 9.10 + $(MAKE) $(LANGTOOLS_BUILD_ARGUMENTS) all) 9.11 + @$(call MakeFinish, langtools, all) 9.12 9.13 langtools-clobber:: 9.14 $(MKDIR) -p $(LANGTOOLS_OUTPUTDIR) 9.15 + @$(call MakeStart, langtools, clobber) 9.16 ($(CD) $(LANGTOOLS_TOPDIR)/make && \ 9.17 - $(MAKE) $(LANGTOOLS_BUILD_ARGUMENTS) clobber) 9.18 + $(MAKE) $(LANGTOOLS_BUILD_ARGUMENTS) clobber) 9.19 + @$(call MakeFinish, langtools, clobber) 9.20 9.21 .PHONY: langtools langtools-build langtools-clobber 9.22
10.1 --- a/make/sponsors-rules.gmk Mon Aug 24 22:39:34 2009 -0700 10.2 +++ b/make/sponsors-rules.gmk Thu Sep 03 17:44:28 2009 -0700 10.3 @@ -59,8 +59,10 @@ 10.4 sponsors-build: 10.5 ifeq ($(ARCH_DATA_MODEL), 32) 10.6 ifeq ($(BUILD_SPONSORS), true) 10.7 + @$(call MakeStart, sponsors, $(SPONSORS_BUILD_TARGETS)) 10.8 ($(CD) $(SPONSORS_TOPDIR)/make && \ 10.9 - $(MAKE) $(SPONSORS_BUILD_TARGETS) $(SPONSORS_BUILD_ARGUMENTS)) 10.10 + $(MAKE) $(SPONSORS_BUILD_TARGETS) $(SPONSORS_BUILD_ARGUMENTS)) 10.11 + @$(call MakeFinish, sponsors, $(SPONSORS_BUILD_TARGETS)) 10.12 endif 10.13 endif 10.14
