/hg/icedtea: Clone build directory if it exists so that JAXWS so...

[andrew at icedtea.classpath.org]

changeset 60b7879c73d7 in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=60b7879c73d7
author: Andrew John Hughes <ahughes at redhat.com>
date: Mon Jun 28 14:20:49 2010 +0100

	Clone build directory if it exists so that JAXWS sources are
	available to the bootstrap build.

	2010-06-28 Andrew John Hughes <ahughes at redhat.com>

	 * Makefile.am: (clone-boot): Clone build directory
	too if it exists. (patch-jaxws): Fix typo.


diffstat:

2 files changed, 12 insertions(+), 2 deletions(-)
ChangeLog   |    9 ++++++++-
Makefile.am |    5 ++++-

diffs (38 lines):

diff -r 74cfd211da47 -r 60b7879c73d7 ChangeLog
--- a/ChangeLog	Sun Jun 27 22:57:18 2010 +0100
+++ b/ChangeLog	Mon Jun 28 14:20:49 2010 +0100
@@ -1,4 +1,11 @@ 2010-06-25 Andrew John Hughes  <ahughes@
-2010-06-25 Andrew John Hughes  <ahughes at redhat.com>
+2010-06-28 Andrew John Hughes  <ahughes at redhat.com>
+
+	* Makefile.am:
+	(clone-boot): Clone build directory too if
+	it exists.
+	(patch-jaxws): Fix typo.
+
+2010-06-27 Andrew John Hughes  <ahughes at redhat.com>
 
 	* Makefile.am:
 	(OPENJDK_BOOT_TREE): Set to patch-jaxws.stamp.
diff -r 74cfd211da47 -r 60b7879c73d7 Makefile.am
--- a/Makefile.am	Sun Jun 27 22:57:18 2010 +0100
+++ b/Makefile.am	Mon Jun 28 14:20:49 2010 +0100
@@ -1512,6 +1512,9 @@ stamps/clone-boot.stamp: $(OPENJDK_TREE)
 stamps/clone-boot.stamp: $(OPENJDK_TREE)
 	if ! test -d openjdk-boot ; then \
 	    cp -pPRl openjdk openjdk-boot ; \
+	    if [ -e $(BUILD_OUTPUT_DIR) ] ; then \
+	      cp -pPRl $(BUILD_OUTPUT_DIR) $(BOOT_BUILD_OUTPUT_DIR) ; \
+	    fi ; \
 	fi
 	mkdir -p stamps
 	touch $@
@@ -1577,7 +1580,7 @@ stamps/patch-jaxws.stamp: stamps/patch-b
 	touch stamps/patch-jaxws.stamp.tmp
 if DTDTYPE_QNAME
 	set -e ; \
-	(cd $(BOOT_BUILD_OUTPUT_DIR)/jaxws;o \
+	(cd $(BOOT_BUILD_OUTPUT_DIR)/jaxws; \
 	 all_patches_ok=yes; \
 	 for p in $(JAXWS_PATCHES) ; \
 	 do \