On Fri, 1 Feb 2013 04:19:31 +0100, Arnt wrote in message
<20130201041931.748e1...@celsius.lan>:
> On Fri, 1 Feb 2013 02:28:40 +0100, Arnt wrote in message
> <20130201022840.5e985...@celsius.lan>:
>
> > On Thu, 31 Jan 2013 22:05:02 +0100, Arnt wrote in message
> > <20130131220502.2537d...@celsius.lan>:
> >
> > > second, you require svn (and cvs?) to do
> > > svn co, that can be done with git svn clone -s, for cvs et
> > > al I'll need to chk, I guess you want your Windroid script
> > > kiddies ;oD to use the one git, not 3 different kindsa svn,
> > > cvs etc to build (the) _one_ Flight Sim.
> >
> > ..subversive ;o) patch:
> > arnt@celsius:~/FG-git$ ll su* &&md5sum su*
> > -rw-r--r-- 1 arnt arnt 4311 Feb 1 00:40
> > subversion-of-svn-4-makefg-1.3.12a.patch
> > d02880ea23df9bd982f4f778aa7accc8
> > subversion-of-svn-4-makefg-1.3.12a.patch
> > arnt@celsius:~/FG-git$
> >
> > ..motivation, background and recipe ideas:
> > http://trac.parrot.org/parrot/wiki/git-svn-tutorial
> > http://stackoverflow.com/questions/3239759/checkout-remote-branch-using-git-svn
> > http://git.or.cz/course/svn.html
> > http://www.kernel.org/pub/software/scm/git/docs/git-svn.html
> >
> > ..cvs is a _lot_ messier...
> >
> > ..and I'm still stuck on discovering system OSG.
>
> ..I got one step further:
> arnt@celsius:~$ osgversion --version-number
> 3.0.1
> arnt@celsius:~$ which osgversion
> /usr/bin/osgversion
> arnt@celsius:~$
...and found this: ;o)
http://svn.tevs.eu/osgPPU/trunk/CMakeModules/OsgPPUMacroUtils.cmake
..now, where do I the _total_ cmake newbie stick up this?
--
..med vennlig hilsen = with Kind Regards from Arnt Karlsen
...with a number of polar bear hunters in his ancestry...
Scenarios always come in sets of three:
best case, worst case, and just in case.
--- makefg-1.3.12 2013-02-01 00:07:53.196781629 +0100
+++ makefg-1.3.12a 2013-02-01 00:34:16.456595377 +0100
@@ -85,8 +85,9 @@
# 2012-08-07 - Fix to build TG - added SG directory export
# 2012-10-31 - Some fixes to run in fgx.ch - if PLIB_PATH="", set ADDPLIBDIRS
# 2013-01-02 - Fix SG libraries names, and adjust FGRUN cmake step
-SCDATE="2013-01-02"
-SCVERSION="1.3.12"
+# 2013-02-01 - ..ditch subversion and "svn co " for "git svn clone -s "
+SCDATE="2013-02-01"
+SCVERSION="1.3.12a"
#
# 2009-10-31 - allow option to use alternate OpenAL sources
# OpenAL-Soft 1.9.563 compiled from source from http://kcat.strangesoft.net/openal.html
@@ -460,7 +461,7 @@
install_svn_boost()
{
- svn co http://svn.boost.org/svn/boost/trunk boost-trunk
+ git svn clone -s http://svn.boost.org/svn/boost/trunk boost-trunk
if [ -d boost-trunk ]; then
cd boost-trunk
if [ -f bootstrap.sh ]; then
@@ -482,8 +483,8 @@
pgm_exit
fi
cd "$CBD/install"
- echo2 "$BN: Running svn co http://svn.boost.org/svn/boost/trunk boost"
- svn co http://svn.boost.org/svn/boost/trunk boost
+ echo2 "$BN: Running git svn clone -s http://svn.boost.org/svn/boost/trunk boost"
+ git svn clone -s http://svn.boost.org/svn/boost/trunk boost
if [ -d boost ]; then
cd boost
echo2 "$BN: Moving boost headers to an 'include' directory..."
@@ -2988,7 +2989,7 @@
LIST2="libglut3-dev libopenal-dev libalut-dev libalut0 libfltk1.1-dev"
LIST3="libfltk1.1 zlib1g-dev zlib1g libwxgtk2.8-0 libwxgtk2.8-dev"
LIST4="libjpeg62-dev libjpeg62 libxi-dev libxi6 libxmu-dev libxmu6"
- LIST5="fluid gawk gettext gcc g++ cmake cvs subversion"
+ LIST5="fluid gawk gettext gcc g++ cmake cvs"
LIST6="git-core curl xlibmesa-gl-dev freeglut3-dev glutg3-dev libglut3-dev xorg-dev"
LIST7="libalut-dev zlib1g-dev libtiff4 libtiff4-dev libtiff-tools libtiff-opengl"
if [ "$DISTRIB_RELEASE" = "8.04" ]; then
@@ -3057,7 +3058,7 @@
# PLIB_SOURCE_DIR=plib-1.8.5 OR plib, depending on PLIBTRUNK
# INSTALL_DIR_PLIB=$INSTALL_DIR/$PLIB_SOURCE_DIR
cd "$CBD"
-#svn co http://plib.svn.sourceforge.net/svnroot/plib/trunk plib
+#git svn clone -s http://plib.svn.sourceforge.net/svnroot/plib/trunk plib
#cd plib
if [ "$PLIBADD" = "1" ] && [ `is_in_args "PLIB"` -gt "0" ] ; then
echo2 "$BN: Processing PLIB ..."
@@ -3076,9 +3077,9 @@
fi
else
# need to do a CHECKOUT
- echo2 "$BN: PLIB checkout with svn co http://plib.svn.sourceforge.net/svnroot/plib/trunk $PLIB_SOURCE_DIR"
+ echo2 "$BN: PLIB checkout with git svn clone -s http://plib.svn.sourceforge.net/svnroot/plib/trunk $PLIB_SOURCE_DIR"
echo2 "$BN: Doing PLIB checkout of trunk ... moment..."
- svn co http://plib.svn.sourceforge.net/svnroot/plib/trunk $PLIB_SOURCE_DIR
+ git svn clone -s http://plib.svn.sourceforge.net/svnroot/plib/trunk $PLIB_SOURCE_DIR
PLIBCO=1
echo2 "$BN: Done plib checkout. Force SG/FG AUTO and CLEAN"
SGAUTO=1
@@ -3215,11 +3216,11 @@
fi
if [ ! -d $OSG_SOURCE_DIR ]; then
echo2 "This is a NEW svn download of OSG..."
- echo2 "CMD: svn co $OSG_SVN $OSG_SOURCE_DIR"
+ echo2 "CMD: git svn clone -s $OSG_SVN $OSG_SOURCE_DIR"
ask
echo2 "Doing svn download of OSG ... moment ..."
- echo2 "CMD: svn co $OSG_SVN $OSG_SOURCE_DIR"
- svn co $OSG_SVN $OSG_SOURCE_DIR
+ echo2 "CMD: git svn clone -s $OSG_SVN $OSG_SOURCE_DIR"
+ git svn clone -s $OSG_SVN $OSG_SOURCE_DIR
echo2 "Done OSG svn checkout ..."
# echo2 "As this a FRESH checkout, you may have to run this script again,"
# echo2 "to get OpenThreads, and other things to build correctly..."
@@ -3259,8 +3260,8 @@
# use OSG_SVN_DATA and OSG_DATA_DIR to also download the examples data
if [ ! -d $OSG_DATA_DIR ]; then
echo2 "Doing svn download of OSG DATA... moment ..."
- echo2 "CMD: svn co $OSG_SVN_DATA $OSG_DATA_DIR"
- svn co $OSG_SVN_DATA $OSG_DATA_DIR
+ echo2 "CMD: git svn clone -s $OSG_SVN_DATA $OSG_DATA_DIR"
+ git svn clone -s $OSG_SVN_DATA $OSG_DATA_DIR
echo2 "Done svn OSG DATA checkout ..."
if [ ! -d $OSG_DATA_DIR ] ; then
echo2 "ERROR: No $OSG_DATA_DIR!"
------------------------------------------------------------------------------
Everyone hates slow websites. So do we.
Make your web apps faster with AppDynamics
Download AppDynamics Lite for free today:
http://p.sf.net/sfu/appdyn_d2d_jan
_______________________________________________
Flightgear-devel mailing list
Flightgear-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/flightgear-devel
