changeset 60:a5e9cf599de1

add bsd-port patch to forest root
author jrose
date Mon, 12 Sep 2011 17:43:19 -0700
parents da760b9a2310
children 24abb608cae9
files forest-root/jdk7-b147-to-bsd-port.patch forest-root/series make/Makefile make/each-patch-repo.sh make/link-patch-dirs.sh
diffstat 5 files changed, 19 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/forest-root/jdk7-b147-to-bsd-port.patch	Mon Sep 12 17:43:19 2011 -0700
@@ -0,0 +1,12 @@
+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/series	Mon Sep 12 17:43:19 2011 -0700
@@ -0,0 +1,3 @@
+# base = 0b66a233bfb9 in http://hg.openjdk.java.net/hsx/hotspot-comp/. [2011-09-01]
+
+jdk7-b147-to-bsd-port.patch     #+bsd-port
--- a/make/Makefile	Fri Sep 02 00:52:30 2011 -0700
+++ b/make/Makefile	Mon Sep 12 17:43:19 2011 -0700
@@ -36,16 +36,13 @@
 MAYBE_FORCE = force
 MAYBE_FORCE$(FORCE_VERSIONS) = #off
 
-all: setup $(MAYBE_FORCE) $(MAYBE_CHECK) patch build
+all: setup $(MAYBE_FORCE) $(MAYBE_CHECK) patch
 
 setup: link-patch-dirs mq-select-guards
 check: hg-check-versions
 force: hg-force-versions
 unforce: hg-unforce-versions
 patch: mq-push-patches
-build:
-	cd $(RUN_FROM_DIR); $(SH) patches/make/each-patch-repo.sh \
-		"(cd make; $(MAKE))"
 
 link-patch-dirs: $(RUN_FROM_DIR)/sources $(RUN_FROM_DIR)/patches
 	cd $(RUN_FROM_DIR); bash patches/make/link-patch-dirs.sh sources patches
--- a/make/each-patch-repo.sh	Fri Sep 02 00:52:30 2011 -0700
+++ b/make/each-patch-repo.sh	Mon Sep 12 17:43:19 2011 -0700
@@ -32,7 +32,7 @@
 
 exit_status=0
 
-for d in $(cd "$sources"; echo *); do
+for d in $(cd "$sources"; echo . *); do
   srepo=$sources/$d
   # Do not mention a repo if there is no 'series' file.
   [ ! -f "$srepo/.hg/patches/series" ] && continue
--- a/make/link-patch-dirs.sh	Fri Sep 02 00:52:30 2011 -0700
+++ b/make/link-patch-dirs.sh	Mon Sep 12 17:43:19 2011 -0700
@@ -48,8 +48,10 @@
 while read prepo; do
   prepo=${prepo%"/.hg"}
   # Do not link a repo if there is no 'series' file.
+  [ -f "$prepo/forest-root/series" ] && prepo="$prepo/forest-root"
   [ ! -f "$prepo/series" ] && continue
   srepo=$sources/${prepo#"$patches/"}
+  srepo=${srepo%"/forest-root"}
   $nflag || {
     [ ! -d "$srepo/.hg" ] && {
       >&2 echo "*** Skipping: ${prepo#$here/}"