changeset 12059:128061bb8026

Merge
author duke
date Wed, 05 Jul 2017 18:05:09 +0200
parents b1e7314664f0 2717dde1f2f9
children a3e5960df848
files
diffstat 5 files changed, 6 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/.hgignore	Wed Mar 14 13:50:37 2012 -0700
+++ b/.hgignore	Wed Jul 05 18:05:09 2017 +0200
@@ -3,3 +3,4 @@
 /nbproject/private/
 ^webrev
 ^.hgtip
+.DS_Store
--- a/.hgtags-top-repo	Wed Mar 14 13:50:37 2012 -0700
+++ b/.hgtags-top-repo	Wed Jul 05 18:05:09 2017 +0200
@@ -150,3 +150,4 @@
 2accafff224ae39caf5f532c305251ba624bf2c0 jdk8-b26
 1533dfab9903e4edcfead3b0192643f38c418b9b jdk8-b27
 6e2541d60f4e342b5b67140271d7611643929dc3 jdk8-b28
+41460de042580bc4a4ce3f863779c66f39cb8578 jdk8-b29
--- a/hotspot/.hgtags	Wed Mar 14 13:50:37 2012 -0700
+++ b/hotspot/.hgtags	Wed Jul 05 18:05:09 2017 +0200
@@ -228,3 +228,4 @@
 975c4105f1e2ef1190a75b77124033f1fd4290b5 hs24-b01
 b183b0863611b85dbac16f3b08b40ba978756d19 jdk8-b28
 030b5306d60f140e822e4a6d301744cb110ff0c8 hs24-b02
+b45b5c564098c58ea69e7cff3f7d341f0254dd1d jdk8-b29
--- a/make/Defs-internal.gmk	Wed Mar 14 13:50:37 2012 -0700
+++ b/make/Defs-internal.gmk	Wed Jul 05 18:05:09 2017 +0200
@@ -79,7 +79,7 @@
 # Find all build_time_* files and print their contents in a list sorted
 # on the name of the sub repository.
 define ReportBuildTimes
-$(PRINTF) "-- Build times ----------\nTarget %s\nStart %s\nEnd   %s\n%s\n%s\n-------------------------\n" \
+$(PRINTF) -- "-- Build times ----------\nTarget %s\nStart %s\nEnd   %s\n%s\n%s\n-------------------------\n" \
 $1 \
 "`$(CAT) $(BUILDTIMESDIR)/build_time_start_TOTAL_human_readable`" \
 "`$(CAT) $(BUILDTIMESDIR)/build_time_end_TOTAL_human_readable`" \
--- a/make/jprt.properties	Wed Mar 14 13:50:37 2012 -0700
+++ b/make/jprt.properties	Wed Jul 05 18:05:09 2017 +0200
@@ -39,6 +39,7 @@
     solaris_x64_5.10-{product|fastdebug}, 			\
     linux_i586_2.6-{product|fastdebug}, 			\
     linux_x64_2.6-{product|fastdebug}, 				\
+    macosx_x64_10.7-{product|fastdebug}, 			\
     windows_i586_5.1-{product|fastdebug}, 			\
     windows_x64_5.2-{product|fastdebug}
 
@@ -53,6 +54,7 @@
     solaris_x64_5.10-product-c2-TESTNAME, 			\
     linux_i586_2.6-product-{c1|c2}-TESTNAME, 			\
     linux_x64_2.6-product-c2-TESTNAME, 				\
+    macosx_x64_10.7-product-c2-TESTNAME, 			\
     windows_i586_5.1-product-c1-TESTNAME, 			\
     windows_x64_5.2-product-c2-TESTNAME