changeset 1168:09eaef69f384 jdk8u25-b15

8056121: set the default release to 8u25 in the source tree for JPRT Reviewed-by: mikael
author asaha
date Wed, 27 Aug 2014 09:46:47 -0700
parents e4c0b81ec774
children f0a48c214c46
files make/Jprt.gmk make/jprt.properties
diffstat 2 files changed, 6 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/make/Jprt.gmk	Mon Aug 25 13:35:06 2014 -0700
+++ b/make/Jprt.gmk	Wed Aug 27 09:46:47 2014 -0700
@@ -145,6 +145,9 @@
           ifdef ALT_INSTALL_UPX_FILENAME
 	    @$(ECHO) " --with-upx-filename=$(call UnixPath,$(ALT_INSTALL_UPX_FILENAME)) " >> $@.tmp
           endif
+          ifdef ALT_BSDIFF_DIR
+	    @$(ECHO) " --with-bsdiff-dir=$(call UnixPath,$(ALT_BSDIFF_DIR)) " >> $@.tmp
+          endif
           ifdef ALT_CCSS_SIGNING_DIR
 	    @$(ECHO) " --with-ccss-signing=$(call UnixPath,$(ALT_CCSS_SIGNING_DIR)) " >> $@.tmp
           endif
--- a/make/jprt.properties	Mon Aug 25 13:35:06 2014 -0700
+++ b/make/jprt.properties	Wed Aug 27 09:46:47 2014 -0700
@@ -25,8 +25,9 @@
 
 # Properties for jprt
 
-# Locked down to jdk8
-jprt.tools.default.release=jdk8
+# The current release name
+my.jdk.update.version=25
+jprt.tools.default.release=jdk8u${my.jdk.update.version}
 
 # Unix toolkit to use for building on windows
 jprt.windows.jdk8.build.unix.toolkit=cygwin