Changeset 278 for trunk/openjdk/jdk/make/common/Release.gmk

Timestamp:

Mar 26, 2011, 8:39:20 PM (14 years ago)

Author:

dmik

Message:

trunk: Merged in openjdk6 b22 from branches/vendor/oracle.

Location:

trunk/openjdk

Files:

• . (modified) (2 props)
• jdk/make/common/Release.gmk (modified) (6 diffs)

trunk/openjdk

@@ -1 +1 @@
 build
+build-product-release

@@ -1 +1 @@
 build
+build-product-release

trunk/openjdk/jdk/make/common/Release.gmk

@@ -1 +1 @@
 #
-# Copyright 1997-2007 Sun Microsystems, Inc.  All Rights Reserved.
+# Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation.  Sun designates this
+# published by the Free Software Foundation.  Oracle designates this
 # particular file as subject to the "Classpath" exception as provided
-# by Sun in the LICENSE file that accompanied this code.
+# by Oracle in the LICENSE file that accompanied this code.
 #
 # This code is distributed in the hope that it will be useful, but WITHOUT
@@ -19 +19 @@
 # Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
 #
-# Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
-# CA 95054 USA or visit www.sun.com if you need additional information or
-# have any questions.
+# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+# or visit www.oracle.com if you need additional information or have any
+# questions.
 #
 
@@ -241 +241 @@
         @$(ECHO) ">>>Making "$@" @ `$(DATE)` ..."
 
-#
-# Export binary plugs if not building OPENJDK
-#
-ifdef OPENJDK
-  EXPORT_BINARY_PLUGS =
-else # !OPENJDK
-  EXPORT_BINARY_PLUGS = export-binary-plugs test-binary-plugs
-endif # OPENJDK
-
 # Order is important here, trim jre after jdk image is created
 images:: sanity-images post-sanity-images  \
-         $(EXPORT_BINARY_PLUGS) \
          $(INITIAL_IMAGE_JRE) $(INITIAL_IMAGE_JDK) \
          trim-image-jre trim-image-jdk \
@@ -548 +538 @@
 ######################################################
 # List of directories in classes directory that should NOT be in rt.jar
+#   sun/nio/cs/ext/ will go into charsets.jar
 ######################################################
 
@@ -570 +561 @@
         $(ECHO) "com/sun/tools/" >> $@
         $(ECHO) "sun/jvmstat/" >> $@
+        $(ECHO) "sun/nio/cs/ext/" >> $@
         $(ECHO) "sun/rmi/rmic/" >> $@
         $(ECHO) "sun/tools/asm/" >> $@
@@ -652 +644 @@
 $(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) >> $@

@@ -1 +1 @@
 build
+build-product-release