[kaffe] CVS kaffe-extras (guilhem): Removed checkInitializers patch because it causes too much trouble in some

[Kaffe CVS]

PatchSet 25 
Date: 2004/01/06 18:21:50
Author: guilhem
Branch: HEAD
Tag: (none) 
Log:
Removed checkInitializers patch because it causes too much trouble in some
other parts of KJC's code. It has to be fixed in another way.

Members: 
	bootstrap-kaffe+ant.sh:1.3->1.4 
	build.xml:1.14->1.15 
	patches/kjc-main-checkInitializers.diff:1.1->1.2(DEAD) 

Index: kaffe-extras/bootstrap-kaffe+ant.sh
diff -u kaffe-extras/bootstrap-kaffe+ant.sh:1.3 kaffe-extras/bootstrap-kaffe+ant.sh:1.4
--- kaffe-extras/bootstrap-kaffe+ant.sh:1.3	Mon Dec  1 09:39:46 2003
+++ kaffe-extras/bootstrap-kaffe+ant.sh	Tue Jan  6 18:21:50 2004
@@ -14,14 +14,14 @@
 
 (set -e
 
-test -f tarballs || mkdir tarballs
+test -d tarballs || mkdir tarballs
 cd tarballs
 
 if [ ! -f $KAFFE.tar.gz ]; then
 	wget -N http://www.kaffe.org/ftp/pub/kaffe/v1.1.x-development/$KAFFE.tar.gz
 fi
 
-if [ ! -f $ANT.tar.bz2 ]; then
+if [ ! -f $ANT-src.tar.gz ]; then
 	wget -N http://www.apache.org/dist/ant/source/$ANT-src.tar.gz
 fi
 
@@ -52,7 +52,7 @@
 set -e
 
 cd $ANT
-patch -p1 < ../../patches/ant-kaffe-1.1.0.diff
+patch -p1 < ../../patches/ant-kaffe-1.1.2.diff
 JAVA_HOME=$PREFIX
 JAVACMD=$JAVA_HOME/bin/java
 export CLASSPATH JAVA_HOME JAVACMD KAFFELIBRARYPATH
Index: kaffe-extras/build.xml
diff -u kaffe-extras/build.xml:1.14 kaffe-extras/build.xml:1.15
--- kaffe-extras/build.xml:1.14	Fri Dec 26 18:40:31 2003
+++ kaffe-extras/build.xml	Tue Jan  6 18:21:50 2004
@@ -251,9 +251,6 @@
 	<patch patchfile="${patches_dir}/kjc-inner-access.diff"
 		strip="1"
 		dir="${kjcsuite_dir}"/>
-	<patch patchfile="${patches_dir}/kjc-main-checkInitializers.diff"
-		strip="1"
-		dir="${kjcsuite_dir}"/>
 	<patch patchfile="${patches_dir}/kjc-string-concat-to-null.diff"
 		strip="1"
 		dir="${kjcsuite_dir}"/>
===================================================================
Checking out kaffe-extras/patches/kjc-main-checkInitializers.diff
RCS:  /home/cvs/kaffe/kaffe-extras/patches/Attic/kjc-main-checkInitializers.diff,v
VERS: 1.1
***************
--- kaffe-extras/patches/kjc-main-checkInitializers.diff	Tue Jan  6 18:21:52 2004
+++ /dev/null	Sun Aug  4 19:57:58 2002
@@ -1,22 +0,0 @@
---- kopi-2.1B/src/kjc/Main.java.orig	2002-07-16 03:53:32.000000000 +0900
-+++ kopi-2.1B/src/kjc/Main.java	2003-11-21 11:33:46.000000000 +0900
-@@ -179,6 +179,18 @@
- 	return false;
-       }
- 
-+      /* Check once again.
-+       * If we could know whether this second round of checkInitializers is
-+       * needed or not,  we would be able to skip it.
-+       */
-+      for (int count = 0; count < tree.length; count++) {
-+	checkInitializers(tree[count]);
-+      }
-+
-+      if (errorFound) {
-+	return false;
-+      }
-+
-       for (int count = 0; count < tree.length; count++) {
-         checkBody(tree[count]);
-         if (!options.java && !options.beautify && !(environment.getAssertExtension() == KjcEnvironment.AS_ALL)) {
-