changeset 1234:91e175163fe0

Merge
author amurillo
date Thu, 13 Nov 2014 16:11:00 -0800
parents cf136458ee74 45edf93313ab
children b2a657320f44 0f3b76018c64
files
diffstat 1 files changed, 8 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/make/jprt.properties	Thu Nov 13 09:37:32 2014 -0800
+++ b/make/jprt.properties	Thu Nov 13 16:11:00 2014 -0800
@@ -50,14 +50,18 @@
 jprt.build.flavor.fastdebug.target=jprt_bundle
 jprt.build.flavor.product.target=jprt_bundle
 jprt.build.flavor.productOpen.target=jprt_bundle
+jprt.build.flavor.optimized.target=jprt_bundle
+jprt.build.flavor.optimizedOpen.target=jprt_bundle
 
 # Use these configure args to define debug level
 jprt.debug.build.configure.args=--with-debug-level=slowdebug
 jprt.fastdebug.build.configure.args=--with-debug-level=fastdebug
 jprt.product.build.configure.args=--with-debug-level=release
+jprt.optimized.build.configure.args=--with-debug-level=optimized
 jprt.debugOpen.build.configure.args=${jprt.debug.build.configure.args} --enable-openjdk-only
 jprt.fastdebugOpen.build.configure.args=${jprt.fastdebug.build.configure.args} --enable-openjdk-only
 jprt.productOpen.build.configure.args=${jprt.product.build.configure.args} --enable-openjdk-only
+jprt.optimizedOpen.build.configure.args=${jprt.product.build.configure.args} --enable-openjdk-only
 
 # Select build flavors and build targets
 jprt.build.flavors=${my.is.hotspot.job ? ${my.build.flavors.hotspot} : ${my.build.flavors.default}}
@@ -230,18 +234,18 @@
 
 # The hotspot build flavors
 my.build.flavors.hotspot=						\
-    debugOpen,fastdebug,product,productOpen,				\
+    debugOpen,fastdebug,product,productOpen,optimized,optimizedOpen \
     ${my.additional.build.flavors.hotspot}
 
 # Platforms built for hotspot push jobs
 my.build.targets.hotspot=						\
-    solaris_sparcv9_5.11-{product|fastdebug|optimized},			\
+    solaris_sparcv9_5.11-{product|fastdebug},			\
     solaris_x64_5.11-{product|fastdebug},				\
     linux_i586_2.6-{product|fastdebug},					\
-    linux_x64_2.6-{product|fastdebug|optimized},			\
+    linux_x64_2.6-{product|fastdebug},			\
     macosx_x64_10.7-{product|fastdebug},				\
     windows_i586_6.1-{product|fastdebug},				\
-    windows_x64_6.1-{product|fastdebug|optimized},			\
+    windows_x64_6.1-{product|fastdebug},			\
     solaris_x64_5.11-{debugOpen},					\
     linux_x64_2.6-{productOpen},					\
     ${my.additional.build.targets.hotspot}