Re: [Flightgear-devel] JSBSim merge

2011-01-27 Thread Erik Hofman
On Wed, 2011-01-26 at 20:53 +0100, Bertrand Coconnier wrote: > Let's take an example : let's say I develop some code for JSBSim to > take into account FG ground material in the landing gears friction > forces. For that, I need to modify both JSBSim library *and* > FlightGear glue code. So I will su

Re: [Flightgear-devel] JSBSim merge

2011-01-26 Thread Curtis Olson
Hi Bertrand, Here are a couple quick responses: - The reason JSBSim would want to keep a copy of the glue code would be to serve as an example for others who want to integrate JSBSim into their projects. - Changing the name of the glue code (I guess I missed seeing that this was officially decid

Re: [Flightgear-devel] JSBSim merge

2011-01-26 Thread Bertrand Coconnier
2011/1/26 Erik Hofman : > > After a bit of discussion it was decided that the FlightGear/JSBSim glue > code in JSBSim.[ch]xx located in FlightGear/src/FDM/JSBSim now is > maintained by FlightGear developers instead of by JSBSim developers and > therefore these files will not be overwritten in futur

Re: [Flightgear-devel] JSBSim merge

2011-01-26 Thread Erik Hofman
On Wed, 2011-01-26 at 07:19 -0600, Jon S. Berndt wrote: > I have received and applied patches from several places recently. Make sure > that patches are not accidentally reversed. They won't since the patches at the FlightGear side will be overwritten by what JSBSim had in CVS. > It is very impo

Re: [Flightgear-devel] JSBSim merge

2011-01-26 Thread James Turner
On 26 Jan 2011, at 12:26, Erik Hofman wrote: >> Great, that simplifies things considerably, hopefully for everyone. There's >> still the issue of my FGPropulsion change, and Andreas' FGPropogate fix to >> go into JSBSim proper. > > I've committed Andreas' FGPropogate fix in JSBSim, your fix ne

Re: [Flightgear-devel] JSBSim merge

2011-01-26 Thread Jon S. Berndt
> -Original Message- > From: Erik Hofman [mailto:e...@ehofman.com] > Sent: Wednesday, January 26, 2011 5:55 AM > To: FlightGear developers discussions > Subject: Re: [Flightgear-devel] JSBSim merge > > On Mon, 2011-01-24 at 15:40 +, James Turner wrote: > &g

Re: [Flightgear-devel] JSBSim merge

2011-01-26 Thread Erik Hofman
On Wed, 2011-01-26 at 12:23 +, James Turner wrote: > On 26 Jan 2011, at 11:55, Erik Hofman wrote: > > > After a bit of discussion it was decided that the FlightGear/JSBSim glue > > code in JSBSim.[ch]xx located in FlightGear/src/FDM/JSBSim now is > > maintained by FlightGear developers instead

Re: [Flightgear-devel] JSBSim merge

2011-01-26 Thread James Turner
On 26 Jan 2011, at 11:55, Erik Hofman wrote: > After a bit of discussion it was decided that the FlightGear/JSBSim glue > code in JSBSim.[ch]xx located in FlightGear/src/FDM/JSBSim now is > maintained by FlightGear developers instead of by JSBSim developers and > therefore these files will not be

Re: [Flightgear-devel] JSBSim merge

2011-01-26 Thread Erik Hofman
On Mon, 2011-01-24 at 15:40 +, James Turner wrote: > Okay - I'm going to re-apply my patches locally, and also apply Andreas > Gaeb's NaN fixes (and to the release branch too), but of course they all need > to be merged to JSBSim proper. After a bit of discussion it was decided that the Fli

Re: [Flightgear-devel] JSBSim merge

2011-01-24 Thread James Turner
On 24 Jan 2011, at 09:20, Erik Hofman wrote: > Indeed, main development takes place at www.jsbsim.org and the code is > copied over the FlightGear regularly. Adding patches to FlightGear's > JSBSim code will be overwritten then. > > I'll forward this message to the JSBSim mailinglist for discuss

Re: [Flightgear-devel] JSBSim merge

2011-01-24 Thread Erik Hofman
On Mon, 2011-01-24 at 08:30 +, James Turner wrote: > For Erik, and any other JSB-aware folks who might be reading, > > My fix for (FlightGear) bug #204 got over-written by Erik's recent JSBSim > merge - I was reminded about this at the time, but forgot to ask this > question then. What's th

[Flightgear-devel] JSBSim merge

2011-01-24 Thread James Turner
For Erik, and any other JSB-aware folks who might be reading, My fix for (FlightGear) bug #204 got over-written by Erik's recent JSBSim merge - I was reminded about this at the time, but forgot to ask this question then. What's the appropriate way to get this change reviewed and into JSBSim mai