Changeset 278 for trunk/openjdk/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)
• make/jprt.properties (modified) (4 diffs)

trunk/openjdk

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

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

trunk/openjdk/make/jprt.properties

@@ -1 +1 @@
 #
-# Copyright 2006-2009 Sun Microsystems, Inc.  All Rights Reserved.
+# Copyright (c) 2006, 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.
 #
 
@@ -27 +27 @@
 jprt.tools.default.release=openjdk6
 
-# Specific platform list
+# Specific platform list (For now, Solaris 10 sparc, Solaris 10 x86)
 jprt.build.platforms=\
-solaris_sparc_5.8,\
-solaris_sparcv9_5.8,\
-solaris_i586_5.8,\
+solaris_sparc_5.10,\
+solaris_sparcv9_5.10,\
+solaris_i586_5.10,\
 solaris_x64_5.10,\
 linux_i586_2.6,\
@@ -40 +40 @@
 # The different build flavors we want
 jprt.build.flavors=product,fastdebug
+jprt.run.flavors=c1,c2
+jprt.solaris_sparcv9.run.flavors=c2
+jprt.solaris_x64.run.flavors=c2
+jprt.windows_x64.run.flavors=c2
+jprt.linux_x64.run.flavors=c2
+jprt.run.flavor.c1.option=-client
+jprt.run.flavor.c2.option=-server
 
-# Explicitly designate what the 32bit match is for the 64bit build
-jprt.solaris_sparcv9.build.platform.match32=solaris_sparc_5.8
-jprt.solaris_sparcv9_5.8.build.platform.match32=solaris_sparc_5.8
-jprt.solaris_sparcv9_5.10.build.platform.match32=solaris_sparc_5.8
-jprt.solaris_x64.build.platform.match32=solaris_i586_5.8
-jprt.solaris_x64_5.8.build.platform.match32=solaris_i586_5.8
-jprt.solaris_x64_5.10.build.platform.match32=solaris_i586_5.8
+# Shortened list of vm tests
+jprt.test.targets=              \
+  *-product-*-jvm98,            \
+  *-product-*-scimark,          \
+  *-product-*-runThese,         \
+  *-product-*-GCBasher_default, \
+  *-product-*-GCOld_default,    \
+  *-product-*-jbb_default
 
-# Standard list of jprt test targets for this workspace
-jprt.test.targets=*-*-*-jvm98
+# Test targets in test/Makefile
+#   Not ready yet:   *-product-*-langtools_jtreg
+jprt.make.rule.test.targets=   \
+  *-product-*-jdk_beans1,      \
+  *-product-*-jdk_beans2,      \
+  *-product-*-jdk_beans3,      \
+  *-product-*-jdk_io,          \
+  *-product-*-jdk_lang,        \
+  *-product-*-jdk_management1, \
+  *-product-*-jdk_management2, \
+  *-product-*-jdk_math,        \
+  *-product-*-jdk_misc,        \
+  *-product-*-jdk_net,         \
+  *-product-*-jdk_nio,         \
+  *-product-*-jdk_security1,   \
+  *-product-*-jdk_security2,   \
+  *-product-*-jdk_security3,   \
+  *-product-*-jdk_text,        \
+  *-product-*-jdk_tools1,      \
+  *-product-*-jdk_tools2,      \
+  *-product-*-jdk_util
 
-# Directories needed to build
-jprt.bundle.exclude.src.dirs=build dist
+# Not Ready Yet:
+#   *-product-*-jdk_awt
+#   *-product-*-jdk_rmi
+#   *-product-*-jdk_swing
 
+# Directories to be excluded from source bundles
+jprt.bundle.exclude.src.dirs=build dist webrev
+

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