changeset 61:24abb608cae9

macosx: refresh preview patch from latest review of 7113349
author jrose
date Thu, 01 Mar 2012 01:10:02 -0800
parents a5e9cf599de1
children 1ecfbcb08379
files forest-root/jdk7-b147-to-bsd-port.patch forest-root/macosx-7113349.patch forest-root/series
diffstat 3 files changed, 38 insertions(+), 14 deletions(-) [+]
line wrap: on
line diff
--- a/forest-root/jdk7-b147-to-bsd-port.patch	Mon Sep 12 17:43:19 2011 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,12 +0,0 @@
-diff --git a/make/Defs-internal.gmk b/make/Defs-internal.gmk
---- a/make/Defs-internal.gmk
-+++ b/make/Defs-internal.gmk
-@@ -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`" \
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/forest-root/macosx-7113349.patch	Thu Mar 01 01:10:02 2012 -0800
@@ -0,0 +1,36 @@
+--- old/.hgignore	2012-02-29 21:49:50.000000000 +0000
++++ new/.hgignore	2012-02-29 21:49:50.000000000 +0000
+@@ -3,3 +3,4 @@
+ /nbproject/private/
+ ^webrev
+ ^.hgtip
++.DS_Store
+--- old/make/Defs-internal.gmk	2012-02-29 21:49:51.000000000 +0000
++++ new/make/Defs-internal.gmk	2012-02-29 21:49:51.000000000 +0000
+@@ -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`" \
+--- old/make/jprt.properties	2012-02-29 21:49:51.000000000 +0000
++++ new/make/jprt.properties	2012-02-29 21:49:51.000000000 +0000
+@@ -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
+ 
--- a/forest-root/series	Mon Sep 12 17:43:19 2011 -0700
+++ b/forest-root/series	Thu Mar 01 01:10:02 2012 -0800
@@ -1,3 +1,3 @@
-# base = 0b66a233bfb9 in http://hg.openjdk.java.net/hsx/hotspot-comp/. [2011-09-01]
+# base = 1533dfab9903 in http://hg.openjdk.java.net/hsx/hotspot-comp/. [2012-02-16]
 
-jdk7-b147-to-bsd-port.patch     #+bsd-port
+macosx-7113349.patch            #-/macosx #+1533dfab9903