Mercurial > hg > icedtea9-forest
changeset 456:6cea54809b51 jdk8-b30
Merge
| author | lana |
|---|---|
| date | Fri, 09 Mar 2012 11:56:06 -0800 |
| parents | eacd6b140c0c (current diff) 84ffd2c5f41c (diff) |
| children | 0b66f43b89a6 fa0fed83e335 |
| files | |
| diffstat | 3 files changed, 4 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/.hgignore Thu Mar 08 20:34:18 2012 -0800 +++ b/.hgignore Fri Mar 09 11:56:06 2012 -0800 @@ -3,3 +3,4 @@ /nbproject/private/ ^webrev ^.hgtip +.DS_Store
--- a/make/Defs-internal.gmk Thu Mar 08 20:34:18 2012 -0800 +++ b/make/Defs-internal.gmk Fri Mar 09 11:56:06 2012 -0800 @@ -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 Thu Mar 08 20:34:18 2012 -0800 +++ b/make/jprt.properties Fri Mar 09 11:56:06 2012 -0800 @@ -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