--- a/jdk/make/common/Release.gmk Tue Mar 08 14:26:17 2011 -0800
+++ b/jdk/make/common/Release.gmk Tue Mar 08 16:05:16 2011 -0800
@@ -1098,7 +1098,7 @@
# 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
--- a/jdk/make/common/shared/Defs-javadoc.gmk Tue Mar 08 14:26:17 2011 -0800
+++ b/jdk/make/common/shared/Defs-javadoc.gmk Tue Mar 08 16:05:16 2011 -0800
@@ -61,33 +61,11 @@
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 "<a href=\"%s\">Copyright</a>" "$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),<a href=\"$(strip $1)\">Copyright</a>,Copyright) \
+$(COPYRIGHT_SYMBOL) $(if $2,$2${COMMA},) $(COPYRIGHT_YEAR),\
+$(FULL_COMPANY_NAME). $3 All rights reserved.
endef
--- a/jdk/make/common/shared/Defs-utils.gmk Tue Mar 08 14:26:17 2011 -0800
+++ b/jdk/make/common/shared/Defs-utils.gmk Tue Mar 08 16:05:16 2011 -0800
@@ -115,7 +115,6 @@
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
@@ -135,6 +134,7 @@
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
--- a/jdk/make/common/shared/Sanity.gmk Tue Mar 08 14:26:17 2011 -0800
+++ b/jdk/make/common/shared/Sanity.gmk Tue Mar 08 16:05:16 2011 -0800
@@ -1012,11 +1012,6 @@
"" >> $(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 @@
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
--- a/jdk/make/docs/Makefile Tue Mar 08 14:26:17 2011 -0800
+++ b/jdk/make/docs/Makefile Tue Mar 08 16:05:16 2011 -0800
@@ -166,7 +166,7 @@
# Common bottom argument
define CommonBottom # year
-<font size=\"-1\"><p> $(call CopyrightLine,,$1,)</font>
+<font size=\"-1\"><br> $(call CopyrightLine,,$1,)</font>
endef
# Common trademark bottom argument (Not sure why this is used sometimes)
@@ -183,7 +183,7 @@
see <a href=\"$(DEV_DOCS_URL)\" target=\"_blank\">Java SE Documentation</a>. \
That documentation contains more detailed, developer-targeted descriptions, \
with conceptual overviews, definitions of terms, workarounds, \
-and working code examples.<p>\
+and working code examples.<br>\
$(call CopyrightLine,$(COPYRIGHT_URL),$(FIRST_COPYRIGHT_YEAR),)\
</font>