Patch: Move PagedGeometry and OpenSteer to top level

[adrian_broher]

Hello fo-devs,

I would like to propose that the Ogre PagedGeometry plugin code and the OpenSteer library should be moved out of their current location to the top level directory of the project. Also the code layout of both projects should be changed in a way that matches the upstream release code layout. This would:

* Allow easier updates of both libraries by simply dropping in a upstream release in the corresponding folder and a bit of patching.
* Separate fo code from external dependencies. It would be a bit easier to understand for contributers what is fo code and what is not.
* Put the layout of PagedGeometry and OpenSteer in line with other dependencies like log4cpp or OIS.
* In the long term make it simpler to use system libraries instead of the bundled ones (Packaging policies of Linux distributions usually don't allow bundled libraries).

[Geoff the Medio]

For OpenSteer, I don't think it should be treated anything like an external dependency for which a system library could be used; its purpose is predicting motions of combat objects, which needs to be done consistently on the server and clients, so all versions need to use the same code. Effectively it is FO code, as it's built into the binary from specific and consistent code. Edit: even though it hasn't been updated in 2 years... /Edit

That said, I don't have any strong objections to moving the code for both to the top level, like log4cpp or OIS.

[adrian_broher]

I've moved the OpenSteer and PagedGeometry libs to the top directory.

The attached patches should be applied in the order:
1) OpenSteer
2) PagedGeometry

The msvc patches are optional and untested (just a sed substitute run) and should update the msvc projects accordingly. I can't test those. Same goes for the the Xcode project files. I can't change those without Xcode.

To fix the project files the 'OpenSteer/include' and the 'PagedGeometry/include' directory needs to added to the default search path. Also the old cpp files need to be removed from the project and added from their new location.

[adrian_broher]

Part 2 of the patches.

[adrian_broher]

The above patches are outdated.

Attached you will find updated patches. I dropped the msvc patches because the merging those was an awful experience.

[Geoff the Medio]

If you're moving files around in future, make patches as SVN diffs, not git diffs. I applied the PagedGeometry patch, and there are a bunch of files that moved, but about half aren't marked as added to the repository... It seems random which are or aren't.

Did you just move the PagedGeometry directory, or did any of its contents change?

Edit: Looks like you also subdivided the PagedGeometry stuff into source and include. This is inconsistent with the existing directory structure of the files library, and of its own internal includes, which appear to assume the .cpp and .h are in the same location.

[adrian_broher]

If you're moving files around in future, make patches as SVN diffs, not git diffs. I applied the PagedGeometry patch, and there are a bunch of files that moved, but about half aren't marked as added to the repository... It seems random which are or aren't.

I wasn't aware that svn and git have various small syntax differences for added source files. I have found a solution for that that I will use in future.

Did you just move the PagedGeometry directory, or did any of its contents change? Edit: Looks like you also subdivided the PagedGeometry stuff into source and include.

I changed the code layout in a way that it reflects the upstream release package. See opening comment.

This is inconsistent with the existing directory structure of the files library, and of its own internal includes, which appear to assume the .cpp and .h are in the same location.

This is not correct. upstream separates sources and public includes the same way. Instead of Mixing the headers and sources the 'include' dir is added as Additional Include Directories as Visual Studio would call it.

[Geoff the Medio]

upstream separates sources and public includes the same way. Instead of Mixing the headers and sources the 'include' dir is added as Additional Include Directories as Visual Studio would call it.

Hmm... OK.

I've added the latest version of the PagedGeometry code from the google code site to the FreeOrion SVN. Can you make a reduced patch that just modifies the project files / CMakeLists.txt files, and I'll delete the previously-existing code in the same commit?

Edit: Apparently I completely failed at downloading the code, and instead committed the webpage code instead.

[adrian_broher]

It seems like you've added the google code listing to repository instead of the actual code?

You probably wanted this instead:

http://code.google.com/p/ogre-paged/dow ... p&can=2&q=

[Vezzra]

Assuming that this isn't some kind of urgent modification, can we put that off until after April 20th? Because it looks like I'll have to apply these changes to the Xcode project too to be able to compile, and I don't really have the time for that ATM...

[Geoff the Medio]

It seems like you've added the google code listing to repository instead of the actual code?

Yes, I noticed.

You probably wanted this instead:

http://code.google.com/p/ogre-paged/dow ... p&can=2&q=

No, I was trying to get the latest version in the repository. There's no simple download tarball like is available with the sourceforge SVN viewer, so I was attempting to download each file individually (since I didn't want to have to set up a mercurial client just to get these files).

edit: Apparently there is no way to download code directly from the mercurial google code web interface? This is rather annoying.

[adrian_broher]

The attached zip contains the includes and sources from head. Fetched with `$ wget -r --no-parent -A.cpp -A.h http://ogre-paged.googlecode.com/hg/`.

Because it looks like I'll have to apply these changes to the Xcode project too to be able to compile, and I don't really have the time for that ATM

I will take a look at updating the xcode files.

[Vezzra]

I will take a look at updating the xcode files.

Thx!

So I assume you're on OSX?

[adrian_broher]

So I assume you're on OSX?

No thanks, I use Fedora Linux. Better assume that I use a virtual machine.

[Vezzra]

No thanks, I use Fedora Linux. Better assume that I use a virtual machine.

Oh, I see

Too bad, another OSX dev around would've been cool...