Re: classpath-0.95 merge

[Tom Tromey <tromey at redhat dot com>]

>>>>> "Matthias" == Matthias Klose <doko@ubuntu.com> writes:

Matthias> Some progress on the merge.

Thanks very much for doing this.

Matthias> - I now have a merged classpath-0.95 in my working copy,
Matthias> which sucessfully builds ands runs the testsuite on
Matthias> i686-linux-gnu. the ChangeLog is attached. Should this be
Matthias> committed to the classpath-095-merge-branch so that others
Matthias> can test this merge?

Sure, why not?  I'll check it out and give it a try here (I only have
x86 so that is not the most helpful.. but it is something) if it is
easy :-)

Matthias> - classpath/tools/Makefile.am, classpath/lib/Makefile.am had
Matthias> some file conflicts. Please review my changes here.

I'd be happy to but I didn't see a patch.  Also they didn't seem to be
mentioned in the ChangeLog entry.

Matthias> - classpath/javax/management/NotificationBroadcasterSupport.java:221: error:
Matthias>   Type mismatch: cannot convert from Object to MBeanNotificationInfo[]
Matthias>         return info.clone();
Matthias>                ^^^^^^^^^^^^
Matthias>   Just added a cast to make it build. Please review.

Hmm.  Compiler bug?  Wrong or outdated version of ecj?  Lacking a
-source 1.5 switch?  I ask because I believe in 1.5 an array's clone()
method has the array's type, and thus no cast should be needed.

Matthias> - How to determine .class and generated .h files for .java
Matthias> files which are removed in the merge. Currently only removed
Matthias> the files mentioned below.

What I do is 'rm' all the classes and generated headers (I should have
put the latter in their own subdirectory ... maybe we ought to revisit
this), then rebuild, and then 'svn rm' the ones that didn't get
rebuilt.

Also make sure to update gcj/javaprims.h.  Search down for 'classes.pl'.

Matthias> - Some files directories are not in classpath anymore: should these be
Matthias>   removed from in the import?
Matthias>   classpath/.externalToolBuilders
Matthias>   classpath/.settings
Matthias>   classpath/.cdtproject
Matthias>   classpath/ChangeLog.usermap
Matthias>   classpath/.classpath
Matthias>   classpath/.project

Hmm, I see all of these in Classpath CVS.  Maybe they are not in
Classpath's 'make dist'?  For the Eclipse files, this is a bug in
dist.  ChangeLog.usermap, perhaps we could just remove.

Tom