# HG changeset patch
# User asaha
# Date 1409688031 25200
# Node ID 44851533c05a4f995f790eb044de537d3ef7975c
# Parent  eac58f206085f8a19b3f7e0a7714695bacdb4fb2# Parent  f0a48c214c46b7351ff8e6d6b6dc533463a4be21
Merge

diff -r eac58f206085 -r 44851533c05a .hgtags
--- a/.hgtags	Tue Aug 26 11:06:08 2014 -0700
+++ b/.hgtags	Tue Sep 02 13:00:31 2014 -0700
@@ -329,4 +329,5 @@
 c35e73e4acd8ed03e77e8e20023bac115c7dfe38 jdk8u25-b12
 5d990a43c996ef039c6619e55215d589e09d1022 jdk8u25-b13
 4429ea47ee6eca6b8a1dbda1950566ee821ba19d jdk8u25-b14
+09eaef69f384ecf8ec0342b87a8b150740941140 jdk8u25-b15
 6db0898d3f90ad9eae2f017299314b88766446e3 jdk8u31-b00
diff -r eac58f206085 -r 44851533c05a make/Jprt.gmk
--- a/make/Jprt.gmk	Tue Aug 26 11:06:08 2014 -0700
+++ b/make/Jprt.gmk	Tue Sep 02 13:00:31 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
diff -r eac58f206085 -r 44851533c05a make/jprt.properties
--- a/make/jprt.properties	Tue Aug 26 11:06:08 2014 -0700
+++ b/make/jprt.properties	Tue Sep 02 13:00:31 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