Merge

Tue, 02 Sep 2014 13:00:31 -0700

author
asaha
date
Tue, 02 Sep 2014 13:00:31 -0700
changeset 1225
44851533c05a
parent 1224
eac58f206085
parent 1130
f0a48c214c46
child 1226
9ec15845283c

Merge

.hgtags file | annotate | diff | comparison | revisions
     1.1 --- a/.hgtags	Tue Aug 26 11:06:08 2014 -0700
     1.2 +++ b/.hgtags	Tue Sep 02 13:00:31 2014 -0700
     1.3 @@ -329,4 +329,5 @@
     1.4  c35e73e4acd8ed03e77e8e20023bac115c7dfe38 jdk8u25-b12
     1.5  5d990a43c996ef039c6619e55215d589e09d1022 jdk8u25-b13
     1.6  4429ea47ee6eca6b8a1dbda1950566ee821ba19d jdk8u25-b14
     1.7 +09eaef69f384ecf8ec0342b87a8b150740941140 jdk8u25-b15
     1.8  6db0898d3f90ad9eae2f017299314b88766446e3 jdk8u31-b00
     2.1 --- a/make/Jprt.gmk	Tue Aug 26 11:06:08 2014 -0700
     2.2 +++ b/make/Jprt.gmk	Tue Sep 02 13:00:31 2014 -0700
     2.3 @@ -145,6 +145,9 @@
     2.4            ifdef ALT_INSTALL_UPX_FILENAME
     2.5  	    @$(ECHO) " --with-upx-filename=$(call UnixPath,$(ALT_INSTALL_UPX_FILENAME)) " >> $@.tmp
     2.6            endif
     2.7 +          ifdef ALT_BSDIFF_DIR
     2.8 +	    @$(ECHO) " --with-bsdiff-dir=$(call UnixPath,$(ALT_BSDIFF_DIR)) " >> $@.tmp
     2.9 +          endif
    2.10            ifdef ALT_CCSS_SIGNING_DIR
    2.11  	    @$(ECHO) " --with-ccss-signing=$(call UnixPath,$(ALT_CCSS_SIGNING_DIR)) " >> $@.tmp
    2.12            endif
     3.1 --- a/make/jprt.properties	Tue Aug 26 11:06:08 2014 -0700
     3.2 +++ b/make/jprt.properties	Tue Sep 02 13:00:31 2014 -0700
     3.3 @@ -25,8 +25,9 @@
     3.4  
     3.5  # Properties for jprt
     3.6  
     3.7 -# Locked down to jdk8
     3.8 -jprt.tools.default.release=jdk8
     3.9 +# The current release name
    3.10 +my.jdk.update.version=25
    3.11 +jprt.tools.default.release=jdk8u${my.jdk.update.version}
    3.12  
    3.13  # Unix toolkit to use for building on windows
    3.14  jprt.windows.jdk8.build.unix.toolkit=cygwin

mercurial