OK, so the Merge from Hell is done.
Since the structure of the berlios SVN repo had to change so much to accomodate GUSTO (the Grand Unified Source Tree for Oolite, from which all platforms should be buildable), it was ten times easier to merge the trunk into the branch, rather than the branch into the trunk.
Therefore, to make the branch the trunk, some svn renames have occurred:
trunk is now tags/pre-gusto
branches/cocoa-merge is now trunk
The current GUSTO trunk is based on a combination of the old trunk's HEAD revision and thor.acedragon.co.uk svn repo revision 1383 (probably taken around 16:30 on Sunday 5th March 2006)
The 'svn up' command *SHOULD* cope fine (it worked on my machine) and should make your pre-GUSTO trunk into the post-GUSTO trunk despite the huge amount of structural changes. It will take a while since the new repository contains everything that Giles's thor.acedragon.co.uk repo also contained (for example, graffle files for making texture/image PNGs)
There is also a new binary tarball builder script for non-OS X Unices, this can be invoked by running 'tools/mktarballs' from the top level of the trunk. It needs the appropriate deps directory, but it's structured such that given the existence of the correct deps directory, all platforms can be built with the same command. (tools/mktarballs also runs 'make' for you).
Please see the README.txt file in the top level for information about GUSTO's structure. One aim of this was to tidy up the source tree so that it's easier to find things, and so that the Xcode project / Makefile are easy to spot in Mac Finder or GNOME's file thingy rather than hidden amongst a bunch of source files.
berlios SVN repo users: cataclysm at hand!
Moderators: winston, another_commander
-
Evil Juice
- Dangerous
- Posts: 76
- Joined: Mon Feb 20, 2006 7:01 pm
- Location: Florence, Italy
