Re: [Flightgear-devel] Re: JSBSim cp2fg script and Makefile
OK, blonde moment. -- Ross On Wed, 2001-11-28 at 21:09, Ross Golder wrote: On Mon, 2001-11-26 at 17:51, Ross Golder wrote: I'm just making sure the Makefile.linux system works, then I'll get back onto the GNU auto* stuff, as long as everyone's happy that it'll be wanted. OK. Started with a fresh JSBSim checkout. The Makefile.linux is pretty out-of-date, and basically, broken. The attached patch gets things moving a bit further, but basically, I don't think this system is anywhere near as flexible as automake, so I'll be concentrating on that from now on. However, this patch out to be committed, as it still represents a step forward. Perhaps, Jon, you could grant user 'rossigee' commit access which would speed things up a bit, and make me feel less like my contributions are just being ignored (my improved cp2fg script still hasn't made it into CVS yet!!!). Thanks, -- Ross ___ Flightgear-devel mailing list [EMAIL PROTECTED] http://mail.flightgear.org/mailman/listinfo/flightgear-devel Index: Makefile.linux === RCS file: /cvsroot/jsbsim/JSBSim/Makefile.linux,v retrieving revision 1.1 diff -u -r1.1 Makefile.linux --- Makefile.linux 2000/05/04 11:36:19 1.1 +++ Makefile.linux 2001/11/28 21:18:16 @@ -1,59 +1,39 @@ INCLUDES = -I. -LINKDIR= -Lfiltersjb +LINKDIR = -Lfiltersjb +CCOPTS = -Wall +CC = g++ + +JSBSim_objects = \ + FGAircraft.o \ + FGAtmosphere.o \ + FGCoefficient.o \ + FGFCS.o \ + FGFDMExec.o \ + FGModel.o \ + FGOutput.o \ + FGPosition.o \ + FGRotation.o \ + FGState.o \ + FGTranslation.o \ + FGUtility.o \ + FGEngine.o \ + FGTank.o \ + FGAuxiliary.o \ + FGfdmSocket.o \ + FGConfigFile.o \ + FGInitialCondition.o \ + FGLGear.o \ + FGMatrix33.o -JSBSim_objects = FGAircraft.o FGAtmosphere.o FGCoefficient.o FGFCS.o FGFDMExec.o\ - FGModel.o FGOutput.o FGPosition.o FGRotation.o FGState.o FGTranslation.o\ - FGUtility.o FGEngine.o FGTank.o FGAuxiliary.o FGfdmSocket.o\ - FGConfigFile.o FGInitialCondition.o FGLGear.o FGMatrix.o FGTrimLong.o - JSBSim : $(JSBSim_objects) JSBSim.o cd filtersjb make cd .. - g++ $(INCLUDES) $(CCOPTS) $(LINKDIR) $(JSBSim_objects) JSBSim.o -oJSBSim -lm -lFCSComponents -FGAircraft.o : FGAircraft.cpp - g++ $(INCLUDES) $(CCOPTS) -c FGAircraft.cpp -FGAtmosphere.o : FGAtmosphere.cpp - g++ $(INCLUDES) $(CCOPTS) -c FGAtmosphere.cpp -FGAuxiliary.o : FGAuxiliary.cpp - g++ $(INCLUDES) $(CCOPTS) -c FGAuxiliary.cpp -FGCoefficient.o : FGCoefficient.cpp - g++ $(INCLUDES) $(CCOPTS) -c FGCoefficient.cpp -FGFCS.o : FGFCS.cpp - g++ $(INCLUDES) $(CCOPTS) -c FGFCS.cpp -FGFDMExec.o : FGFDMExec.cpp - g++ $(INCLUDES) $(CCOPTS) -c FGFDMExec.cpp -FGModel.o : FGModel.cpp - g++ $(INCLUDES) $(CCOPTS) -c FGModel.cpp -FGOutput.o : FGOutput.cpp - g++ $(INCLUDES) $(CCOPTS) -c FGOutput.cpp -FGPosition.o : FGPosition.cpp - g++ $(INCLUDES) $(CCOPTS) -c FGPosition.cpp -FGRotation.o : FGRotation.cpp - g++ $(INCLUDES) $(CCOPTS) -c FGRotation.cpp -FGState.o : FGState.cpp - g++ $(INCLUDES) $(CCOPTS) -c FGState.cpp -FGTranslation.o : FGTranslation.cpp - g++ $(INCLUDES) $(CCOPTS) -c FGTranslation.cpp -FGUtility.o : FGUtility.cpp - g++ $(INCLUDES) $(CCOPTS) -c FGUtility.cpp -FGEngine.o : FGEngine.cpp - g++ $(INCLUDES) $(CCOPTS) -c FGEngine.cpp -FGTank.o : FGTank.cpp - g++ $(INCLUDES) $(CCOPTS) -c FGTank.cpp -FGInitialCondition.o : FGInitialCondition.cpp - g++ $(INCLUDES) $(CCOPTS) -c FGInitialCondition.cpp -FGfdmSocket.o : FGfdmSocket.cpp - g++ $(INCLUDES) $(CCOPTS) -c FGfdmSocket.cpp -FGConfigFile.o : FGConfigFile.cpp - g++ $(INCLUDES) $(CCOPTS) -c FGConfigFile.cpp -FGLGear.o : FGLGear.cpp - g++ $(INCLUDES) $(CCOPTS) -c FGLGear.cpp -FGMatrix.o : FGMatrix.cpp - g++ $(INCLUDES) $(CCOPTS) -c FGMatrix.cpp -FGTrimLong.o: FGTrimLong.cpp FGTrimLong.h - g++ $(INCLUDES) $(CCOPTS) -c FGTrimLong.cpp -JSBSim.o : JSBSim.cpp - g++ $(INCLUDES) $(CCOPTS) -c JSBSim.cpp + $(CC) $(INCLUDES) $(CCOPTS) $(LINKDIR) $(JSBSim_objects) JSBSim.o -oJSBSim -lm -lFCSComponents +$(JSBSim_objects) : %.o : %.cpp + $(CC) $(INCLUDES) $(CCOPTS) -c $ -o $@ + +JSBSim.o : JSBSim.cpp + $(CC) $(INCLUDES) $(CCOPTS) -c JSBSim.cpp clean: mv *.*~ backup @@ -62,15 +42,3 @@ all: touch *.cpp make JSBSim - -debug: - env CCOPTS=-g -WALL - make all - - - - - - - -
RE: [Flightgear-devel] Re: JSBSim cp2fg script and Makefile
contributions are just being ignored (my improved cp2fg script still hasn't made it into CVS yet!!!). Yes, it has. Jon ___ Flightgear-devel mailing list [EMAIL PROTECTED] http://mail.flightgear.org/mailman/listinfo/flightgear-devel
RE: [Flightgear-devel] Re: JSBSim cp2fg script and Makefile
OK. Started with a fresh JSBSim checkout. The Makefile.linux is pretty out-of-date, and basically, broken. The attached patch gets things moving a bit further, but basically, I don't think this system is anywhere near as flexible as automake, so I'll be concentrating on that from now on. However, this patch out to be committed, as it still represents a step forward. Perhaps, Jon, you could grant user 'rossigee' commit access which would speed things up a bit, and make me feel less like my contributions are just being ignored (my improved cp2fg script still hasn't made it into CVS yet!!!). OK. Your Makefile.linux patch has been implemented and committed. You will need to deal with Tony if there is any fallout. :-p I'd like to ask why you are using (why *anyone* is using) Makefile.linux anymore, anyhow. I have used Makefile.solo for both systems forever. It is an improvement over Makefile.linux at least in that it also takes into account header dependencies. The makemake.pl script stored in JSBSim CVS creates the Makefile.solo file. I run this script and make a new Makefile.solo file every time there is a major change in code that alters dependencies. Jon ___ Flightgear-devel mailing list [EMAIL PROTECTED] http://mail.flightgear.org/mailman/listinfo/flightgear-devel
RE: [Flightgear-devel] Re: JSBSim cp2fg script and Makefile
On Wed, 2001-11-28 at 21:20, BERNDT, JON S. (JON) (JSC-EX) (LM) wrote: contributions are just being ignored (my improved cp2fg script still hasn't made it into CVS yet!!!). Yes, it has. Sorry, you're right, it has. My bad. Thanks for committing the Makefile.linux, and here's a fresh version of the autoconf/automake scripts. Also, automake is getting confused between JSBSim.cpp (which contains main()), and JSBSim.cxx (the FDM interface). At link time, it creates the JSBSim.o, then overwrites it when it compiles the next one. Could one or other of these files be renamed for clarity? Cheers, -- Ross extrafiles.tar.gz Description: GNU Zip compressed data
RE: [Flightgear-devel] Re: JSBSim cp2fg script and Makefile
Also, automake is getting confused between JSBSim.cpp (which contains main()), and JSBSim.cxx (the FDM interface). At link time, it creates the JSBSim.o, then overwrites it when it compiles the next one. Could one or other of these files be renamed for clarity? No chance. First (but not the greatest), is that we would lose CVS history on the file[s]. The automake/autoconf setup for FlightGear works very nicely, so I assume you are talking about an automake/autoconf setup for JSBSim development only. There is no need to even *look* at anything with a .cxx extension when dealing with JSBSim development. The JSBSim.cxx file is not compiled into the libJSBSim.a library in FlightGear compilation, either. Ignore this file. Jon ___ Flightgear-devel mailing list [EMAIL PROTECTED] http://mail.flightgear.org/mailman/listinfo/flightgear-devel
RE: [Flightgear-devel] Re: JSBSim cp2fg script and Makefile
Ross Golder writes: OK, that certainly makes things easier. Here's an updated top-level Makefile.am. BTW, you can rename without losing history. You just have to move the RCS file in the CVS repository. coughSourceForge/cough And if theres no need to even *look* at anything with a .cxx extension, why is it there at all? Probably just to confuse dumb-asses like me :) This file is the interface between flightgear and JSBSim so it is used only when compiling flightgear and JSBSim together. It can be directly affected changes in JSBsim and directly affected by changes in FlightGear so which side should own the official master copy has been lightly debated and Jon and Tony were the loudest dogs (dilbert reference) so they won the debate. (There was a dilbert cartoon once where dogbert always got his way because he was a VERY LOUD DOG) To be fair, there are valid reasons on both sides so I guess we just need pick one (it was already in JSBSim so that's where it stayed) and stick with it and make the best of it. Regards, Curt. -- Curtis Olson Intelligent Vehicles Lab FlightGear Project Twin Cities[EMAIL PROTECTED] [EMAIL PROTECTED] Minnesota http://www.menet.umn.edu/~curt http://www.flightgear.org ___ Flightgear-devel mailing list [EMAIL PROTECTED] http://mail.flightgear.org/mailman/listinfo/flightgear-devel
RE: [Flightgear-devel] Re: JSBSim cp2fg script and Makefile
In the past, we've talked about removing JSBSim.cxx from the JSBSim distro completely, especially since it cannot be compiled there (much less tested). Yep. Right now we are in sort of a Mexican standoff situation. JSBSim.cxx exists only to support JSBSim. However, JSBSim.cxx is not compiled by anything other than FGFS. But ... but ... It's a chicken and egg thing. Jon ___ Flightgear-devel mailing list [EMAIL PROTECTED] http://mail.flightgear.org/mailman/listinfo/flightgear-devel
Re: [Flightgear-devel] Re: JSBSim cp2fg script and Makefile
This file is the interface between flightgear and JSBSim so it is used only when compiling flightgear and JSBSim together. It can be directly affected changes in JSBsim and directly affected by changes in FlightGear so which side should own the official master copy has been lightly debated and Jon and Tony were the loudest dogs (dilbert reference) so they won the debate. (There was a dilbert cartoon once where dogbert always got his way because he was a VERY LOUD DOG) JSBSim.cxx, JSBSim.cpp? what's in a name?? and here I was thinking I was losing my mind. Spent last evening looking at the FDM code to scope out changes required to add turbine engines and get the engine parameters to the EICAS displays. Making minor/test changes to the source (in JSBSim.cxx) and wondering what was happening when nothing seemed to work in fgfs; bad make files? paths? very very frustrating. No problem with the approach but how about a warning/caution for all newbie developers someplace on the website that this situation exists? Regards John W. ___ Flightgear-devel mailing list [EMAIL PROTECTED] http://mail.flightgear.org/mailman/listinfo/flightgear-devel
RE: [Flightgear-devel] Re: JSBSim cp2fg script and Makefile
Sorry :-) JSBSim.cxx is the interface (a.k.a. The Bus) that acts as the conduit for data trasnfer between JSBSim and FlightGear. It is not used in teh standalone version of JSBSim. JSBSim.cpp is the driver program that instantiates and runs JSBSim standalone. It is not used with FlightGear. Jon JSBSim.cxx, JSBSim.cpp? what's in a name?? and here I was thinking I was losing my mind. Spent last evening looking at the FDM code to scope out ___ Flightgear-devel mailing list [EMAIL PROTECTED] http://mail.flightgear.org/mailman/listinfo/flightgear-devel
Re: [Flightgear-devel] Re: JSBSim cp2fg script and Makefile
Sorry :-) No problem, it was kind of a weird evening from the start.. plus had a disc failure the day before and I don't think my backup was fully in sync with a few of the files I could retrieve. Looking back through all the source in .cpp and .cxx the diff is clearer with the new understanding.. JSBSim.cxx is the interface (a.k.a. The Bus) that acts as the conduit for data trasnfer between JSBSim and FlightGear. It is not used in teh standalone version of JSBSim. JSBSim.cpp is the driver program that instantiates and runs JSBSim standalone. It is not used with FlightGear. So then, to migrate changes in JSBSim.cpp to JSBSim.cxx is a manual process?? and changes to the other .cpp and .h files are picked up by the respective makefiles when building fgfs and the standalone jsbsim? And, finally, is JSBSim.cxx work-in-progress, i.e. the databus is not fully populated or there are more e-set_xxx(eng-get(...) )to code? BTW: has the problem with the c310 twin engine models been resolved? Regards John W. ___ Flightgear-devel mailing list [EMAIL PROTECTED] http://mail.flightgear.org/mailman/listinfo/flightgear-devel
RE: [Flightgear-devel] Re: JSBSim cp2fg script and Makefile
So then, to migrate changes in JSBSim.cpp to JSBSim.cxx is a manual process?? This is not something one would normally do. JSBSim.cpp is sort of a driver program that initializes an instance of FGFDMExec and then reads a script or an initialization file and just runs (calls a FGFDMExec::Run() repeatedly) - it's batch, not realtime. Useful for testing and educational purposes. JSBSim.cxx also instantiates an instance of FGFDMExec, and calls the Run() method periodically as directed by FlightGear, but it also copies important data between JSBSim and FGFS. and changes to the other .cpp and .h files are picked up by the respective makefiles when building fgfs and the standalone jsbsim? And, finally, is JSBSim.cxx work-in-progress, i.e. the databus is not fully populated or there are more e-set_xxx(eng-get(...) )to code? The data bus is probably populated enough for your purposes (?). If not, it can likely be made to do so fast enough. BTW: has the problem with the c310 twin engine models been resolved? Yes, I believe so. Stupid error. Check the JSBSim web site/page as mentioned below. Jon Jon Berndt Coordinator, JSBSim Project http://jsbsim.sf.net Enter BUG REPORTS at http://sf.net/tracker/?atid=119399group_id=19399 Enter FEATURE REQUESTS at http://sf.net/tracker/?atid=369399group_id=19399 ___ Flightgear-devel mailing list [EMAIL PROTECTED] http://mail.flightgear.org/mailman/listinfo/flightgear-devel
Re: [Flightgear-devel] Re: JSBSim cp2fg script and Makefile
On Wednesday 28 November 2001 04:45 pm, you wrote: So then, to migrate changes in JSBSim.cpp to JSBSim.cxx is a manual process?? This is not something one would normally do. JSBSim.cpp is sort of a driver program that initializes an instance of FGFDMExec and then reads a script or an initialization file and just runs (calls a FGFDMExec::Run() repeatedly) - it's batch, not realtime. Useful for testing and educational purposes. JSBSim.cxx also instantiates an instance of FGFDMExec, and calls the Run() method periodically as directed by FlightGear, but it also copies important data between JSBSim and FGFS. and changes to the other .cpp and .h files are picked up by the respective makefiles when building fgfs and the standalone jsbsim? And, finally, is JSBSim.cxx work-in-progress, i.e. the databus is not fully populated or there are more e-set_xxx(eng-get(...) )to code? The data bus is probably populated enough for your purposes (?). If not, it can likely be made to do so fast enough. No, not for turbine engines. More parameters are needed: N1, N2, EPR, fuel flow just as a start ... BTW: has the problem with the c310 twin engine models been resolved? Yes, I believe so. Stupid error. Check the JSBSim web site/page as mentioned below. Jon Jon Berndt Coordinator, JSBSim Project http://jsbsim.sf.net Enter BUG REPORTS at http://sf.net/tracker/?atid=119399group_id=19399 Enter FEATURE REQUESTS at http://sf.net/tracker/?atid=369399group_id=19399 ___ Flightgear-devel mailing list [EMAIL PROTECTED] http://mail.flightgear.org/mailman/listinfo/flightgear-devel -- Tony Peden [EMAIL PROTECTED] We all know Linux is great ... it does infinite loops in 5 seconds. -- attributed to Linus Torvalds ___ Flightgear-devel mailing list [EMAIL PROTECTED] http://mail.flightgear.org/mailman/listinfo/flightgear-devel
Re: [Flightgear-devel] Re: JSBSim cp2fg script and Makefile
On Wed, 2001-10-31 at 18:56, [EMAIL PROTECTED] wrote: Would you like me to send you the files to commit, or shall I commit myself? Send them. Hi Jon, I've found some time to have a have another bash at getting my FlightGear CVS stuff working again. I updated my CVS w/d to see what had been committed and what was outstanding. I see you've still not committed the new 'cp2fg' script I contributed, so here it is again. I'm just making sure the Makefile.linux system works, then I'll get back onto the GNU auto* stuff, as long as everyone's happy that it'll be wanted. -- Ross #!/bin/sh # # Copy JSBSim source into the FlightGear source tree # # Assumes you've set the environment variables: # FG_SRC=~/FlightGear/src # FG_BASE=~/fgfsbase INSTALL=cp -v # Gather or default settings. Assumes the current directory is # a JSBSim working directory, with FlightGear and fgfsbase siblings if [ x$FG_SRC = x ]; then FG_SRC=`pwd`/../FlightGear/src echo Defaulting FG_SRC to $FG_SRC fi if [ x$FG_BASE = x ]; then FG_BASE=`pwd`/../fgfsbase echo Defaulting FG_BASE to $FG_BASE fi # Check directories exist if [ ! -d $FG_SRC/FDM/JSBSim/filtersjb ]; then echo No $FG_SRC/FDM/JSBSim/filtersjb directory; mkdir $FG_SRC/FDM/JSBSim/filtersjb exit; fi if [ ! -d $FG_BASE/Engine ]; then echo No $FG_BASE/Engine directory; exit; fi for i in c172 X15 shuttle; do if [ ! -d $FG_BASE/Aircraft/$i ]; then echo No $FG_BASE/Aircraft/$i; exit; fi done # Perform the copy $INSTALL JSBSim.cxx $FG_SRC/FDM/ $INSTALL *.cpp $FG_SRC/FDM/JSBSim/ $INSTALL *.h $FG_SRC/FDM/JSBSim/ $INSTALL filtersjb/*.cpp $FG_SRC/FDM/JSBSim/filtersjb/ $INSTALL filtersjb/*.h $FG_SRC/FDM/JSBSim/filtersjb/ $INSTALL engine/*.xml $FG_BASE/Engine/ $INSTALL aircraft/c172/c172.xml $FG_BASE/Aircraft/c172/ $INSTALL aircraft/X15/X15.xml $FG_BASE/Aircraft/X15/ $INSTALL aircraft/shuttle/shuttle.xml $FG_BASE/Aircraft/shuttle/
