diff options
author | ohair <none@none> | 2010-05-28 11:09:24 -0700 |
---|---|---|
committer | ohair <none@none> | 2010-05-28 11:09:24 -0700 |
commit | 4d88305e7629ede116728def51518788b319edd0 (patch) | |
tree | 83086050176ae081e2e200c71667fb9a81858e5b | |
parent | b210c661bedde420746682a9b23352eb27bb6474 (diff) |
6955707: Correct addNotices.sh logic in Makefiles
6949590: exes(java.exe, javaws.exe) show Copyright Year as 2004, COMPANY as Sun
Reviewed-by: weijun, alanb
-rw-r--r-- | make/common/Release.gmk | 4 | ||||
-rw-r--r-- | make/common/shared/Defs.gmk | 2 | ||||
-rw-r--r-- | make/java/nio/Makefile | 12 | ||||
-rw-r--r-- | make/java/nio/addNotices.sh | 6 | ||||
-rw-r--r-- | make/java/nio/genCharsetProvider.sh | 2 | ||||
-rw-r--r-- | make/tools/manifest.mf | 4 | ||||
-rw-r--r-- | src/share/classes/java/nio/channels/exceptions | 2 | ||||
-rw-r--r-- | src/share/classes/java/nio/charset/exceptions | 2 | ||||
-rw-r--r-- | src/share/classes/java/nio/exceptions | 2 | ||||
-rw-r--r-- | src/share/classes/sun/nio/cs/standard-charsets | 2 |
10 files changed, 20 insertions, 18 deletions
diff --git a/make/common/Release.gmk b/make/common/Release.gmk index 391ce2d09..b6eada2a8 100644 --- a/make/common/Release.gmk +++ b/make/common/Release.gmk @@ -648,7 +648,9 @@ $(RT_JAR_FILELIST) + $(RES_JAR_FILELIST): \ JAR_MANIFEST_FILE=$(ABS_TEMPDIR)/manifest.tmp $(JAR_MANIFEST_FILE): $(MAINMANIFEST) $(BEANMANIFEST) $(prep-target) - $(SED) -e "s/@@RELEASE@@/$(RELEASE)/" $(MAINMANIFEST) >> $@ + $(SED) -e "s#@@RELEASE@@#$(RELEASE)#" \ + -e "s#@@COMPANY_NAME@@#$(COMPANY_NAME)#" \ + $(MAINMANIFEST) >> $@ $(ECHO) >> $@ $(CAT) $(BEANMANIFEST) >> $@ diff --git a/make/common/shared/Defs.gmk b/make/common/shared/Defs.gmk index 19e05151a..3ccab9019 100644 --- a/make/common/shared/Defs.gmk +++ b/make/common/shared/Defs.gmk @@ -214,7 +214,7 @@ else PRODUCT_NAME = Java(TM) PRODUCT_SUFFIX = SE Runtime Environment JDK_RC_PLATFORM_NAME = Platform SE - COMPANY_NAME = Sun Microsystems, Inc. + COMPANY_NAME = Oracle endif RUNTIME_NAME = $(PRODUCT_NAME) $(PRODUCT_SUFFIX) diff --git a/make/java/nio/Makefile b/make/java/nio/Makefile index 85dcb4f0c..b5c931ac6 100644 --- a/make/java/nio/Makefile +++ b/make/java/nio/Makefile @@ -818,7 +818,7 @@ GENSOR_SRC = $(SHARE_SRC)/native/sun/nio/ch/genSocketOptionRegistry.c GENSOR_EXE = $(TEMPDIR)/genSocketOptionRegistry$(EXE_SUFFIX) SOR_COPYRIGHT_YEARS = $(shell $(CAT) $(GENSOR_SRC) | \ - $(NAWK) '/^.*Copyright.*Sun/ { print $$3 }') + $(NAWK) '/^.*Copyright.*Oracle/ { printf "%s %s",$$4,$$5 }') $(TEMPDIR)/$(GENSOR_SRC) : $(GENSOR_SRC) $(install-non-module-file) @@ -830,7 +830,7 @@ $(GENSOR_EXE) : $(TEMPDIR)/$(GENSOR_SRC) $(SCH_GEN)/SocketOptionRegistry.java: $(GENSOR_EXE) $(prep-target) - NAWK="$(NAWK)" SH="$(SH)" $(SH) -e addNotices.sh $(SOR_COPYRIGHT_YEARS) > $@ + NAWK="$(NAWK)" SH="$(SH)" $(SH) -e addNotices.sh "$(SOR_COPYRIGHT_YEARS)" > $@ $(GENSOR_EXE) >> $@ # @@ -852,7 +852,7 @@ GENUC_SRC = $(PLATFORM_SRC)/native/sun/nio/fs/genUnixConstants.c GENUC_EXE = $(TEMPDIR)/genUnixConstants GENUC_COPYRIGHT_YEARS = $(shell $(CAT) $(GENUC_SRC) | \ - $(NAWK) '/^.*Copyright.*Sun/ { print $$3 }') + $(NAWK) '/^.*Copyright.*Oracle/ { printf "%s %s",$$4,$$5 }') $(GENUC_EXE) : $(GENUC_SRC) $(prep-target) @@ -860,7 +860,7 @@ $(GENUC_EXE) : $(GENUC_SRC) $(SFS_GEN)/UnixConstants.java: $(GENUC_EXE) $(prep-target) - NAWK="$(NAWK)" SH="$(SH)" $(SH) -e addNotices.sh $(GENUC_COPYRIGHT_YEARS) > $@ + NAWK="$(NAWK)" SH="$(SH)" $(SH) -e addNotices.sh "$(GENUC_COPYRIGHT_YEARS)" > $@ $(GENUC_EXE) >> $@ GENSC_SRC = $(PLATFORM_SRC)/native/sun/nio/fs/genSolarisConstants.c @@ -868,7 +868,7 @@ GENSC_SRC = $(PLATFORM_SRC)/native/sun/nio/fs/genSolarisConstants.c GENSC_EXE = $(TEMPDIR)/genSolarisConstants GENSC_COPYRIGHT_YEARS = $(shell $(CAT) $(GENSC_SRC) | \ - $(NAWK) '/^.*Copyright.*Sun/ { print $$3 }') + $(NAWK) '/^.*Copyright.*Oracle/ { printf "%s %s",$$4,$$5 }') $(GENSC_EXE) : $(GENSC_SRC) $(prep-target) @@ -876,7 +876,7 @@ $(GENSC_EXE) : $(GENSC_SRC) $(SFS_GEN)/SolarisConstants.java: $(GENSC_EXE) $(prep-target) - NAWK="$(NAWK)" SH="$(SH)" $(SH) -e addNotices.sh $(GENSC_COPYRIGHT_YEARS) > $@ + NAWK="$(NAWK)" SH="$(SH)" $(SH) -e addNotices.sh "$(GENSC_COPYRIGHT_YEARS)" > $@ $(GENSC_EXE) >> $@ .PHONY: sources diff --git a/make/java/nio/addNotices.sh b/make/java/nio/addNotices.sh index d44e17486..4bb1ace71 100644 --- a/make/java/nio/addNotices.sh +++ b/make/java/nio/addNotices.sh @@ -28,7 +28,7 @@ # a java comment block. If this script is invoked with a copyright # year/year range, the java comment block will contain a Sun copyright. -COPYRIGHT_YEARS=$1 +COPYRIGHT_YEARS="$1" cat <<__END__ /* @@ -36,10 +36,10 @@ __END__ if [ "x$COPYRIGHT_YEARS" != x ]; then cat <<__END__ - * Copyright $COPYRIGHT_YEARS Sun Microsystems, Inc. All Rights Reserved. + * Copyright (c) $COPYRIGHT_YEARS Oracle and/or its affiliates. All rights reserved. __END__ fi -$NAWK ' /^#.*Copyright.*Sun/ { next } +$NAWK ' /^#.*Copyright.*Oracle/ { next } /^#([^!]|$)/ { sub(/^#/, " *"); print } /^$/ { print " */"; exit } ' $0 diff --git a/make/java/nio/genCharsetProvider.sh b/make/java/nio/genCharsetProvider.sh index 14fdb5aa3..1b0fe1aac 100644 --- a/make/java/nio/genCharsetProvider.sh +++ b/make/java/nio/genCharsetProvider.sh @@ -36,7 +36,7 @@ SPEC=$1; shift DST=$1; shift eval `$NAWK <$SPEC ' - /^[ \t]*copyright / { printf "COPYRIGHT_YEARS=%s\n", $2; } + /^[ \t]*copyright / { printf "COPYRIGHT_YEARS=\"%s %s\"\n", $2, $3; } /^[ \t]*package / { printf "PKG=%s\n", $2; } /^[ \t]*class / { printf "CLASS=%s\n", $2; } '` diff --git a/make/tools/manifest.mf b/make/tools/manifest.mf index 4f008cd9e..3b3b37efe 100644 --- a/make/tools/manifest.mf +++ b/make/tools/manifest.mf @@ -1,7 +1,7 @@ Manifest-Version: 1.0 Specification-Title: Java Platform API Specification Specification-Version: 1.6 -Specification-Vendor: Sun Microsystems, Inc. +Specification-Vendor: Oracle Implementation-Title: Java Runtime Environment Implementation-Version: @@RELEASE@@ -Implementation-Vendor: Sun Microsystems, Inc. +Implementation-Vendor: @@COMPANY_NAME@@ diff --git a/src/share/classes/java/nio/channels/exceptions b/src/share/classes/java/nio/channels/exceptions index 89cdc99ba..3f75fb3fc 100644 --- a/src/share/classes/java/nio/channels/exceptions +++ b/src/share/classes/java/nio/channels/exceptions @@ -28,7 +28,7 @@ SINCE=1.4 PACKAGE=java.nio.channels # This year should only change if the generated source is modified. -COPYRIGHT_YEARS=2000-2007 +COPYRIGHT_YEARS="2000, 2007," SUPER=java.io.IOException diff --git a/src/share/classes/java/nio/charset/exceptions b/src/share/classes/java/nio/charset/exceptions index d914193d9..22dfa3ca6 100644 --- a/src/share/classes/java/nio/charset/exceptions +++ b/src/share/classes/java/nio/charset/exceptions @@ -28,7 +28,7 @@ SINCE=1.4 PACKAGE=java.nio.charset # This year should only change if the generated source is modified. -COPYRIGHT_YEARS=2000-2007 +COPYRIGHT_YEARS="2000, 2007," SUPER=java.io.IOException diff --git a/src/share/classes/java/nio/exceptions b/src/share/classes/java/nio/exceptions index 8cb915a24..062ccc4e4 100644 --- a/src/share/classes/java/nio/exceptions +++ b/src/share/classes/java/nio/exceptions @@ -28,7 +28,7 @@ SINCE=1.4 PACKAGE=java.nio # This year should only change if the generated source is modified. -COPYRIGHT_YEARS=2000-2007 +COPYRIGHT_YEARS="2000, 2007," SUPER=RuntimeException diff --git a/src/share/classes/sun/nio/cs/standard-charsets b/src/share/classes/sun/nio/cs/standard-charsets index 519ddcf83..06120fee8 100644 --- a/src/share/classes/sun/nio/cs/standard-charsets +++ b/src/share/classes/sun/nio/cs/standard-charsets @@ -35,7 +35,7 @@ # which is lazy initialized. # This year should only change if the generated source is modified. -copyright 2000 +copyright 2000, 2007, package sun.nio.cs class StandardCharsets |