Hi,
This restores the --enable-collections functionality.
2006-07-22 Mark Wielaard <[EMAIL PROTECTED]>
* java/lang/Iterable.java: Import all of java.util.
* lib/mkcollections.pl.in (javautilclasses): Add Iterable.
* lib/Makefile.am: Only search for .java files in COLLECTIONS_PREFIX.
I only made sure everything builds correctly again. But haven't tested
any applications. As far as I know only some versions of MegaMek
actually need this.
Committed,
Mark
Index: java/lang/Iterable.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/lang/Iterable.java,v
retrieving revision 1.2
diff -u -r1.2 Iterable.java
--- java/lang/Iterable.java 17 Apr 2006 10:27:54 -0000 1.2
+++ java/lang/Iterable.java 22 Jul 2006 20:14:57 -0000
@@ -38,7 +38,8 @@
package java.lang;
-import java.util.Iterator;
+// We only need Iterator, but we import * to support lib/mkcollections.pl
+import java.util.*;
/**
* This interface is used to indicate that a given class can be
Index: lib/Makefile.am
===================================================================
RCS file: /cvsroot/classpath/classpath/lib/Makefile.am,v
retrieving revision 1.124
diff -u -r1.124 Makefile.am
--- lib/Makefile.am 6 Jul 2006 22:41:16 -0000 1.124
+++ lib/Makefile.am 22 Jul 2006 20:14:57 -0000
@@ -44,9 +44,9 @@
collections.jar: mkcollections.pl
./mkcollections.pl $(top_srcdir)
if FOUND_GCJ
- $(GCJ) -C `$(FIND) $(COLLECTIONS_PREFIX) -name '*' -type f -print`
+ $(GCJ) -C `$(FIND) $(COLLECTIONS_PREFIX) -name '*.java' -type f -print`
else
- $(JAVAC) `$(FIND) $(COLLECTIONS_PREFIX) -name '*' -type f -print`
+ $(JAVAC) `$(FIND) $(COLLECTIONS_PREFIX) -name '*.java' -type f -print`
endif
if test "$(FASTJAR)" != ""; then \
$(FASTJAR) cf $@ $(COLLECTIONS_PREFIX); \
Index: lib/mkcollections.pl.in
===================================================================
RCS file: /cvsroot/classpath/classpath/lib/mkcollections.pl.in,v
retrieving revision 1.4
diff -u -r1.4 mkcollections.pl.in
--- lib/mkcollections.pl.in 3 Mar 2006 17:40:43 -0000 1.4
+++ lib/mkcollections.pl.in 22 Jul 2006 20:14:57 -0000
@@ -25,7 +25,8 @@
my [EMAIL PROTECTED]@;
my $classpath=pop;
my @javalangclasses=qw(UnsupportedOperationException
- Comparable);
+ Comparable
+ Iterable);
my @javautilclasses=qw(AbstractCollection
AbstractList
AbstractMap
