Source users: source tree layout will be changing

[winston]

I'm currently working on making a grand unified source tree for Oolite, from which any supported platform can be built (Cocoa, using the XCode projects, or SDL/GNUstep using the Makefile).

This means in the near future (i.e. when the branch merge happens, I'm working on this in a branch rather than trunk) the source tree layout will change quite significantly. Currently, it's a big flat directory with a subdir for Resources. It will change such that no source code will be in the root of the trunk, instead core functionality (which is built on all platforms) will be in the Core subdirectory, SDL-only stuff will be in the SDL directory, and Cocoa only stuff will be in Cocoa and so on.

The practical upshot of this is that it will tidy up the trunk hugely and things like the 'Documentation' directory won't be lost amongst a huge pile of source files.

The Linux build is already building out of this structure (that was the easy bit) in the cocoa-merge branch. Getting the Cocoa stuff is going to take a little more work as I'll need to do some merging and #ifdefing. I'm hoping this will all be complete within the week.

[Rxke]

grand unified source tree for Oolite.

I suggest you baptise it G.U.S.T.O.

[JensAyton]

It will change such that no source code will be in the root of the trunk, instead core functionality (which is built on all platforms) will be in the Core subdirectory, SDL-only stuff will be in the SDL directory, and Cocoa only stuff will be in Cocoa and so on.

Yay! :-)

[winston]

Well, the Grand Unified Source Tree for Oolite successfully built both OS X (Cocoa, not SDL) and Linux v1.62 builds from the same source tree last night. There are still some niggles with the XCode project, but it's mostly done.

I'm not going to get to work on it for the next few days as I have visitors, but it's pretty close to being ready ... so it won't be long now!

[tjwhaynes]

Something seems to have been messed up between 1.62 and the current SVN (which reports 252). I don't seem to have Cocoa/Cocoa.h on my system - should I have? Is that something OS X specific? OOCocoa/OOCocoa.h I can see.

toby@nexus:~/progs/svn/oolite/trunk$ make
Making all for app oolite...
Compiling file ShipEntity.m ...
In file included from ShipEntity.m:49:
Octree.h:39:24: error: Cocoa/Cocoa.h: No such file or directory

Thanks,
Toby Haynes

[JensAyton]

Yeah, it should be #import "OOCocoa.h" rather than #import <Cocoa/Cocoa.h>.

[aegidian]

Yeah, it should be #import "OOCocoa.h" rather than #import <Cocoa/Cocoa.h>.

AH. goes to correct.