Importing GNU Classpath 0.91 on gcc classpath svn branch

[Mark Wielaard]

Hi,

On Wed, 2006-05-17 at 14:51 +0200, Mark Wielaard wrote:
> I imported the latest GNU Classpath 0.91 release on
> svn+ssh://gcc.gnu.org/svn/gcc/branches/CLASSPATH/libjava/classpath
> This is just a clean copy of the sources inside gcc svn for easy
> merging. I'll try to merge it with libjava/classpath on the trunk later
> today.

I have something that seems to work now. Doing a clean bootstrap with it
at the moment. I made some notes on how I do these merges so others can
improve the process (I am sure my svn importing techniques are just
weird) or for people who want to do a fresh import in the future
themselves.

- Get a svn checkout of
  svn+ssh://gcc.gnu.org/svn/gcc/branches/CLASSPATH/libjava/classpath
  this contains "pure" GNU Classpath.
- Clean it up and get the files from a new version:
  - find classpath -type f | grep -v /\.svn | grep -v /\.cvs
  - tar zxf classpath-x.tar.gz
  - cp -r classpath-x/* classpath
- Add/Remove files:
  - svn status classpath | grep ^\! | cut -c8- | xargs svn remove
  - svn status classpath | grep ^\? | cut -c8- | xargs svn add
- Update vendor branch
  - svn commit classpath
- Note the new revision number (Xrev)
- Get a fresh gcc svn trunk checkout and cd gcc/libjava
- Merge the changes between classpath versions into the trunk.
  svn merge \
    svn+ssh://gcc.gnu.org/svn/gcc/branches/CLASSPATH/libjava/classpath@Xrev-1 \
    svn+ssh://gcc.gnu.org/svn/gcc/branches/CLASSPATH/libjava/classpath@Xrev \
    classpath
- Resolve any conflicts pointed out by svn status classpath | grep ^C
  - Makefile.in files will be regenerated later
  - Other files should have a "GCJ LOCAL" comment, or are mentioned
    in the classpath/ChangeLog.gcj file.
    (Don't forget to svn resolved files.)
- Use auto* to (re)create configure, Makefile.in, etc
  (Make sure you have Automake 1.9.3 installed. Exactly that version!)
  cd classpath
  cp ../../lt* .
  cp ../../config.sub ../../config.guess .
  aclocal -I m4 -I ../..
  autoconf
  autoheader
  automake
  rm -rf autom4te.cache
  cd ..
  scripts/makemake.tcl > sources.am
  automake
- Build, fix, insert new override files, etc till everything works.
  Possibly update the gcj/javaprims.h file with scripts/classes.pl
  (See HACKING, it can only be done after the first source->bytecode
   pass has finished.)

Comments, refinements and tricks to make this smoother appreciated.

Cheers,

Mark
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 189 bytes
Desc: This is a digitally signed message part
URL: <http://gcc.gnu.org/pipermail/java/attachments/20060518/babbdcf5/attachment.sig>