Mercurial > jdk8-mips64-public / changeset
changeset
7021753: Add a build times report
Mon, 28 Feb 2011 10:56:10 +0100
- author
- ohrstrom
- date
- Mon, 28 Feb 2011 10:56:10 +0100
- changeset 313
- a1c8b847b753
- parent 311
- 0f62a65fb666
- child 315
- 258b21c7f4af
7021753: Add a build times report
Summary: Report the build times at end of a jdkroot build.
Reviewed-by: ohair
| Makefile | file | annotate | diff | comparison | revisions | |
| make/Defs-internal.gmk | file | annotate | diff | comparison | revisions | |
| make/corba-rules.gmk | file | annotate | diff | comparison | revisions | |
| make/deploy-rules.gmk | file | annotate | diff | comparison | revisions | |
| make/hotspot-rules.gmk | file | annotate | diff | comparison | revisions | |
| make/install-rules.gmk | file | annotate | diff | comparison | revisions | |
| make/jaxp-rules.gmk | file | annotate | diff | comparison | revisions | |
| make/jaxws-rules.gmk | file | annotate | diff | comparison | revisions | |
| make/jdk-rules.gmk | file | annotate | diff | comparison | revisions | |
| make/langtools-rules.gmk | file | annotate | diff | comparison | revisions | |
| make/sponsors-rules.gmk | file | annotate | diff | comparison | revisions |
1.1 --- a/Makefile Thu Feb 24 15:15:45 2011 -0800 1.2 +++ b/Makefile Mon Feb 28 10:56:10 2011 +0100 1.3 @@ -36,12 +36,6 @@ 1.4 JDK_MAKE_SHARED_DIR=$(JDK_TOPDIR)/make/common/shared 1.5 endif 1.6 1.7 -# For start and finish echo lines 1.8 -TITLE_TEXT = Control $(PLATFORM) $(ARCH) $(RELEASE) 1.9 -DATE_STAMP = `$(DATE) '+%y-%m-%d %H:%M'` 1.10 -START_ECHO = echo "$(TITLE_TEXT) $@ build started: $(DATE_STAMP)" 1.11 -FINISH_ECHO = echo "$(TITLE_TEXT) $@ build finished: $(DATE_STAMP)" 1.12 - 1.13 default: all 1.14 1.15 include $(JDK_MAKE_SHARED_DIR)/Defs-control.gmk 1.16 @@ -57,10 +51,6 @@ 1.17 include ./make/sponsors-rules.gmk 1.18 include ./make/deploy-rules.gmk 1.19 1.20 -# What "all" means 1.21 -all:: 1.22 - @$(START_ECHO) 1.23 - 1.24 all:: sanity 1.25 1.26 ifeq ($(SKIP_FASTDEBUG_BUILD), false) 1.27 @@ -73,40 +63,42 @@ 1.28 1.29 all:: all_product_build 1.30 1.31 -all:: 1.32 - @$(FINISH_ECHO) 1.33 +# Everything for a full product build 1.34 +ifeq ($(SKIP_PRODUCT_BUILD), false) 1.35 1.36 -# Everything for a full product build 1.37 -all_product_build:: 1.38 - @$(START_ECHO) 1.39 - 1.40 -ifeq ($(SKIP_PRODUCT_BUILD), false) 1.41 - 1.42 all_product_build:: product_build 1.43 1.44 ifeq ($(BUILD_INSTALL), true) 1.45 all_product_build:: $(INSTALL) 1.46 clobber:: install-clobber 1.47 endif 1.48 - 1.49 + 1.50 ifeq ($(BUILD_SPONSORS), true) 1.51 all_product_build:: $(SPONSORS) 1.52 clobber:: sponsors-clobber 1.53 endif 1.54 - 1.55 + 1.56 ifneq ($(SKIP_COMPARE_IMAGES), true) 1.57 all_product_build:: compare-image 1.58 endif 1.59 1.60 endif 1.61 1.62 -all_product_build:: 1.63 - @$(FINISH_ECHO) 1.64 +define StartTimer 1.65 + $(MKDIR) -p $(BUILDTIMESDIR) 1.66 + $(RM) $(BUILDTIMESDIR)/build_time_* 1.67 + $(call RecordStartTime,TOTAL) 1.68 +endef 1.69 + 1.70 +define StopTimer 1.71 + $(if $(REPORT_BUILD_TIMES),$(call RecordEndTime,TOTAL) && $(call ReportBuildTimes,$1),) 1.72 +endef 1.73 1.74 # Generic build of basic repo series 1.75 generic_build_repo_series:: 1.76 $(MKDIR) -p $(OUTPUTDIR) 1.77 $(MKDIR) -p $(OUTPUTDIR)/j2sdk-image 1.78 + @$(call StartTimer) 1.79 1.80 ifeq ($(BUILD_LANGTOOLS), true) 1.81 generic_build_repo_series:: langtools 1.82 @@ -143,6 +135,9 @@ 1.83 clobber:: deploy-clobber 1.84 endif 1.85 1.86 +generic_build_repo_series:: 1.87 + @$(call StopTimer,$(if $(DEBUG_NAME),$(DEBUG_NAME)_build,all_product_build)) 1.88 + 1.89 # The debug build, fastdebug or debug. Needs special handling. 1.90 # Note that debug builds do NOT do INSTALL steps, but must be done 1.91 # after the product build and before the INSTALL step of the product build. 1.92 @@ -167,28 +162,22 @@ 1.93 FRESH_DEBUG_BOOTDIR=$(ABS_BOOTDIR_OUTPUTDIR)/../$(PLATFORM)-$(ARCH)-$(DEBUG_NAME)/j2sdk-image 1.94 1.95 create_fresh_product_bootdir: FRC 1.96 - @$(START_ECHO) 1.97 $(MAKE) ALT_OUTPUTDIR=$(ABS_BOOTDIR_OUTPUTDIR) \ 1.98 GENERATE_DOCS=false \ 1.99 BOOT_CYCLE_SETTINGS= \ 1.100 build_product_image 1.101 - @$(FINISH_ECHO) 1.102 1.103 create_fresh_debug_bootdir: FRC 1.104 - @$(START_ECHO) 1.105 $(MAKE) ALT_OUTPUTDIR=$(ABS_BOOTDIR_OUTPUTDIR) \ 1.106 GENERATE_DOCS=false \ 1.107 BOOT_CYCLE_DEBUG_SETTINGS= \ 1.108 build_debug_image 1.109 - @$(FINISH_ECHO) 1.110 1.111 create_fresh_fastdebug_bootdir: FRC 1.112 - @$(START_ECHO) 1.113 $(MAKE) ALT_OUTPUTDIR=$(ABS_BOOTDIR_OUTPUTDIR) \ 1.114 GENERATE_DOCS=false \ 1.115 BOOT_CYCLE_DEBUG_SETTINGS= \ 1.116 build_fastdebug_image 1.117 - @$(FINISH_ECHO) 1.118 1.119 # Create boot image? 1.120 ifeq ($(SKIP_BOOT_CYCLE),false) 1.121 @@ -197,6 +186,8 @@ 1.122 endif 1.123 endif 1.124 1.125 + 1.126 + 1.127 ifeq ($(DO_BOOT_CYCLE),true) 1.128 1.129 # Create the bootdir to use in the build 1.130 @@ -221,27 +212,23 @@ 1.131 endif 1.132 1.133 build_product_image: 1.134 - @$(START_ECHO) 1.135 $(MAKE) \ 1.136 SKIP_FASTDEBUG_BUILD=true \ 1.137 SKIP_DEBUG_BUILD=true \ 1.138 $(BOOT_CYCLE_SETTINGS) \ 1.139 generic_build_repo_series 1.140 - @$(FINISH_ECHO) 1.141 1.142 # NOTE: On windows, do not use $(ABS_OUTPUTDIR)-$(DEBUG_NAME). 1.143 # Due to the use of short paths in $(ABS_OUTPUTDIR), this may 1.144 # not be the same location. 1.145 1.146 generic_debug_build: 1.147 - @$(START_ECHO) 1.148 $(MAKE) \ 1.149 ALT_OUTPUTDIR=$(ABS_OUTPUTDIR)/../$(PLATFORM)-$(ARCH)-$(DEBUG_NAME) \ 1.150 DEBUG_NAME=$(DEBUG_NAME) \ 1.151 GENERATE_DOCS=false \ 1.152 $(BOOT_CYCLE_DEBUG_SETTINGS) \ 1.153 generic_build_repo_series 1.154 - @$(FINISH_ECHO) 1.155 1.156 build_debug_image: 1.157 $(MAKE) DEBUG_NAME=debug generic_debug_build 1.158 @@ -254,7 +241,8 @@ 1.159 debug_build:: build_debug_image 1.160 fastdebug_build:: build_fastdebug_image 1.161 1.162 -clobber:: 1.163 +clobber:: REPORT_BUILD_TIMES= 1.164 +clobber:: 1.165 $(RM) -r $(OUTPUTDIR)/* 1.166 $(RM) -r $(OUTPUTDIR)/../$(PLATFORM)-$(ARCH)-debug/* 1.167 $(RM) -r $(OUTPUTDIR)/../$(PLATFORM)-$(ARCH)-fastdebug/*
2.1 --- a/make/Defs-internal.gmk Thu Feb 24 15:15:45 2011 -0800 2.2 +++ b/make/Defs-internal.gmk Mon Feb 28 10:56:10 2011 +0100 2.3 @@ -28,21 +28,63 @@ 2.4 # not contain rules. 2.5 # 2.6 2.7 -# Indicate that we are visiting a separate repo or component 2.8 +# The build times report is turned off by setting REPORT_BUILD_TIMES to nothing. 2.9 +# This is necessary for the target clobber/clean which will erase the 2.10 +# directories where the buildtimes are stored. 2.11 +REPORT_BUILD_TIMES=1 2.12 +# Store the build times in this directory. 2.13 +BUILDTIMESDIR=$(ABS_OUTPUTDIR)/tmp/buildtimes 2.14 + 2.15 +# Record starting time for build of a sub repository. 2.16 +define RecordStartTime 2.17 +$(MKDIR) -p $(BUILDTIMESDIR) 2.18 +$(DATE) '+%Y %m %d %H %M %S' | $(NAWK) '{ print $$1,$$2,$$3,$$4,$$5,$$6,($$4*3600+$$5*60+$$6) }' > $(BUILDTIMESDIR)/build_time_start_$1 2.19 +$(DATE) '+%Y-%m-%d %H:%M:%S' > $(BUILDTIMESDIR)/build_time_start_$1_human_readable 2.20 +endef 2.21 + 2.22 +# Indicate that we started to build a sub repository and record starting time. 2.23 define MakeStart 2.24 -$(PRINTF) "\n\n%s\n%s\n##### %-60.60s #####\n%s\n" \ 2.25 +$(call RecordStartTime,$1) 2.26 +$(PRINTF) "\n\n%s\n%s\n##### %-60.60s #####\n%s\n\n" \ 2.27 "########################################################################" \ 2.28 "########################################################################" \ 2.29 -"Entering $1 for target $2" \ 2.30 +"Entering $1 for target(s) $2" \ 2.31 "########################################################################" 2.32 endef 2.33 2.34 -define MakeFinish 2.35 -$(PRINTF) "%s\n##### %-60.60s #####\n%s\n%s\n\n" \ 2.36 +# Record ending time and calculate the difference and store it in a 2.37 +# easy to read format. Handles builds that cross midnight. Expects 2.38 +# that a build will never take 24 hours or more. 2.39 +define RecordEndTime 2.40 +$(DATE) '+%Y %m %d %H %M %S' | $(NAWK) '{ print $$1,$$2,$$3,$$4,$$5,$$6,($$4*3600+$$5*60+$$6) }' > $(BUILDTIMESDIR)/build_time_end_$1 2.41 +$(DATE) '+%Y-%m-%d %H:%M:%S' > $(BUILDTIMESDIR)/build_time_end_$1_human_readable 2.42 +$(ECHO) `$(CAT) $(BUILDTIMESDIR)/build_time_start_$1` `$(CAT) $(BUILDTIMESDIR)/build_time_end_$1` $1 | \ 2.43 + $(NAWK) '{ F=$$7; T=$$14; if (F > T) { T+=3600*24 }; D=T-F; H=int(D/3600); \ 2.44 + M=int((D-H*3600)/60); S=D-H*3600-M*60; printf("%02d:%02d:%02d %s\n",H,M,S,$$15); }' \ 2.45 + > $(BUILDTIMESDIR)/build_time_diff_$1 2.46 +endef 2.47 + 2.48 +# Indicate that we are done. 2.49 +# Record ending time and print out the total time it took to build. 2.50 +define MakeFinish 2.51 +$(if $(REPORT_BUILD_TIMES),$(call RecordEndTime,$1),) 2.52 +$(PRINTF) "%s\n##### %-60.60s #####\n%s\n##### %-60.60s #####\n%s\n\n" \ 2.53 "########################################################################" \ 2.54 -"Leaving $1 for target $2" \ 2.55 +"Leaving $1 for target(s) $2" \ 2.56 "########################################################################" \ 2.57 -"########################################################################" 2.58 +$(if $(REPORT_BUILD_TIMES),"Build time `$(CAT) $(BUILDTIMESDIR)/build_time_diff_$1` for target(s) $2","") \ 2.59 +"########################################################################" 2.60 +endef 2.61 + 2.62 +# Find all build_time_* files and print their contents in a list sorted 2.63 +# on the name of the sub repository. 2.64 +define ReportBuildTimes 2.65 +$(PRINTF) "-- Build times ----------\nTarget %s\nStart %s\nEnd %s\n%s\n%s\n-------------------------\n" \ 2.66 +$1 \ 2.67 +"`$(CAT) $(BUILDTIMESDIR)/build_time_start_TOTAL_human_readable`" \ 2.68 +"`$(CAT) $(BUILDTIMESDIR)/build_time_end_TOTAL_human_readable`" \ 2.69 +"`$(LS) $(BUILDTIMESDIR)/build_time_diff_* | $(GREP) -v _TOTAL | $(XARGS) $(CAT) | $(SORT) -k 2`" \ 2.70 +"`$(CAT) $(BUILDTIMESDIR)/build_time_diff_TOTAL`" 2.71 endef 2.72 2.73 ifdef OPENJDK
3.1 --- a/make/corba-rules.gmk Thu Feb 24 15:15:45 2011 -0800 3.2 +++ b/make/corba-rules.gmk Mon Feb 28 10:56:10 2011 +0100 3.3 @@ -40,17 +40,17 @@ 3.4 corba: corba-build 3.5 corba-build: 3.6 $(MKDIR) -p $(CORBA_OUTPUTDIR) 3.7 - @$(call MakeStart, corba, all) 3.8 + @$(call MakeStart,corba,all) 3.9 ($(CD) $(CORBA_TOPDIR)/make && \ 3.10 $(MAKE) $(CORBA_BUILD_ARGUMENTS) all) 3.11 - @$(call MakeFinish, corba, all) 3.12 + @$(call MakeFinish,corba,all) 3.13 3.14 corba-clobber:: 3.15 $(MKDIR) -p $(CORBA_OUTPUTDIR) 3.16 - @$(call MakeStart, corba, clobber) 3.17 + @$(call MakeStart,corba,clobber) 3.18 ($(CD) $(CORBA_TOPDIR)/make && \ 3.19 $(MAKE) $(CORBA_BUILD_ARGUMENTS) clobber) 3.20 - @$(call MakeFinish, corba, clobber) 3.21 + @$(call MakeFinish,corba,clobber) 3.22 3.23 .PHONY: corba corba-build corba-clobber 3.24
4.1 --- a/make/deploy-rules.gmk Thu Feb 24 15:15:45 2011 -0800 4.2 +++ b/make/deploy-rules.gmk Mon Feb 28 10:56:10 2011 +0100 4.3 @@ -116,18 +116,18 @@ 4.4 4.5 deploy-build: 4.6 ifeq ($(BUILD_DEPLOY), true) 4.7 - @$(call MakeStart, deploy, $(DEPLOY_BUILD_TARGETS)) 4.8 + @$(call MakeStart,deploy,$(DEPLOY_BUILD_TARGETS)) 4.9 ($(CD) $(DEPLOY_TOPDIR)/make && \ 4.10 $(MAKE) $(DEPLOY_BUILD_TARGETS) $(DEPLOY_BUILD_ARGUMENTS)) 4.11 - @$(call MakeFinish, deploy, $(DEPLOY_BUILD_TARGETS)) 4.12 + @$(call MakeFinish,deploy,$(DEPLOY_BUILD_TARGETS)) 4.13 endif 4.14 4.15 deploy-clobber:: 4.16 ifeq ($(BUILD_DEPLOY), true) 4.17 - @$(call MakeStart, deploy, clobber) 4.18 + @$(call MakeStart,deploy,clobber) 4.19 ($(CD) $(DEPLOY_TOPDIR)/make && \ 4.20 $(MAKE) clobber $(DEPLOY_BUILD_ARGUMENTS)) 4.21 - @$(call MakeFinish, deploy, clobber) 4.22 + @$(call MakeFinish,deploy,clobber) 4.23 endif 4.24 4.25 deploy-sanity::
5.1 --- a/make/hotspot-rules.gmk Thu Feb 24 15:15:45 2011 -0800 5.2 +++ b/make/hotspot-rules.gmk Mon Feb 28 10:56:10 2011 +0100 5.3 @@ -96,10 +96,10 @@ 5.4 hotspot-build:: 5.5 $(MKDIR) -p $(HOTSPOT_OUTPUTDIR) 5.6 $(MKDIR) -p $(HOTSPOT_EXPORT_PATH) 5.7 - @$(call MakeStart, hotspot, $(HOTSPOT_TARGET)) 5.8 + @$(call MakeStart,hotspot,$(HOTSPOT_TARGET)) 5.9 $(CD) $(HOTSPOT_TOPDIR)/make && \ 5.10 $(MAKE) $(HOTSPOT_BUILD_ARGUMENTS) $(HOTSPOT_TARGET) 5.11 - @$(call MakeFinish, hotspot, $(HOTSPOT_TARGET)) 5.12 + @$(call MakeFinish,hotspot,$(HOTSPOT_TARGET)) 5.13 5.14 ##################### 5.15 # .PHONY
6.1 --- a/make/install-rules.gmk Thu Feb 24 15:15:45 2011 -0800 6.2 +++ b/make/install-rules.gmk Mon Feb 28 10:56:10 2011 +0100 6.3 @@ -57,39 +57,39 @@ 6.4 6.5 install-build: 6.6 ifeq ($(BUILD_INSTALL), true) 6.7 - @$(call MakeStart, install, $(INSTALL_BUILD_TARGETS)) 6.8 + @$(call MakeStart,install,$(INSTALL_BUILD_TARGETS)) 6.9 ($(CD) $(INSTALL_TOPDIR)/make && \ 6.10 $(MAKE) $(INSTALL_BUILD_TARGETS) $(INSTALL_BUILD_ARGUMENTS)) 6.11 - @$(call MakeFinish, install, $(INSTALL_BUILD_TARGETS)) 6.12 + @$(call MakeFinish,install,$(INSTALL_BUILD_TARGETS)) 6.13 endif 6.14 6.15 update-patcher: 6.16 ifeq ($(BUILD_INSTALL), true) 6.17 if [ -r $(INSTALL_TOPDIR)/make/update/Makefile ]; then \ 6.18 - $(call MakeStart, install update, all); \ 6.19 + $(call MakeStart,install_update,all); \ 6.20 ( $(CD) $(INSTALL_TOPDIR)/make/update && \ 6.21 $(MAKE) all $(INSTALL_BUILD_ARGUMENTS) ); \ 6.22 - $(call MakeFinish, install, all); \ 6.23 + $(call MakeFinish,install_update,all); \ 6.24 fi 6.25 endif 6.26 6.27 update-patchgen: 6.28 ifeq ($(BUILD_INSTALL), true) 6.29 if [ -r $(INSTALL_TOPDIR)/make/update/Makefile ]; then \ 6.30 - $(call MakeStart, install update, patchgen); \ 6.31 + $(call MakeStart,install_update,patchgen); \ 6.32 ( $(CD) $(INSTALL_TOPDIR)/make/update && \ 6.33 $(MAKE) patchgen $(INSTALL_BUILD_ARGUMENTS) ); \ 6.34 - $(call MakeFinish, install, patchgen); \ 6.35 + $(call MakeFinish,install_update,patchgen); \ 6.36 fi 6.37 endif 6.38 6.39 installer: 6.40 ifeq ($(BUILD_INSTALL), true) 6.41 if [ -r $(INSTALL_TOPDIR)/make/installer/Makefile ]; then \ 6.42 - $(call MakeStart, install installer, all); \ 6.43 + $(call MakeStart,install_installer,all); \ 6.44 ( $(CD) $(INSTALL_TOPDIR)/make/installer && \ 6.45 $(MAKE) all $(INSTALL_BUILD_ARGUMENTS) ); \ 6.46 - $(call MakeFinish, install, all); \ 6.47 + $(call MakeFinish,install_installer,all); \ 6.48 fi 6.49 endif 6.50 6.51 @@ -99,10 +99,10 @@ 6.52 6.53 install-clobber: 6.54 ifeq ($(BUILD_INSTALL), true) 6.55 - @$(call MakeStart, install, clobber) 6.56 + @$(call MakeStart,install,clobber) 6.57 ($(CD) $(INSTALL_TOPDIR)/make && \ 6.58 $(MAKE) clobber $(INSTALL_BUILD_ARGUMENTS)) 6.59 - @$(call MakeFinish, install, clobber) 6.60 + @$(call MakeFinish,install,clobber) 6.61 endif 6.62 6.63 install-sanity::
7.1 --- a/make/jaxp-rules.gmk Thu Feb 24 15:15:45 2011 -0800 7.2 +++ b/make/jaxp-rules.gmk Mon Feb 28 10:56:10 2011 +0100 7.3 @@ -40,17 +40,17 @@ 7.4 jaxp: jaxp-build 7.5 jaxp-build: 7.6 $(MKDIR) -p $(JAXP_OUTPUTDIR) 7.7 - @$(call MakeStart, jaxp, all) 7.8 + @$(call MakeStart,jaxp,all) 7.9 ($(CD) $(JAXP_TOPDIR)/make && \ 7.10 $(MAKE) $(JAXP_BUILD_ARGUMENTS) all) 7.11 - @$(call MakeFinish, jaxp, all) 7.12 + @$(call MakeFinish,jaxp,all) 7.13 7.14 jaxp-clobber:: 7.15 $(MKDIR) -p $(JAXP_OUTPUTDIR) 7.16 - @$(call MakeStart, jaxp, clobber) 7.17 + @$(call MakeStart,jaxp,clobber) 7.18 ($(CD) $(JAXP_TOPDIR)/make && \ 7.19 $(MAKE) $(JAXP_BUILD_ARGUMENTS) clobber) 7.20 - @$(call MakeFinish, jaxp, clobber) 7.21 + @$(call MakeFinish,jaxp,clobber) 7.22 7.23 .PHONY: jaxp jaxp-build jaxp-clobber 7.24
8.1 --- a/make/jaxws-rules.gmk Thu Feb 24 15:15:45 2011 -0800 8.2 +++ b/make/jaxws-rules.gmk Mon Feb 28 10:56:10 2011 +0100 8.3 @@ -40,17 +40,17 @@ 8.4 jaxws: jaxws-build 8.5 jaxws-build: 8.6 $(MKDIR) -p $(JAXWS_OUTPUTDIR) 8.7 - @$(call MakeStart, jaxws, all) 8.8 + @$(call MakeStart,jaxws,all) 8.9 ($(CD) $(JAXWS_TOPDIR)/make && \ 8.10 $(MAKE) $(JAXWS_BUILD_ARGUMENTS) all) 8.11 - @$(call MakeFinish, jaxws, all) 8.12 + @$(call MakeFinish,jaxws,all) 8.13 8.14 jaxws-clobber:: 8.15 $(MKDIR) -p $(JAXWS_OUTPUTDIR) 8.16 - @$(call MakeStart, jaxws, clobber) 8.17 + @$(call MakeStart,jaxws,clobber) 8.18 ($(CD) $(JAXWS_TOPDIR)/make && \ 8.19 $(MAKE) $(JAXWS_BUILD_ARGUMENTS) clobber) 8.20 - @$(call MakeFinish, jaxws, clobber) 8.21 + @$(call MakeFinish,jaxws,clobber) 8.22 8.23 .PHONY: jaxws jaxws-build jaxws-clobber 8.24
9.1 --- a/make/jdk-rules.gmk Thu Feb 24 15:15:45 2011 -0800 9.2 +++ b/make/jdk-rules.gmk Mon Feb 28 10:56:10 2011 +0100 9.3 @@ -75,16 +75,16 @@ 9.4 9.5 jdk: jdk-build 9.6 jdk-build: 9.7 - @$(call MakeStart, jdk, $(JDK_BUILD_TARGETS)) 9.8 + @$(call MakeStart,jdk,$(JDK_BUILD_TARGETS)) 9.9 ( $(CD) $(JDK_TOPDIR)/make && \ 9.10 $(MAKE) $(JDK_BUILD_TARGETS) $(JDK_BUILD_ARGUMENTS) ; ) 9.11 - @$(call MakeFinish, jdk, $(JDK_BUILD_TARGETS)) 9.12 + @$(call MakeFinish,jdk,$(JDK_BUILD_TARGETS)) 9.13 9.14 jdk-clobber:: 9.15 - @$(call MakeStart, jdk, $(JDK_CLOBBER_TARGETS)) 9.16 + @$(call MakeStart,jdk,$(JDK_CLOBBER_TARGETS)) 9.17 ( $(CD) $(JDK_TOPDIR)/make && \ 9.18 $(MAKE) $(JDK_CLOBBER_TARGETS) $(JDK_BUILD_ARGUMENTS) ; ) 9.19 - @$(call MakeFinish, jdk, $(JDK_CLOBBER_TARGETS)) 9.20 + @$(call MakeFinish,jdk,$(JDK_CLOBBER_TARGETS)) 9.21 9.22 jdk-sanity:: 9.23 ( $(CD) $(JDK_TOPDIR)/make && \ 9.24 @@ -92,17 +92,17 @@ 9.25 9.26 compare-images: compare-image 9.27 compare-image: 9.28 - @$(call MakeStart, jdk, compare-image) 9.29 + @$(call MakeStart,jdk,compare-image) 9.30 ( $(CD) $(JDK_TOPDIR)/make && \ 9.31 $(MAKE) ALT_OUTPUTDIR=$(ABS_OUTPUTDIR) compare-image ) 9.32 - @$(call MakeFinish, jdk, compare-image) 9.33 + @$(call MakeFinish,jdk,compare-image) 9.34 9.35 compare-images-clobber: compare-image-clobber 9.36 compare-image-clobber: 9.37 - @$(call MakeStart, jdk, compare-image-clobber) 9.38 + @$(call MakeStart,jdk,compare-image-clobber) 9.39 ( $(CD) $(JDK_TOPDIR)/make && \ 9.40 $(MAKE) ALT_OUTPUTDIR=$(ABS_OUTPUTDIR) compare-image-clobber ) 9.41 - @$(call MakeFinish, jdk, compare-image-clobber) 9.42 + @$(call MakeFinish,jdk,compare-image-clobber) 9.43 9.44 .PHONY: jdk jdk-build jdk-clobber jdk-sanity 9.45
10.1 --- a/make/langtools-rules.gmk Thu Feb 24 15:15:45 2011 -0800 10.2 +++ b/make/langtools-rules.gmk Mon Feb 28 10:56:10 2011 +0100 10.3 @@ -35,17 +35,17 @@ 10.4 langtools: langtools-build 10.5 langtools-build: 10.6 $(MKDIR) -p $(LANGTOOLS_OUTPUTDIR) 10.7 - @$(call MakeStart, langtools, all) 10.8 + @$(call MakeStart,langtools,all) 10.9 ($(CD) $(LANGTOOLS_TOPDIR)/make && \ 10.10 $(MAKE) $(LANGTOOLS_BUILD_ARGUMENTS) all) 10.11 - @$(call MakeFinish, langtools, all) 10.12 + @$(call MakeFinish,langtools,all) 10.13 10.14 langtools-clobber:: 10.15 $(MKDIR) -p $(LANGTOOLS_OUTPUTDIR) 10.16 - @$(call MakeStart, langtools, clobber) 10.17 + @$(call MakeStart,langtools,clobber) 10.18 ($(CD) $(LANGTOOLS_TOPDIR)/make && \ 10.19 $(MAKE) $(LANGTOOLS_BUILD_ARGUMENTS) clobber) 10.20 - @$(call MakeFinish, langtools, clobber) 10.21 + @$(call MakeFinish,langtools,clobber) 10.22 10.23 .PHONY: langtools langtools-build langtools-clobber 10.24
11.1 --- a/make/sponsors-rules.gmk Thu Feb 24 15:15:45 2011 -0800 11.2 +++ b/make/sponsors-rules.gmk Mon Feb 28 10:56:10 2011 +0100 11.3 @@ -59,10 +59,10 @@ 11.4 sponsors-build: 11.5 ifeq ($(ARCH_DATA_MODEL), 32) 11.6 ifeq ($(BUILD_SPONSORS), true) 11.7 - @$(call MakeStart, sponsors, $(SPONSORS_BUILD_TARGETS)) 11.8 + @$(call MakeStart,sponsors,$(SPONSORS_BUILD_TARGETS)) 11.9 ($(CD) $(SPONSORS_TOPDIR)/make && \ 11.10 $(MAKE) $(SPONSORS_BUILD_TARGETS) $(SPONSORS_BUILD_ARGUMENTS)) 11.11 - @$(call MakeFinish, sponsors, $(SPONSORS_BUILD_TARGETS)) 11.12 + @$(call MakeFinish,sponsors,$(SPONSORS_BUILD_TARGETS)) 11.13 endif 11.14 endif 11.15
