diff options
author | herrick <none@none> | 2010-09-17 07:08:23 -0400 |
---|---|---|
committer | herrick <none@none> | 2010-09-17 07:08:23 -0400 |
commit | 1ecc7ae224d90a92d8d94f482edd6e44711d3583 (patch) | |
tree | 4e0e6bf3f5ffd9f84db1490822e1ca659f697a3c /make | |
parent | 55b147a326b1cc4a722512c5f5e92f24ba52c617 (diff) | |
parent | 403156123614c96fc67c59d18f1ff1f6493890e5 (diff) |
Merge
Diffstat (limited to 'make')
-rw-r--r-- | make/jprt.properties | 29 | ||||
-rw-r--r-- | make/templates/gpl-cp-header | 6 | ||||
-rw-r--r-- | make/templates/gpl-header | 6 |
3 files changed, 11 insertions, 30 deletions
diff --git a/make/jprt.properties b/make/jprt.properties index d3b71df..6a4541d 100644 --- a/make/jprt.properties +++ b/make/jprt.properties @@ -24,32 +24,12 @@ # # Properties for jprt -jprt.tools.default.release=jdk1.7.0 -# Specific platform list -jprt.build.platforms= \ - solaris_sparc_5.10, \ - solaris_sparcv9_5.10, \ - solaris_i586_5.10, \ - solaris_x64_5.10, \ - linux_i586_2.6, \ - linux_x64_2.6, \ - windows_i586_5.0, \ - windows_x64_5.2 +# Use whatever release that the submitted job requests +jprt.tools.default.release=${jprt.submit.release} -# The different build flavors we want +# The different build flavors we want, we override here so we just get these 2 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.10 -jprt.solaris_x64.build.platform.match32=solaris_i586_5.10 # Shortened list of vm tests jprt.test.targets= \ @@ -89,6 +69,7 @@ jprt.make.rule.test.targets= \ # *-product-*-jdk_rmi # *-product-*-jdk_swing -# Directories to be excluded from source bundles +# Directories to be excluded from the source bundles jprt.bundle.exclude.src.dirs=build dist webrev + diff --git a/make/templates/gpl-cp-header b/make/templates/gpl-cp-header index 59473be..ed422f4 100644 --- a/make/templates/gpl-cp-header +++ b/make/templates/gpl-cp-header @@ -17,6 +17,6 @@ You should have received a copy of the GNU General Public License version 2 along with this work; if not, write to the Free Software Foundation, 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. diff --git a/make/templates/gpl-header b/make/templates/gpl-header index 07dbc05..e717b45 100644 --- a/make/templates/gpl-header +++ b/make/templates/gpl-header @@ -15,6 +15,6 @@ You should have received a copy of the GNU General Public License version 2 along with this work; if not, write to the Free Software Foundation, 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. |