by callahanp » Sat May 11, 2013 4:19 am
I'll send three patches off to Francesco later this weekend after I've had a chance to test them.
It looks like fgmeta on gitorious.org/fg has not been kept up to date. It currently has version 1.9-4
Francesco's currently at script version 1.9-10. This is known to work on ubuntu12.10. I'm currently trying it for the first time on 13.04.
wget http://assistenza.larasrl.net/brisa/fgfs/download_and_compile.sh
Here's the patches I plan to test late Sunday, 12-May.
patch_1.9-10-01-options_c_and_w_bugfix.patch
The order of the options is wrong. the c and w options are not quite right.
you can use the script as iswithout them and everyting will be ok.
fixing the order makes them work.
patch_1.9-10-02_plib_svn_sourceforge_issue_fix.patch
sourceforge ocassionally will give error messages when downloading plib. Adding a / at the end of the plib url fixes this.
patch_1.9-10-03_osg_svn_url_change.patch
http://svn.openscenegraph.org/osg/OpenSceneGraph/tags/OpenSceneGraph-3.0.1/ is the correct url for OpenSceneGraph
--- download_and_compile.sh 2013-03-20 22:16:58.465911078 -0400
+++ download_and_compile-01-options_c_and_w_bugfix.sh 2013-03-20 22:18:34.313908801 -0400
@@ -52,7 +52,7 @@
WITH_EVENT_INPUT=""
WITH_OPENRTI=""
-while getopts "suhcgeixvw:p:a:d:r:j:O:" OPTION
+while getopts "suhgeixvwc:p:a:d:r:j:O:" OPTION
do
case $OPTION in
s)
@@ -192,6 +192,9 @@
echo "* -O X Add -OX to the make compilation default=None"
echo "* -r y|n y=reconfigure programs before compiling them n=do not reconfigure default=y"
echo "* -s compile only last stable known versions default=y"
+ echo "* -w cmake verbose option"
+ echo "* -x set -x bash option"
+ echo "* -v set -v bash option"
exit
fi
--- download_and_compile.sh 2013-03-21 18:18:40.261517454 -0400
+++ download_and_compile-02_plib_svn_sourceforge_issue_fix.sh 2013-03-21 18:19:57.341517604 -0400
@@ -370,7 +370,7 @@
cd "$CBD"
-#svn co http://plib.svn.sourceforge.net/svnroot/plib/trunk plib
+#svn co http://plib.svn.sourceforge.net/svnroot/plib/trunk/ plib
if [[ "$(declare -p WHATTOBUILD)" =~ '['([0-9]+)']="PLIB"' ]]
then
@@ -401,7 +401,7 @@
cd -
else
echo -n "DOWNLOADING FROM http://plib.svn.sourceforge.net ..." >> $LOGFILE
- svn $PLIB_STABLE_REVISION_ co http://plib.svn.sourceforge.net/svnroot/plib/trunk plib
+ svn $PLIB_STABLE_REVISION_ co http://plib.svn.sourceforge.net/svnroot/plib/trunk/ plib
#cat plib/src/util/ul.h | sed s/"PLIB_TINY_VERSION 5"/"PLIB_TINY_VERSION 6"/g > ul.h-v1.8.6
#mv ul.h-v1.8.6 plib/src/util/ul.h
echo " OK" >> $LOGFILE
--- download_and_compile.sh 2013-05-10 22:55:31.059287572 -0400
+++ download_and_compile-1.9-10-osg_svn_url_change.sh 2013-05-10 22:58:36.767287931 -0400
@@ -140,7 +140,7 @@
#######################################################
# Last stable revision: currently FlightGear 2.4.0 with 3.0.1
PLIB_STABLE_REVISION="2172"
-OSG_STABLE_REVISION="http://www.openscenegraph.org/svn/osg/OpenSceneGraph/tags/OpenSceneGraph-3.0.1"
+OSG_STABLE_REVISION="http://svn.openscenegraph.org/osg/OpenSceneGraph/tags/OpenSceneGraph-3.0.1/"
# common stable branch for flightgear, simgear and fgdata
FGSG_STABLE_GIT_BRANCH="release/2.8.0"
@@ -164,7 +164,7 @@
FGCOMGUI_STABLE_REVISION="46"
# Current developer revision: latest FlightGear GIT (2.5.0) with OSG 3.0.1
-OSG_UNSTABLE_REVISION="http://www.openscenegraph.org/svn/osg/OpenSceneGraph/tags/OpenSceneGraph-3.0.1"
+OSG_UNSTABLE_REVISION="http://svn.openscenegraph.org/osg/OpenSceneGraph/tags/OpenSceneGraph-3.0.1/"
#######################################################
# set script to stop if an error occours