Re: [Flightgear-devel] Issues with compiling on Gentoo 64
On Sun, 27 Jun 2010, Jason Cox wrote: > Thanks for that. > I have just been using a "git clone" and letting it decide on what was > the working copy. I think it used v2.0.0-r4 or something. > > All 3 were done the same, I will change them to "next". The following instructions are for the FlightGear and SimGear soource repositories. In the fgdata repository the branch you want to track is called master. Changing to the 'next' branch for the first time would be two commands (in your clone): git branch -t -l next origin/next git checkout next Where git branch ... give you a local branch named 'next' that tracks the 'next' branch in the master repository. git checkout next switches the work directory of your local repository to your new 'next' branch. To update your local 'next' you do (assuming that that is your currenty checkedout branch - check with git branch) git pull (which fetches the latest commits from origin/next and merges them intoyour next branch); or if you have local commits that you want to keep on top of the official ones git fetch git rebase origin/next (where the first fetches the latest commits to the origin/next branch in your local repository and the second updates your next branch to be like origin/next but with your local commits on top. NOTE: Do not rebase commits that you have pushed to a public repository!) Cheers, Anders -- --- Anders Gidenstam WWW: http://www.gidenstam.org/FlightGear/ -- This SF.net email is sponsored by Sprint What will you do first with EVO, the first 4G phone? Visit sprint.com/first -- http://p.sf.net/sfu/sprint-com-first ___ Flightgear-devel mailing list Flightgear-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/flightgear-devel
Re: [Flightgear-devel] Issues with compiling on Gentoo 64
Thanks for that. I have just been using a "git clone" and letting it decide on what was the working copy. I think it used v2.0.0-r4 or something. All 3 were done the same, I will change them to "next". only other nice thing would be a cut down of the fgdata so that I got only minimal data and do the whole shooting match as it is quite extensive and I tend to only fly with the default. any way thats the wish list, now back to seeing if using next branch works better Jason On Sat, 2010-06-26 at 13:36 +0200, Torsten Dreyer wrote: > > these were both pulled down from gitourious today with a git clone > > > command. > > Be sure to clone the branch 'next' from FlightGear and SimGear. This > is the branch for the latest changes. > > > > > > PS. is there a better way of doing things apart from git pull and > > > getting everything ever committed being downloaded in to my local > copy? > > git clone --depth 1 myurl > > Quote from the manpage: > > --depth > > Create a shallow clone with a history truncated to the specified > number of revisions. A shallow repository has a number of limitations > (you cannot clone or fetch from it, nor push from nor into it), but is > adequate if you are only interested in the recent history of a large > project with a long history, and would want to send in fixes as > patches. > > HTH, Torsten > > -- > This SF.net email is sponsored by Sprint > What will you do first with EVO, the first 4G phone? > Visit sprint.com/first -- http://p.sf.net/sfu/sprint-com-first > ___ Flightgear-devel mailing list > Flightgear-devel@lists.sourceforge.net > https://lists.sourceforge.net/lists/listinfo/flightgear-devel -- This SF.net email is sponsored by Sprint What will you do first with EVO, the first 4G phone? Visit sprint.com/first -- http://p.sf.net/sfu/sprint-com-first ___ Flightgear-devel mailing list Flightgear-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/flightgear-devel
Re: [Flightgear-devel] Issues with compiling on Gentoo 64
> these were both pulled down from gitourious today with a git clone > command. Be sure to clone the branch 'next' from FlightGear and SimGear. This is the branch for the latest changes. > > PS. is there a better way of doing things apart from git pull and > getting everything ever committed being downloaded in to my local copy? git clone --depth 1 myurl Quote from the manpage: --depth Create a shallow clone with a history truncated to the specified number of revisions. A shallow repository has a number of limitations (you cannot clone or fetch from it, nor push from nor into it), but is adequate if you are only interested in the recent history of a large project with a long history, and would want to send in fixes as patches. HTH, Torsten -- This SF.net email is sponsored by Sprint What will you do first with EVO, the first 4G phone? Visit sprint.com/first -- http://p.sf.net/sfu/sprint-com-first___ Flightgear-devel mailing list Flightgear-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/flightgear-devel
Re: [Flightgear-devel] Issues with compiling on Gentoo 64
Jason Cox wrote: > 1. is simgear-cs & flightgear-cs still required or cn I just use th > gitorious versions? "simgear-cs" is just a customized version of SimGear for "terragear-cs" to run headless if you don't have a $DISPLAY available. It's not required for general operation of FlightGear. Cheers, Martin. -- Unix _IS_ user friendly - it's just selective about who its friends are ! -- -- This SF.net email is sponsored by Sprint What will you do first with EVO, the first 4G phone? Visit sprint.com/first -- http://p.sf.net/sfu/sprint-com-first ___ Flightgear-devel mailing list Flightgear-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/flightgear-devel
Re: [Flightgear-devel] Issues with compiling on Gentoo 64
these were both pulled down from gitourious today with a git clone command. I am also not that familure with git. I have now run git checkout v2.0.0 and restarted the compile and all seams well. I do miss (however am glad to be off) cvs where a simple cvs up solved most issues :) Jason PS. is there a better way of doing things apart from git pull and getting everything ever committed being downloaded in to my local copy? On Sat, 2010-06-26 at 02:17 +0200, Csaba Halász wrote: > On Sat, Jun 26, 2010 at 2:07 AM, Jason Cox wrote: > > > > 2. I get the fillowing compile issue when building the gitorious version > > of Flightgear. Any ideas on how to solve? > > You need to have matching simgear and flightgear as usual. No changes there. > Check your simgear. Cf: > http://gitorious.org/fg/simgear/blobs/next/simgear/route/waypoint.hxx > line 136. > -- This SF.net email is sponsored by Sprint What will you do first with EVO, the first 4G phone? Visit sprint.com/first -- http://p.sf.net/sfu/sprint-com-first ___ Flightgear-devel mailing list Flightgear-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/flightgear-devel
Re: [Flightgear-devel] Issues with compiling on Gentoo 64
On Sat, Jun 26, 2010 at 2:07 AM, Jason Cox wrote: > > 2. I get the fillowing compile issue when building the gitorious version > of Flightgear. Any ideas on how to solve? You need to have matching simgear and flightgear as usual. No changes there. Check your simgear. Cf: http://gitorious.org/fg/simgear/blobs/next/simgear/route/waypoint.hxx line 136. -- Csaba/Jester -- This SF.net email is sponsored by Sprint What will you do first with EVO, the first 4G phone? Visit sprint.com/first -- http://p.sf.net/sfu/sprint-com-first ___ Flightgear-devel mailing list Flightgear-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/flightgear-devel
[Flightgear-devel] Issues with compiling on Gentoo 64
Hi all, after a rebuild of my box I am finaly getting back to FG and building scenery. I have noticed the move to GIT and so have a few questions. 1. is simgear-cs & flightgear-cs still required or cn I just use th gitorious versions? 2. I get the fillowing compile issue when building the gitorious version of Flightgear. Any ideas on how to solve? make[2]: Entering directory `/data/tg/flightgear/src/Autopilot' g++ -DHAVE_CONFIG_H -I. -I../../src/Include -I../.. -I../../src -I/usr/local/include -g -O2 -D_REENTRANT -MT route_mgr.o -MD -MP -MF .deps/route_mgr.Tpo -c -o route_mgr.o route_mgr.cxx route_mgr.cxx: In member function 'void FGRouteMgr::setWaypointTargetAltitudeFt(unsigned int, int)': route_mgr.cxx:649: error: 'class SGWayPoint' has no member named 'setTargetAltFt' make[2]: *** [route_mgr.o] Error 1 make[2]: Leaving directory `/data/tg/flightgear/src/Autopilot' make[1]: *** [all-recursive] Error 1 make[1]: Leaving directory `/data/tg/flightgear/src' Jason Cox -- This SF.net email is sponsored by Sprint What will you do first with EVO, the first 4G phone? Visit sprint.com/first -- http://p.sf.net/sfu/sprint-com-first ___ Flightgear-devel mailing list Flightgear-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/flightgear-devel
