aboutsummaryrefslogtreecommitdiff
path: root/make
diff options
context:
space:
mode:
authorohair <none@none>2010-09-07 15:16:01 -0700
committerohair <none@none>2010-09-07 15:16:01 -0700
commita70f78f034e0a71a5fcc37209d822bab9bc66bbf (patch)
tree18403822adbdf6bfa2bb27d5522b800c962b294a /make
parent1b6a28f91e9b985524ae461619c8828b207b11d4 (diff)
downloadjdk8u_jaxws-a70f78f034e0a71a5fcc37209d822bab9bc66bbf.tar.gz
6982946: Change make/jprt.properties to defer to JPRT itself for jdk platform list
Reviewed-by: kamg
Diffstat (limited to 'make')
-rw-r--r--make/jprt.properties30
1 files changed, 6 insertions, 24 deletions
diff --git a/make/jprt.properties b/make/jprt.properties
index 2449f9f0..c95c9d06 100644
--- a/make/jprt.properties
+++ b/make/jprt.properties
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2006, 2009, Oracle and/or its affiliates. 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
@@ -24,31 +24,13 @@
#
# 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
-# Explicitly designate what the 32bit match is for the 64bit build
-jprt.solaris_sparcv9.build.platform.match32=solaris_sparc_5.10
-jprt.solaris_sparcv9_5.10.build.platform.match32=solaris_sparc_5.10
-jprt.solaris_x64.build.platform.match32=solaris_i586_5.10
-jprt.solaris_x64_5.10.build.platform.match32=solaris_i586_5.10
-
-# Standard list of jprt test targets for this workspace
-jprt.test.targets=
-
-# Directories needing to exclude from source bundles
-jprt.bundle.exclude.src.dirs=build dist
+# Directories to be excluded from the source bundles
+jprt.bundle.exclude.src.dirs=build dist webrev