changeset in /hg/icedtea: 2007-12-11 Lillian Angel <langel at red...

[Lillian Angel]

changeset f7af1e676129 in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=f7af1e676129
description:
	2007-12-11  Lillian Angel  <langel at redhat.com>

	        * Makefile.am
	        (stamps/clone-ecj.stamp): Fixed to copy over openjdk dir instead of
	        cloning again, or unzip sources specified.
	        (stamps/patch-ecj.stamp): Only apply ecj patch, assuming all other
	        patches have already been applied to the openjdk sources.
	        * Makefile.in: Regenerate.

diffstat:

3 files changed, 19 insertions(+), 26 deletions(-)
ChangeLog   |    9 +++++++++
Makefile.am |   18 +++++-------------
Makefile.in |   18 +++++-------------

diffs (100 lines):

diff -r bc75b89403c6 -r f7af1e676129 ChangeLog
--- a/ChangeLog	Tue Dec 11 11:55:17 2007 -0500
+++ b/ChangeLog	Tue Dec 11 13:35:48 2007 -0500
@@ -1,3 +1,12 @@ 2007-12-11  Lillian Angel  <langel at redha
+2007-12-11  Lillian Angel  <langel at redhat.com>
+
+	* Makefile.am
+	(stamps/clone-ecj.stamp): Fixed to copy over openjdk dir instead of
+	cloning again, or unzip sources specified.
+	(stamps/patch-ecj.stamp): Only apply ecj patch, assuming all other
+	patches have already been applied to the openjdk sources.
+	* Makefile.in: Regenerate.
+
 2007-12-11  Lillian Angel  <langel at redhat.com>
 
 	* Makefile.am 
diff -r bc75b89403c6 -r f7af1e676129 Makefile.am
--- a/Makefile.am	Tue Dec 11 11:55:17 2007 -0500
+++ b/Makefile.am	Tue Dec 11 13:35:48 2007 -0500
@@ -227,17 +227,18 @@ clean-patch:
 # ======================================
 
 # Extract OpenJDK sources for ecj.
-stamps/clone-ecj.stamp: stamps/clone.stamp
+stamps/clone-ecj.stamp: stamps/patch.stamp
 	if ! test -d openjdk-ecj ; then \
+	  mkdir -p tmp-ecj ; \
   	  if [ ! -z $(OPENJDK_SRC_ZIP) ] ; \
           then \
             $(UNZIP) -q $(OPENJDK_SRC_ZIP) -d tmp-ecj; \
-	    mv tmp-ecj/openjdk openjdk-ecj ; \
-	    rmdir tmp-ecj; \
           else \
-            hg fclone -r jdk7-$(OPENJDK_VERSION) $(OPENJDK_URL) openjdk-ecj; \
+	    cp -a openjdk tmp-ecj; \
           fi ; \
 	fi
+	mv tmp-ecj/openjdk openjdk-ecj
+	rmdir tmp-ecj
 	chmod -R ug+w openjdk-ecj
 	mkdir -p stamps
 	touch stamps/clone-ecj.stamp
@@ -262,15 +263,6 @@ ICEDTEA_ECJ_PATCH = patches/icedtea-ecj.
 ICEDTEA_ECJ_PATCH = patches/icedtea-ecj.patch
 
 stamps/patch-ecj.stamp: stamps/clone-ecj.stamp
-	for p in $(ICEDTEA_PATCHES) ; \
-	do \
-	  echo Checking $$p ; \
-	  if $(PATCH) -l -p1 -d openjdk-ecj --dry-run -s -t -f -F 0 < $$p ; \
-	  then \
-	    echo Applying $$p ; \
-	    $(PATCH) -l -p1 -d openjdk-ecj < $$p ; \
-	  fi ; \
-	done
 	echo Checking $(ICEDTEA_ECJ_PATCH) ; \
 	if $(PATCH) -p0 -l --dry-run -s -t -f < $(ICEDTEA_ECJ_PATCH) ; \
 	then \
diff -r bc75b89403c6 -r f7af1e676129 Makefile.in
--- a/Makefile.in	Tue Dec 11 11:55:17 2007 -0500
+++ b/Makefile.in	Tue Dec 11 13:35:48 2007 -0500
@@ -728,17 +728,18 @@ clean-patch:
 # ======================================
 
 # Extract OpenJDK sources for ecj.
-stamps/clone-ecj.stamp: stamps/clone.stamp
+stamps/clone-ecj.stamp: stamps/patch.stamp
 	if ! test -d openjdk-ecj ; then \
+	  mkdir -p tmp-ecj ; \
   	  if [ ! -z $(OPENJDK_SRC_ZIP) ] ; \
           then \
             $(UNZIP) -q $(OPENJDK_SRC_ZIP) -d tmp-ecj; \
-	    mv tmp-ecj/openjdk openjdk-ecj ; \
-	    rmdir tmp-ecj; \
           else \
-            hg fclone -r jdk7-$(OPENJDK_VERSION) $(OPENJDK_URL) openjdk-ecj; \
+	    cp -a openjdk tmp-ecj; \
           fi ; \
 	fi
+	mv tmp-ecj/openjdk openjdk-ecj
+	rmdir tmp-ecj
 	chmod -R ug+w openjdk-ecj
 	mkdir -p stamps
 	touch stamps/clone-ecj.stamp
@@ -760,15 +761,6 @@ stamps/ports-ecj.stamp: stamps/clone-ecj
 	touch stamps/ports-ecj.stamp
 
 stamps/patch-ecj.stamp: stamps/clone-ecj.stamp
-	for p in $(ICEDTEA_PATCHES) ; \
-	do \
-	  echo Checking $$p ; \
-	  if $(PATCH) -l -p1 -d openjdk-ecj --dry-run -s -t -f -F 0 < $$p ; \
-	  then \
-	    echo Applying $$p ; \
-	    $(PATCH) -l -p1 -d openjdk-ecj < $$p ; \
-	  fi ; \
-	done
 	echo Checking $(ICEDTEA_ECJ_PATCH) ; \
 	if $(PATCH) -p0 -l --dry-run -s -t -f < $(ICEDTEA_ECJ_PATCH) ; \
 	then \