Changeset 278 for trunk/openjdk/hotspot/make/jprt.properties

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)
• hotspot/make/jprt.properties (modified) (11 diffs)

trunk/openjdk

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

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

trunk/openjdk/hotspot/make/jprt.properties

@@ -1 +1 @@
 #
-# Copyright 2006-2009 Sun Microsystems, Inc.  All Rights Reserved.
+# Copyright (c) 2006, 2009, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
@@ -17 +17 @@
 # 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.
 #
 #
@@ -40 +40 @@
 
 #jprt.tools.default.release=${jprt.submit.release}
-jprt.tools.default.release=jdk6u18
-
+jprt.tools.default.release=jdk6perf
+
+# Disable syncing the source after builds and tests are done.
+
+jprt.sync.push=false
 
 # Define the Solaris platforms we want for the various releases
@@ -51 +54 @@
 jprt.my.solaris.sparc.jdk6u14=solaris_sparc_5.8
 jprt.my.solaris.sparc.jdk6u18=solaris_sparc_5.8
+jprt.my.solaris.sparc.jdk6u20=solaris_sparc_5.8
 jprt.my.solaris.sparc=${jprt.my.solaris.sparc.${jprt.tools.default.release}}
 
@@ -59 +63 @@
 jprt.my.solaris.sparcv9.jdk6u14=solaris_sparcv9_5.8
 jprt.my.solaris.sparcv9.jdk6u18=solaris_sparcv9_5.8
+jprt.my.solaris.sparcv9.jdk6u20=solaris_sparcv9_5.8
 jprt.my.solaris.sparcv9=${jprt.my.solaris.sparcv9.${jprt.tools.default.release}}
 
@@ -67 +72 @@
 jprt.my.solaris.i586.jdk6u14=solaris_i586_5.8
 jprt.my.solaris.i586.jdk6u18=solaris_i586_5.8
+jprt.my.solaris.i586.jdk6u20=solaris_i586_5.8
 jprt.my.solaris.i586=${jprt.my.solaris.i586.${jprt.tools.default.release}}
 
@@ -75 +81 @@
 jprt.my.solaris.x64.jdk6u14=solaris_x64_5.10
 jprt.my.solaris.x64.jdk6u18=solaris_x64_5.10
+jprt.my.solaris.x64.jdk6u20=solaris_x64_5.10
 jprt.my.solaris.x64=${jprt.my.solaris.x64.${jprt.tools.default.release}}
 
@@ -83 +90 @@
 jprt.my.linux.i586.jdk6u14=linux_i586_2.4
 jprt.my.linux.i586.jdk6u18=linux_i586_2.4
+jprt.my.linux.i586.jdk6u20=linux_i586_2.4
 jprt.my.linux.i586=${jprt.my.linux.i586.${jprt.tools.default.release}}
 
@@ -91 +99 @@
 jprt.my.linux.x64.jdk6u14=linux_x64_2.4
 jprt.my.linux.x64.jdk6u18=linux_x64_2.4
+jprt.my.linux.x64.jdk6u20=linux_x64_2.4
 jprt.my.linux.x64=${jprt.my.linux.x64.${jprt.tools.default.release}}
 
@@ -99 +108 @@
 jprt.my.windows.i586.jdk6u14=windows_i586_5.0
 jprt.my.windows.i586.jdk6u18=windows_i586_5.0
+jprt.my.windows.i586.jdk6u20=windows_i586_5.0
 jprt.my.windows.i586=${jprt.my.windows.i586.${jprt.tools.default.release}}
 
@@ -107 +117 @@
 jprt.my.windows.x64.jdk6u14=windows_x64_5.2
 jprt.my.windows.x64.jdk6u18=windows_x64_5.2
+jprt.my.windows.x64.jdk6u20=windows_x64_5.2
 jprt.my.windows.x64=${jprt.my.windows.x64.${jprt.tools.default.release}}
 

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