From d8cd0e62385a930ebc5a583c0bc9f6438c9316c7 Mon Sep 17 00:00:00 2001 From: Kelly O'Hair Date: Sat, 26 Feb 2011 09:45:47 -0800 Subject: [PATCH 1/4] 7016175: HTML generated from new JavaDoc has tags added from makefile Reviewed-by: jjg --- jdk/make/common/shared/Defs-javadoc.gmk | 30 ++++--------------------- jdk/make/docs/Makefile | 4 ++-- 2 files changed, 6 insertions(+), 28 deletions(-) diff --git a/jdk/make/common/shared/Defs-javadoc.gmk b/jdk/make/common/shared/Defs-javadoc.gmk index a5ffe8e285e..a98542db061 100644 --- a/jdk/make/common/shared/Defs-javadoc.gmk +++ b/jdk/make/common/shared/Defs-javadoc.gmk @@ -61,33 +61,11 @@ COMMA:= , EMPTY:= SPACE:=$(EMPTY) $(EMPTY) COPYRIGHT_SYMBOL = &\#x00a9; -# Macros to handle the optional empty args. +# Macro to construct the copyright line # (The GNU make 3.78.1 "if" conditional is broken, fixed in GNU make 3.81) -define OptionalCopyrightUrl # url -$(shell \ - if [ "$1" != "" ] ; then \ - printf "Copyright" "$1"; \ - else \ - printf "Copyright"; \ - fi) -endef -define OptionalCopyrightFirstYear # year -$(shell \ - if [ "$1" != "" ] ; then \ - printf "%s," "$1";\ - fi) -endef -define OptionalCompanyAddress # address -$(shell \ - if [ "$1" != "" ] ; then \ - printf "%s" "$1";\ - fi) -endef define CopyrightLine # optionalurl optionalfirstyear optionaladdress -$(call OptionalCopyrightUrl,$1) $(COPYRIGHT_SYMBOL)\ -$(call OptionalCopyrightFirstYear,$2) $(COPYRIGHT_YEAR),\ -$(COMPANY_NAME).\ -$(call OptionalCompanyAddress,$3)\ -All rights reserved. +$(if $(strip $1),Copyright,Copyright) \ +$(COPYRIGHT_SYMBOL) $(if $2,$2${COMMA},) $(COPYRIGHT_YEAR),\ +$(FULL_COMPANY_NAME). $3 All rights reserved. endef diff --git a/jdk/make/docs/Makefile b/jdk/make/docs/Makefile index 98bf18b76da..0a2012f5a8e 100644 --- a/jdk/make/docs/Makefile +++ b/jdk/make/docs/Makefile @@ -166,7 +166,7 @@ JDKJRE2COREAPI = ../../api # Common bottom argument define CommonBottom # year -

$(call CopyrightLine,,$1,) +
$(call CopyrightLine,,$1,) endef # Common trademark bottom argument (Not sure why this is used sometimes) @@ -183,7 +183,7 @@ COREAPI_BOTTOM = $(BUG_SUBMIT_LINE)\ see Java SE Documentation. \ That documentation contains more detailed, developer-targeted descriptions, \ with conceptual overviews, definitions of terms, workarounds, \ -and working code examples.

\ +and working code examples.
\ $(call CopyrightLine,$(COPYRIGHT_URL),$(FIRST_COPYRIGHT_YEAR),)\ From 3c355ece1d97953c20e7116e75e5e092966edc14 Mon Sep 17 00:00:00 2001 From: Kelly O'Hair Date: Sat, 26 Feb 2011 12:11:32 -0800 Subject: [PATCH 2/4] 7022237: Fix use of \" in the new "release" file at the top of the install, windows issues Reviewed-by: ohrstrom --- jdk/make/common/Release.gmk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jdk/make/common/Release.gmk b/jdk/make/common/Release.gmk index 224dcd1650b..409a772a574 100644 --- a/jdk/make/common/Release.gmk +++ b/jdk/make/common/Release.gmk @@ -1100,7 +1100,7 @@ JRE_INFO_FILE = $(JRE_IMAGE_DIR)/release # Common way to emit a line into the release or info file define info-file-item # name value -$(PRINTF) "%s=\"%s\"\n" $1 $2 >> $@ +$(PRINTF) '%s="%s"\n' $1 $2 >> $@ endef # Values to emit From f6f0e6bad2f8dd0568f095361cbe19ef41b5190a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fredrik=20=C3=96hrstr=C3=B6m?= Date: Mon, 28 Feb 2011 10:56:20 +0100 Subject: [PATCH 3/4] 7021753: Add a build times report Report the build times at end of a jdkroot build. Reviewed-by: ohair --- jdk/make/common/shared/Defs-utils.gmk | 1 + 1 file changed, 1 insertion(+) diff --git a/jdk/make/common/shared/Defs-utils.gmk b/jdk/make/common/shared/Defs-utils.gmk index bb6aa493cf5..cb93efc3354 100644 --- a/jdk/make/common/shared/Defs-utils.gmk +++ b/jdk/make/common/shared/Defs-utils.gmk @@ -135,6 +135,7 @@ UNAME = $(UTILS_COMMAND_PATH)uname UNIQ = $(UTILS_USR_BIN_PATH)uniq UNZIP = $(UTILS_USR_BIN_PATH)unzip UNZIPSFX = $(UTILS_DEVTOOL_PATH)unzipsfx +XARGS = $(UTILS_USR_BIN_PATH)xargs WC = $(UTILS_USR_BIN_PATH)wc WHICH = $(UTILS_USR_BIN_PATH)which YACC = $(UTILS_CCS_BIN_PATH)yacc From 6f914794d260b91445e4d1cdaa263723e77ee2e5 Mon Sep 17 00:00:00 2001 From: Kelly O'Hair Date: Wed, 2 Mar 2011 13:18:36 -0800 Subject: [PATCH 4/4] 7020815: REBASE should not be required for windows jdk repo builds - can't build with VS 2010 Express Reviewed-by: prr --- jdk/make/common/shared/Defs-utils.gmk | 1 - jdk/make/common/shared/Sanity.gmk | 7 +------ 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/jdk/make/common/shared/Defs-utils.gmk b/jdk/make/common/shared/Defs-utils.gmk index cb93efc3354..8672936bae1 100644 --- a/jdk/make/common/shared/Defs-utils.gmk +++ b/jdk/make/common/shared/Defs-utils.gmk @@ -115,7 +115,6 @@ NM = $(UTILS_CCS_BIN_PATH)nm PKGMK = $(UTILS_COMMAND_PATH)pkgmk PRINTF = $(UTILS_USR_BIN_PATH)printf PWD = $(UTILS_COMMAND_PATH)pwd -RC = $(UTILS_COMMAND_PATH)rc READELF = $(UTILS_USR_BIN_PATH)readelf RMDIR = $(UTILS_COMMAND_PATH)rmdir RPM = $(UTILS_COMMAND_PATH)rpm diff --git a/jdk/make/common/shared/Sanity.gmk b/jdk/make/common/shared/Sanity.gmk index 6883d9ce7ec..b2aaaec7df2 100644 --- a/jdk/make/common/shared/Sanity.gmk +++ b/jdk/make/common/shared/Sanity.gmk @@ -1012,11 +1012,6 @@ ifeq ($(PLATFORM), windows) "" >> $(ERROR_FILE) ; \ fi else - ifeq ($(wildcard $(REBASE)),) - @$(ECHO) "ERROR: Cannot find the REBASE utility from path: $(REBASE)\n" \ - " This is normally obtained from the WINDOWSSDKDIR." \ - "" >> $(ERROR_FILE) - endif ifeq ($(wildcard $(RC)),) @$(ECHO) "ERROR: Cannot find the RC utility from path: $(RC)\n" \ " This is normally obtained from the WINDOWSSDKDIR." \ @@ -1024,7 +1019,7 @@ ifeq ($(PLATFORM), windows) endif ifeq ($(wildcard $(DUMPBIN)),) @$(ECHO) "ERROR: Cannot find the DUMPBIN utility from path: $(DUMPBIN)\n" \ - " This is normally obtained from the WINDOWSSDKDIR." \ + " This is normally obtained from the COMPILER_PATH." \ "" >> $(ERROR_FILE) endif endif