fly/fgmeta
1
0
Fork 0
Code Activity

Cumulative Changes from versions 1.9.5 through 1.9.10

Browse source 
Changes 1.9.5 through 1.9.10
Multiple changes restructuring parts of the script
FGRUN added to ALL list
Regular expression used to determine if a component is to be built
OPENRTI added

Fixes and changes in 1.9.10
url for plib has / at the end to prevent problems with svn
url for osg has been updated to http://svn.openscenegraph.org/osg/OpenSceneGraph/tags/OpenSceneGraph-3.0.1/
x and v options added to aid in script debugging
w option added to aid in cmake debugging
This commit is contained in:
Pat 2013-06-05 20:41:01 -04:00 committed by James Turner
parent 8f53e02e26
commit 1e183ed9de
1 changed files with 204 additions and 260 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

218
download_and_compile.sh Normal file → Executable file
View file

@ -1,7 +1,7 @@
#!/bin/bash #!/bin/bash
#* Written by Francesco Angelo Brisa, started January 2008. #* Written by Francesco Angelo Brisa, started January 2008.
# #
# Copyright (C) 2008 Francesco Angelo Brisa # Copyright (C) 2013 Francesco Angelo Brisa
# email: fbrisa@gmail.com - fbrisa@yahoo.it # email: fbrisa@gmail.com - fbrisa@yahoo.it
# #
# This program is free software: you can redistribute it and/or modify # This program is free software: you can redistribute it and/or modify
@ -17,8 +17,7 @@
# You should have received a copy of the GNU General Public License # You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>. # along with this program. If not, see <http://www.gnu.org/licenses/>.
VERSION="1.9-10"
VERSION="1.9-4"
#COMPILE GIT FGFS #COMPILE GIT FGFS
@ -30,13 +29,13 @@ VERSION="1.9-4"
# Thanks to "Pat Callahan" for patches for fgrun compilation # Thanks to "Pat Callahan" for patches for fgrun compilation
# Thanks to "F-JJTH" for bug fixes and suggestions # Thanks to "F-JJTH" for bug fixes and suggestions
# Thanks again to "F-JJTH" for OpenRTI and FGX # Thanks again to "F-JJTH" for OpenRTI and FGX
# Thanks to André, ( taureau89_9 ) for debian stable packages fixes
LOGFILE=compilation_log.txt LOGFILE=compilation_log.txt
LOGSEP="***********************************" LOGSEP="***********************************"
WHATTOBUILD= WHATTOBUILD=
WHATTOBUILDALL=( PLIB OSG OPENRTI SIMGEAR FGFS DATA FGRUN FGCOM FGCOMGUI)
UPDATE= UPDATE=
STABLE= STABLE=
@ -47,14 +46,13 @@ COMPILE="y"
RECONFIGURE="y" RECONFIGURE="y"
DOWNLOAD="y" DOWNLOAD="y"
JOPTION="" JOPTION=""
OOPTION="" OOPTION=""
DEBUG="" DEBUG=""
WITH_EVENT_INPUT="" WITH_EVENT_INPUT=""
WITH_OPENRTI="" WITH_OPENRTI=""
while getopts "suhc:p:a:d:r:j:O:gei" OPTION while getopts "suhgeixvwc:p:a:d:r:j:O:" OPTION
do do
case $OPTION in case $OPTION in
s) s)
@ -64,7 +62,7 @@ do
UPDATE="UPDATE" UPDATE="UPDATE"
;; ;;
h) h)
WHATTOBUILD="--help" HELP="HELP"
;; ;;
a) a)
APT_GET_UPDATE=$OPTARG APT_GET_UPDATE=$OPTARG
@ -96,11 +94,18 @@ do
i) i)
WITH_OPENRTI="-D ENABLE_RTI=ON" WITH_OPENRTI="-D ENABLE_RTI=ON"
;; ;;
x)
set -x
;;
v)
set -v
;;
w)
VERBOSE_MAKEFILE="-D CMAKE_VERBOSE_MAKEFILE=ON"
;;
?) ?)
echo "error" echo "error"
WHATTOBUILD="--help" HELP="HELP"
#exit #exit
;; ;;
esac esac
@ -111,24 +116,31 @@ shift $(($OPTIND - 1))
if [ ! "$#" = "0" ] if [ ! "$#" = "0" ]
then then
if [ "$WHATTOBUILD" = "" ] for arg in $*
do
#echo "$arg"
if [ "${arg^^}" == "UPDATE" ]
then then
WHATTOBUILD="$1" UPDATE="UPDATE"
else
WHATTOBUILD=( "${WHATTOBUILD[@]}" "${arg^^}" )
fi
done
else
WHATTOBUILD=( "${WHATTOBUILDALL[@]}" )
fi fi
if [ ! "$#" = "1" ] if [[ "$(declare -p WHATTOBUILD)" =~ '['([0-9]+)']="ALL"' ]]
then then
UPDATE="$2" WHATTOBUILD=( "${WHATTOBUILDALL[@]}" )
fi fi
fi #printf "%s\n" "${WHATTOBUILD[@]}"
####################################################### #######################################################
# Last stable revision: currently FlightGear 2.4.0 with 3.0.1 # Last stable revision: currently FlightGear 2.4.0 with 3.0.1
PLIB_STABLE_REVISION="2172" 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 # common stable branch for flightgear, simgear and fgdata
FGSG_STABLE_GIT_BRANCH="release/2.8.0" FGSG_STABLE_GIT_BRANCH="release/2.8.0"
@ -152,15 +164,13 @@ FGCOM_UNSTABLE_GIT_BRANCH="master"
FGCOMGUI_STABLE_REVISION="46" FGCOMGUI_STABLE_REVISION="46"
# Current developer revision: latest FlightGear GIT (2.5.0) with OSG 3.0.1 # 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 # set script to stop if an error occours
set -e set -e
if [ "$HELP" = "HELP" ]
if [ "$WHATTOBUILD" = "--help" ]
then then
echo "$0 Version $VERSION" echo "$0 Version $VERSION"
echo "Usage:" echo "Usage:"
@ -186,7 +196,6 @@ then
exit exit
fi fi
####################################################### #######################################################
####################################################### #######################################################
# Warning about compilation time and size # Warning about compilation time and size
@ -202,9 +211,6 @@ echo "* Please, be patient ...... *"
echo "* *" echo "* *"
echo "**************************************" echo "**************************************"
####################################################### #######################################################
####################################################### #######################################################
# Debian 4.0rX (Etch) backports.org # Debian 4.0rX (Etch) backports.org
@ -246,7 +252,6 @@ fi
####################################################### #######################################################
####################################################### #######################################################
echo $0 $* > $LOGFILE echo $0 $* > $LOGFILE
echo "APT_GET_UPDATE=$APT_GET_UPDATE" >> $LOGFILE echo "APT_GET_UPDATE=$APT_GET_UPDATE" >> $LOGFILE
@ -258,7 +263,6 @@ echo "JOPTION=$JOPTION" >> $LOGFILE
echo "OOPTION=$OOPTION" >> $LOGFILE echo "OOPTION=$OOPTION" >> $LOGFILE
echo "DEBUG=$DEBUG" >> $LOGFILE echo "DEBUG=$DEBUG" >> $LOGFILE
echo "$LOGSEP" >> $LOGFILE echo "$LOGSEP" >> $LOGFILE
# discovering linux # discovering linux
@ -267,12 +271,14 @@ then
. /etc/lsb-release . /etc/lsb-release
fi fi
# default is hardy # default is hardy
DISTRO_PACKAGES="libopenal-dev libalut-dev libalut0 libfltk1.3-dev libfltk1.3 cvs subversion cmake make build-essential automake zlib1g-dev zlib1g libwxgtk2.8-0 libwxgtk2.8-dev fluid gawk gettext libxi-dev libxi6 libxmu-dev libxmu6 libboost-dev libasound2-dev libasound2 libpng12-dev libpng12-0 libjasper1 libjasper-dev libopenexr-dev libboost-serialization-dev git-core libhal-dev libqt4-dev scons python-tk python-imaging-tk libsvn-dev libglew1.5-dev libxft2 libxft-dev libxinerama1 libxinerama-dev" DISTRO_PACKAGES="libopenal-dev libalut-dev libalut0 cvs subversion cmake make build-essential automake zlib1g-dev zlib1g libwxgtk2.8-0 libwxgtk2.8-dev fluid gawk gettext libxi-dev libxi6 libxmu-dev libxmu6 libboost-dev libasound2-dev libasound2 libpng12-dev libpng12-0 libjasper1 libjasper-dev libopenexr-dev libboost-serialization-dev git-core libhal-dev libqt4-dev scons python-tk python-imaging-tk libsvn-dev libglew1.5-dev libxft2 libxft-dev libxinerama1 libxinerama-dev"
UBUNTU_PACKAGES="freeglut3-dev libjpeg62-dev libjpeg62 libapr1-dev libfltk1.3-dev libfltk1.3" UBUNTU_PACKAGES="freeglut3-dev libjpeg62-dev libjpeg62 libapr1-dev libfltk1.3-dev libfltk1.3"
DEBIAN_PACKAGES="freeglut3-dev libjpeg8-dev libjpeg8 libfltk-dev libfltk1.1"
DEBIAN_PACKAGES_STABLE="freeglut3-dev libjpeg8-dev libjpeg8 libfltk1.1-dev libfltk1.1"
DEBIAN_PACKAGES_TESTING="freeglut3-dev libjpeg8-dev libjpeg8 libfltk1.3-dev libfltk1.3"
DEBIAN_PACKAGES_UNSTABLE="freeglut3-dev libjpeg8-dev libjpeg8 libfltk1.3-dev libfltk1.3"
# checking linux distro and version to differ needed packages # checking linux distro and version to differ needed packages
if [ "$DISTRIB_ID" = "Ubuntu" -o "$DISTRIB_ID" = "LinuxMint" ] if [ "$DISTRIB_ID" = "Ubuntu" -o "$DISTRIB_ID" = "LinuxMint" ]
@ -281,14 +287,20 @@ then
DISTRO_PACKAGES="$DISTRO_PACKAGES $UBUNTU_PACKAGES" DISTRO_PACKAGES="$DISTRO_PACKAGES $UBUNTU_PACKAGES"
else else
echo "DEBIAN I SUPPOUSE" >> $LOGFILE echo "DEBIAN I SUPPOUSE" >> $LOGFILE
DEBIAN_PACKAGES=$DEBIAN_PACKAGES_STABLE
if [ ! "$(apt-cache search libfltk1.3)" = "" ]
then
#TESTING MAYBE
DEBIAN_PACKAGES=$DEBIAN_PACKAGES_TESTING
fi
DISTRO_PACKAGES="$DISTRO_PACKAGES $DEBIAN_PACKAGES" DISTRO_PACKAGES="$DISTRO_PACKAGES $DEBIAN_PACKAGES"
fi fi
echo "$LOGSEP" >> $LOGFILE echo "$LOGSEP" >> $LOGFILE
if [ "$DOWNLOAD_PACKAGES" = "y" ] if [ "$DOWNLOAD_PACKAGES" = "y" ]
then then
echo -n "PACKAGE INSTALLATION ... " >> $LOGFILE echo -n "PACKAGE INSTALLATION ... " >> $LOGFILE
LIBOPENALPACKAGE=$(apt-cache search libopenal | grep "libopenal. " | sed s/\ .*//) LIBOPENALPACKAGE=$(apt-cache search libopenal | grep "libopenal. " | sed s/\ .*//)
@ -322,19 +334,8 @@ then
echo " OK" >> $LOGFILE echo " OK" >> $LOGFILE
fi fi
COMPILE_BASE_DIR=. COMPILE_BASE_DIR=.
#cd into compile base directory #cd into compile base directory
cd "$COMPILE_BASE_DIR" cd "$COMPILE_BASE_DIR"
@ -343,11 +344,9 @@ CBD=$(pwd)
LOGFILE=$CBD/$LOGFILE LOGFILE=$CBD/$LOGFILE
echo "DIRECTORY= $CBD" >> $LOGFILE echo "DIRECTORY= $CBD" >> $LOGFILE
echo "$LOGSEP" >> $LOGFILE echo "$LOGSEP" >> $LOGFILE
if [ ! -d install ] if [ ! -d install ]
then then
mkdir install mkdir install
@ -360,19 +359,17 @@ INSTALL_DIR=$CBD/$SUB_INSTALL_DIR
cd "$CBD" cd "$CBD"
mkdir -p build mkdir -p build
####################################################### #######################################################
# PLIB # PLIB
####################################################### #######################################################
PLIB_INSTALL_DIR=plib PLIB_INSTALL_DIR=plib
INSTALL_DIR_PLIB=$INSTALL_DIR/$PLIB_INSTALL_DIR INSTALL_DIR_PLIB=$INSTALL_DIR/$PLIB_INSTALL_DIR
cd "$CBD" 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 [ "$WHATTOBUILD" = "" -o "$WHATTOBUILD" = "PLIB" -o "$WHATTOBUILD" = "ALL" ] if [[ "$(declare -p WHATTOBUILD)" =~ '['([0-9]+)']="PLIB"' ]]
then then
if [ ! "$UPDATE" = "UPDATE" ] if [ ! "$UPDATE" = "UPDATE" ]
then then
@ -401,7 +398,7 @@ then
cd - cd -
else else
echo -n "DOWNLOADING FROM http://plib.svn.sourceforge.net ..." >> $LOGFILE 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 #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 #mv ul.h-v1.8.6 plib/src/util/ul.h
echo " OK" >> $LOGFILE echo " OK" >> $LOGFILE
@ -452,7 +449,6 @@ then
fi fi
fi fi
####################################################### #######################################################
# OpenSceneGraph # OpenSceneGraph
####################################################### #######################################################
@ -460,7 +456,7 @@ OSG_INSTALL_DIR=OpenSceneGraph
INSTALL_DIR_OSG=$INSTALL_DIR/$OSG_INSTALL_DIR INSTALL_DIR_OSG=$INSTALL_DIR/$OSG_INSTALL_DIR
cd "$CBD" cd "$CBD"
if [ "$WHATTOBUILD" = "" -o "$WHATTOBUILD" = "OSG" -o "$WHATTOBUILD" = "ALL" ] if [[ "$(declare -p WHATTOBUILD)" =~ '['([0-9]+)']="OSG"' ]]
then then
echo "****************************************" | tee -a $LOGFILE echo "****************************************" | tee -a $LOGFILE
echo "**************** OSG *******************" | tee -a $LOGFILE echo "**************** OSG *******************" | tee -a $LOGFILE
@ -495,7 +491,7 @@ then
cmake -D CMAKE_BUILD_TYPE="Release" -D CMAKE_CXX_FLAGS="-O3 -D__STDC_CONSTANT_MACROS" -D CMAKE_C_FLAGS="-O3" -D CMAKE_INSTALL_PREFIX:PATH="$INSTALL_DIR_OSG" ../../OpenSceneGraph/ 2>&1 | tee -a $LOGFILE cmake ${VERBOSE_MAKEFILE} -D CMAKE_BUILD_TYPE="Release" -D CMAKE_CXX_FLAGS="-O3 -D__STDC_CONSTANT_MACROS" -D CMAKE_C_FLAGS="-O3" -D CMAKE_INSTALL_PREFIX:PATH="$INSTALL_DIR_OSG" ../../OpenSceneGraph/ 2>&1 | tee -a $LOGFILE
echo "RECONFIGURE OSG DONE." >> $LOGFILE echo "RECONFIGURE OSG DONE." >> $LOGFILE
@ -531,8 +527,6 @@ then
cd - cd -
fi fi
####################################################### #######################################################
# OPENRTI # OPENRTI
####################################################### #######################################################
@ -545,7 +539,7 @@ then
mkdir "openrti" mkdir "openrti"
fi fi
if [ "$WHATTOBUILD" = "" -o "$WHATTOBUILD" = "OPENRTI" -o "$WHATTOBUILD" = "ALL" ] if [[ "$(declare -p WHATTOBUILD)" =~ '['([0-9]+)']="OPENRTI"' ]]
then then
echo "****************************************" | tee -a $LOGFILE echo "****************************************" | tee -a $LOGFILE
echo "**************** OPENRTI ***************" | tee -a $LOGFILE echo "**************** OPENRTI ***************" | tee -a $LOGFILE
@ -606,7 +600,7 @@ then
cd "$CBD"/build/openrti cd "$CBD"/build/openrti
echo -n "RECONFIGURE OPENRTI ... " >> $LOGFILE echo -n "RECONFIGURE OPENRTI ... " >> $LOGFILE
rm -f ../../openrti/openrti/CMakeCache.txt rm -f ../../openrti/openrti/CMakeCache.txt
cmake -D CMAKE_BUILD_TYPE="Release" -D CMAKE_CXX_FLAGS="-O3 -D__STDC_CONSTANT_MACROS" -D CMAKE_INSTALL_PREFIX:PATH="$INSTALL_DIR_OPENRTI" ../../openrti/openrti/ 2>&1 | tee -a $LOGFILE cmake ${VERBOSE_MAKEFILE} -D CMAKE_BUILD_TYPE="Release" -D CMAKE_CXX_FLAGS="-O3 -D__STDC_CONSTANT_MACROS" -D CMAKE_INSTALL_PREFIX:PATH="$INSTALL_DIR_OPENRTI" ../../openrti/openrti/ 2>&1 | tee -a $LOGFILE
echo " OK" >> $LOGFILE echo " OK" >> $LOGFILE
@ -629,8 +623,6 @@ then
cd - cd -
fi fi
####################################################### #######################################################
# SIMGEAR # SIMGEAR
####################################################### #######################################################
@ -643,7 +635,7 @@ then
mkdir "simgear" mkdir "simgear"
fi fi
if [ "$WHATTOBUILD" = "" -o "$WHATTOBUILD" = "SIMGEAR" -o "$WHATTOBUILD" = "ALL" ] if [[ "$(declare -p WHATTOBUILD)" =~ '['([0-9]+)']="SIMGEAR"' ]]
then then
echo "****************************************" | tee -a $LOGFILE echo "****************************************" | tee -a $LOGFILE
echo "**************** SIMGEAR ***************" | tee -a $LOGFILE echo "**************** SIMGEAR ***************" | tee -a $LOGFILE
@ -708,7 +700,7 @@ then
cd "$CBD"/build/simgear cd "$CBD"/build/simgear
echo -n "RECONFIGURE SIMGEAR ... " >> $LOGFILE echo -n "RECONFIGURE SIMGEAR ... " >> $LOGFILE
rm -f ../../simgear/simgear/CMakeCache.txt rm -f ../../simgear/simgear/CMakeCache.txt
cmake -D CMAKE_BUILD_TYPE="Release" $WITH_OPENRTI -D CMAKE_CXX_FLAGS="-O3 -D__STDC_CONSTANT_MACROS" -D CMAKE_C_FLAGS="-O3" -D CMAKE_INSTALL_PREFIX:PATH="$INSTALL_DIR_SIMGEAR" -D "CMAKE_PREFIX_PATH=$INSTALL_DIR_OSG;$INSTALL_DIR_OPENRTI" ../../simgear/simgear/ 2>&1 | tee -a $LOGFILE cmake ${VERBOSE_MAKEFILE} -D CMAKE_BUILD_TYPE="Release" $WITH_OPENRTI -D CMAKE_CXX_FLAGS="-O3 -D__STDC_CONSTANT_MACROS" -D CMAKE_C_FLAGS="-O3" -D CMAKE_INSTALL_PREFIX:PATH="$INSTALL_DIR_SIMGEAR" -D "CMAKE_PREFIX_PATH=$INSTALL_DIR_OSG;$INSTALL_DIR_OPENRTI" ../../simgear/simgear/ 2>&1 | tee -a $LOGFILE
echo " OK" >> $LOGFILE echo " OK" >> $LOGFILE
@ -731,7 +723,6 @@ then
cd - cd -
fi fi
####################################################### #######################################################
# FGFS # FGFS
####################################################### #######################################################
@ -744,7 +735,8 @@ then
mkdir "fgfs" mkdir "fgfs"
fi fi
if [ "$WHATTOBUILD" = "" -o "$WHATTOBUILD" = "FGFS" -o "$WHATTOBUILD" = "DATA" -o "$WHATTOBUILD" = "ALL" ] #if [ "$WHATTOBUILD" = "" -o "$WHATTOBUILD" = "FGFS" -o "$WHATTOBUILD" = "DATA" -o "$WHATTOBUILD" = "ALL" ]
if [[ "$(declare -p WHATTOBUILD)" =~ '['([0-9]+)']="FGFS"' || "$(declare -p WHATTOBUILD)" =~ '['([0-9]+)']="DATA"' ]]
then then
echo "****************************************" | tee -a $LOGFILE echo "****************************************" | tee -a $LOGFILE
@ -753,7 +745,7 @@ then
cd fgfs cd fgfs
if [ "$WHATTOBUILD" = "" -o "$WHATTOBUILD" = "FGFS" -o "$WHATTOBUILD" = "ALL" ] if [[ "$(declare -p WHATTOBUILD)" =~ '['([0-9]+)']="FGFS"' ]]
then then
if [ "$DOWNLOAD" = "y" ] if [ "$DOWNLOAD" = "y" ]
then then
@ -826,15 +818,9 @@ then
#cp -f utils/fgadmin/src/CMakeLists_without_err.txt utils/fgadmin/src/CMakeLists.txt #cp -f utils/fgadmin/src/CMakeLists_without_err.txt utils/fgadmin/src/CMakeLists.txt
cmake -D CMAKE_BUILD_TYPE="Release" $WITH_OPENRTI -D "WITH_FGPANEL=OFF" -D CMAKE_CXX_FLAGS="-O3 -D__STDC_CONSTANT_MACROS" -D CMAKE_C_FLAGS="-O3" -D CMAKE_INSTALL_PREFIX:PATH="$INSTALL_DIR_FGFS" -D "CMAKE_PREFIX_PATH=$INSTALL_DIR_OSG;$INSTALL_DIR_PLIB;$INSTALL_DIR_SIMGEAR;$INSTALL_DIR_OPENRTI" ../../fgfs/flightgear 2>&1 | tee -a $LOGFILE cmake ${VERBOSE_MAKEFILE} -D CMAKE_BUILD_TYPE="Release" $WITH_OPENRTI -D "WITH_FGPANEL=OFF" -D CMAKE_CXX_FLAGS="-O3 -D__STDC_CONSTANT_MACROS" -D CMAKE_C_FLAGS="-O3" -D CMAKE_INSTALL_PREFIX:PATH="$INSTALL_DIR_FGFS" -D "CMAKE_PREFIX_PATH=$INSTALL_DIR_OSG;$INSTALL_DIR_PLIB;$INSTALL_DIR_SIMGEAR;$INSTALL_DIR_OPENRTI" ../../fgfs/flightgear 2>&1 | tee -a $LOGFILE
echo " OK" >> $LOGFILE echo " OK" >> $LOGFILE
fi fi
fi fi
@ -855,8 +841,7 @@ then
fi fi
cd .. cd ..
if [[ "$(declare -p WHATTOBUILD)" =~ '['([0-9]+)']="DATA"' ]]
if [ "$WHATTOBUILD" = "" -o "$WHATTOBUILD" = "DATA" -o "$WHATTOBUILD" = "ALL" ]
then then
if [ ! "$UPDATE" = "UPDATE" ] if [ ! "$UPDATE" = "UPDATE" ]
then then
@ -898,37 +883,6 @@ then
cd .. cd ..
#cd $INSTALL_DIR_FGFS
#echo -n "GIT DATA FROM git://gitorious.org/flightgear-aircraft/c172p.git ... " >> $LOGFILE
#if [ ! -d "aircrafts" ]
#then
# mkdir "aircrafts"
# ln ../fgdata/Aircraft/Generic/ . -s
# ln ../fgdata/Aircraft/Instruments . -s
# ln ../fgdata/Aircraft/Instruments-3d/ . -s
#fi
#cd aircrafts
#if [ -d "c172p" ]
#then
# echo "c172p exists already."
#else
#
# git clone git://gitorious.org/flightgear-aircraft/c172p.git
# fi
#
# cd c172p
# git fetch origin
echo " OK" >> $LOGFILE echo " OK" >> $LOGFILE
cd "$EXDIR" cd "$EXDIR"
fi fi
@ -974,7 +928,7 @@ fi
FGO_INSTALL_DIR=fgo FGO_INSTALL_DIR=fgo
INSTALL_DIR_FGO=$INSTALL_DIR/$FGO_INSTALL_DIR INSTALL_DIR_FGO=$INSTALL_DIR/$FGO_INSTALL_DIR
cd "$CBD" cd "$CBD"
if [ "$WHATTOBUILD" = "" -o "$WHATTOBUILD" = "FGO" -o "$WHATTOBUILD" = "ALL" ] if [[ "$(declare -p WHATTOBUILD)" =~ '['([0-9]+)']="FGO"' ]]
then then
echo "****************************************" | tee -a $LOGFILE echo "****************************************" | tee -a $LOGFILE
echo "***************** FGO ******************" | tee -a $LOGFILE echo "***************** FGO ******************" | tee -a $LOGFILE
@ -1004,14 +958,13 @@ then
fi fi
####################################################### #######################################################
# FGx # FGx
####################################################### #######################################################
FGX_INSTALL_DIR=fgx FGX_INSTALL_DIR=fgx
INSTALL_DIR_FGX=$INSTALL_DIR/$FGX_INSTALL_DIR INSTALL_DIR_FGX=$INSTALL_DIR/$FGX_INSTALL_DIR
cd "$CBD" cd "$CBD"
if [ "$WHATTOBUILD" = "" -o "$WHATTOBUILD" = "FGX" ] if [[ "$(declare -p WHATTOBUILD)" =~ '['([0-9]+)']="FGX"' ]]
then then
echo "****************************************" | tee -a $LOGFILE echo "****************************************" | tee -a $LOGFILE
echo "***************** FGX ******************" | tee -a $LOGFILE echo "***************** FGX ******************" | tee -a $LOGFILE
@ -1041,7 +994,6 @@ then
cd .. cd ..
cd fgx/src/ cd fgx/src/
#Patch in order to pre-setting paths #Patch in order to pre-setting paths
@ -1100,7 +1052,6 @@ then
fi fi
####################################################### #######################################################
# FGRUN # FGRUN
####################################################### #######################################################
@ -1108,7 +1059,7 @@ FGRUN_INSTALL_DIR=fgrun
INSTALL_DIR_FGRUN=$INSTALL_DIR/$FGRUN_INSTALL_DIR INSTALL_DIR_FGRUN=$INSTALL_DIR/$FGRUN_INSTALL_DIR
cd "$CBD" cd "$CBD"
if [ "$WHATTOBUILD" = "" -o "$WHATTOBUILD" = "FGRUN" -o "$WHATTOBUILD" = "ALL" ] if [[ "$(declare -p WHATTOBUILD)" =~ '['([0-9]+)']="FGRUN"' ]]
then then
echo "****************************************" | tee -a $LOGFILE echo "****************************************" | tee -a $LOGFILE
echo "**************** FGRUN *****************" | tee -a $LOGFILE echo "**************** FGRUN *****************" | tee -a $LOGFILE
@ -1174,7 +1125,7 @@ then
echo -n "RECONFIGURE FGRUN ... " >> $LOGFILE echo -n "RECONFIGURE FGRUN ... " >> $LOGFILE
rm -f ../../fgrun/CMakeCache.txt rm -f ../../fgrun/CMakeCache.txt
cmake -D CMAKE_BUILD_TYPE="Release" -D CMAKE_CXX_FLAGS="-O3 -D__STDC_CONSTANT_MACROS" -D CMAKE_C_FLAGS="-O3" -D CMAKE_INSTALL_PREFIX:PATH="$INSTALL_DIR_FGRUN" -D "CMAKE_PREFIX_PATH=$INSTALL_DIR_OSG;$INSTALL_DIR_PLIB;$INSTALL_DIR_SIMGEAR" ../../fgrun/ 2>&1 | tee -a $LOGFILE cmake ${VERBOSE_MAKEFILE} -D CMAKE_BUILD_TYPE="Release" -D CMAKE_CXX_FLAGS="-O3 -D__STDC_CONSTANT_MACROS" -D CMAKE_C_FLAGS="-O3" -D CMAKE_INSTALL_PREFIX:PATH="$INSTALL_DIR_FGRUN" -D "CMAKE_PREFIX_PATH=$INSTALL_DIR_OSG;$INSTALL_DIR_PLIB;$INSTALL_DIR_SIMGEAR" ../../fgrun/ 2>&1 | tee -a $LOGFILE
echo " OK" >> $LOGFILE echo " OK" >> $LOGFILE
fi fi
@ -1206,8 +1157,6 @@ then
fi fi
####################################################### #######################################################
# FGCOM # FGCOM
####################################################### #######################################################
@ -1215,7 +1164,7 @@ FGCOM_INSTALL_DIR=fgcom
INSTALL_DIR_FGCOM=$INSTALL_DIR/$FGCOM_INSTALL_DIR INSTALL_DIR_FGCOM=$INSTALL_DIR/$FGCOM_INSTALL_DIR
cd "$CBD" cd "$CBD"
if [ "$WHATTOBUILD" = "ALL" -o "$WHATTOBUILD" = "FGCOM" ] if [[ "$(declare -p WHATTOBUILD)" =~ '['([0-9]+)']="FGCOM"' ]]
then then
echo "****************************************" | tee -a $LOGFILE echo "****************************************" | tee -a $LOGFILE
echo "**************** FGCOM *****************" | tee -a $LOGFILE echo "**************** FGCOM *****************" | tee -a $LOGFILE
@ -1265,15 +1214,14 @@ then
echo " OK" >> $LOGFILE echo " OK" >> $LOGFILE
cd .. cd ..
#patch for new netdb.h version. #patch for new netdb.h version.
cat fgcom/iaxclient/lib/libiax2/src/iax.c | sed s/hp-\>h_addr,/hp-\>h_addr_list[0],/g > fgcom/iaxclient/lib/libiax2/src/iax_ok.c cat fgcom/iaxclient/lib/libiax2/src/iax.c | sed s/hp-\>h_addr,/hp-\>h_addr_list[0],/g > fgcom/iaxclient/lib/libiax2/src/iax_ok.c
mv fgcom/iaxclient/lib/libiax2/src/iax_ok.c fgcom/iaxclient/lib/libiax2/src/iax.c mv fgcom/iaxclient/lib/libiax2/src/iax_ok.c fgcom/iaxclient/lib/libiax2/src/iax.c
fi fi
cd "$CBD"
if [ -d "fgcom" ]
then
if [ "$RECONFIGURE" = "y" ] if [ "$RECONFIGURE" = "y" ]
then then
cd "$CBD" cd "$CBD"
@ -1282,7 +1230,7 @@ then
cd "$CBD"/build/fgcom cd "$CBD"/build/fgcom
echo -n "RECONFIGURE FGCOM ... " >> $LOGFILE echo -n "RECONFIGURE FGCOM ... " >> $LOGFILE
rm -f CMakeCache.txt rm -f CMakeCache.txt
cmake -D CMAKE_BUILD_TYPE="Release" -D "CMAKE_PREFIX_PATH=$INSTALL_DIR_PLIB;$INSTALL_DIR_SIMGEAR" -D "CMAKE_INSTALL_PREFIX:PATH=$INSTALL_DIR_FGCOM" "$CBD"/fgcom 2>&1 | tee -a $LOGFILE cmake ${VERBOSE_MAKEFILE} -D CMAKE_BUILD_TYPE="Release" -D "CMAKE_PREFIX_PATH=$INSTALL_DIR_PLIB;$INSTALL_DIR_SIMGEAR" -D "CMAKE_INSTALL_PREFIX:PATH=$INSTALL_DIR_FGCOM" "$CBD"/fgcom 2>&1 | tee -a $LOGFILE
echo " OK" >> $LOGFILE echo " OK" >> $LOGFILE
@ -1339,7 +1287,7 @@ then
cmake --build . --config Release 2>&1 | tee -a $LOGFILE cmake --build . --config Release 2>&1 | tee -a $LOGFILE
echo "INSTALL FGCOM" >> $LOGFILE echo "INSTALL FGCOM" >> $LOGFILE
cmake -DBUILD_TYPE=Release -P cmake_install.cmake 2>&1 | tee -a $LOGFILE cmake ${VERBOSE_MAKEFILE} -DBUILD_TYPE=Release -P cmake_install.cmake 2>&1 | tee -a $LOGFILE
fi fi
cd "$CBD" cd "$CBD"
@ -1349,10 +1297,8 @@ then
echo "export LD_LIBRARY_PATH=../../$PLIB_INSTALL_DIR/lib:../../$OSG_INSTALL_DIR/lib:../../$SIMGEAR_INSTALL_DIR/lib" >> run_fgcom.sh echo "export LD_LIBRARY_PATH=../../$PLIB_INSTALL_DIR/lib:../../$OSG_INSTALL_DIR/lib:../../$SIMGEAR_INSTALL_DIR/lib" >> run_fgcom.sh
echo "./fgcom -Sfgcom.flightgear.org.uk \$@" >> run_fgcom.sh echo "./fgcom -Sfgcom.flightgear.org.uk \$@" >> run_fgcom.sh
chmod 755 run_fgcom.sh chmod 755 run_fgcom.sh
fi fi
fi
####################################################### #######################################################
# FGCOMGUI # FGCOMGUI
@ -1361,7 +1307,7 @@ FGCOMGUI_INSTALL_DIR=fgcomgui
INSTALL_DIR_FGCOMGUI=$INSTALL_DIR/$FGCOMGUI_INSTALL_DIR INSTALL_DIR_FGCOMGUI=$INSTALL_DIR/$FGCOMGUI_INSTALL_DIR
cd "$CBD" cd "$CBD"
if [ "$WHATTOBUILD" = "ALL" -o "$WHATTOBUILD" = "FGCOMGUI" ] if [[ "$(declare -p WHATTOBUILD)" =~ '['([0-9]+)']="FGCOMGUI"' ]]
then then
echo "****************************************" | tee -a $LOGFILE echo "****************************************" | tee -a $LOGFILE
echo "*************** FGCOMGUI ***************" | tee -a $LOGFILE echo "*************** FGCOMGUI ***************" | tee -a $LOGFILE
@ -1383,14 +1329,14 @@ then
fi fi
if [ -d "fgcomgui" ]
then
cd fgcomgui/ cd fgcomgui/
mkdir -p "$INSTALL_DIR_FGCOMGUI" mkdir -p "$INSTALL_DIR_FGCOMGUI"
if [ "$COMPILE" = "y" ] if [ "$COMPILE" = "y" ]
then then
echo "SCONS FGCOMGUI" >> $LOGFILE echo "SCONS FGCOMGUI" >> $LOGFILE
echo "scons prefix=\"$INSTALL_DIR_FGCOMGUI\" $JOPTION" >> $LOGFILE echo "scons prefix=\"$INSTALL_DIR_FGCOMGUI\" $JOPTION" >> $LOGFILE
scons prefix="$INSTALL_DIR_FGCOMGUI" $JOPTION 2>&1 | tee -a $LOGFILE scons prefix="$INSTALL_DIR_FGCOMGUI" $JOPTION 2>&1 | tee -a $LOGFILE
@ -1406,7 +1352,7 @@ then
echo "export PATH=../../fgcom/bin/:$PATH" >> run_fgcomgui.sh echo "export PATH=../../fgcom/bin/:$PATH" >> run_fgcomgui.sh
echo "./fgcomgui \$@" >> run_fgcomgui.sh echo "./fgcomgui \$@" >> run_fgcomgui.sh
chmod 755 run_fgcomgui.sh chmod 755 run_fgcomgui.sh
fi
fi fi
@ -1417,14 +1363,12 @@ ATLAS_INSTALL_DIR=atlas
INSTALL_DIR_ATLAS=$INSTALL_DIR/$ATLAS_INSTALL_DIR INSTALL_DIR_ATLAS=$INSTALL_DIR/$ATLAS_INSTALL_DIR
cd "$CBD" cd "$CBD"
if [ "$WHATTOBUILD" = "ALL" -o "$WHATTOBUILD" = "ATLAS" ] if [[ "$(declare -p WHATTOBUILD)" =~ '['([0-9]+)']="ATLAS"' ]]
then then
echo "****************************************" | tee -a $LOGFILE echo "****************************************" | tee -a $LOGFILE
echo "**************** ATLAS *****************" | tee -a $LOGFILE echo "**************** ATLAS *****************" | tee -a $LOGFILE
echo "****************************************" | tee -a $LOGFILE echo "****************************************" | tee -a $LOGFILE
if [ "$DOWNLOAD" = "y" ] if [ "$DOWNLOAD" = "y" ]
then then
echo -n "CSV FROM atlas.cvs.sourceforge.net:/cvsroot/atlas ... " >> $LOGFILE echo -n "CSV FROM atlas.cvs.sourceforge.net:/cvsroot/atlas ... " >> $LOGFILE
@ -1437,6 +1381,9 @@ then
cat Subbucket.cxx.original | sed s/\.get_gbs_center2\(/\.get_gbs_center\(/g > Subbucket.cxx cat Subbucket.cxx.original | sed s/\.get_gbs_center2\(/\.get_gbs_center\(/g > Subbucket.cxx
cd "$CBD" cd "$CBD"
fi fi
if [ -d "Atlas" ]
then
cd Atlas cd Atlas
if [ ! "$UPDATE" = "UPDATE" ] if [ ! "$UPDATE" = "UPDATE" ]
@ -1475,10 +1422,8 @@ then
echo "export LD_LIBRARY_PATH=../../$PLIB_INSTALL_DIR/lib:../../$OSG_INSTALL_DIR/lib:../../$SIMGEAR_INSTALL_DIR/lib" >> run_atlas.sh echo "export LD_LIBRARY_PATH=../../$PLIB_INSTALL_DIR/lib:../../$OSG_INSTALL_DIR/lib:../../$SIMGEAR_INSTALL_DIR/lib" >> run_atlas.sh
echo "./Atlas --fg-root=\$PWD/../../$FGFS_INSTALL_DIR/fgdata \$@" >> run_atlas.sh echo "./Atlas --fg-root=\$PWD/../../$FGFS_INSTALL_DIR/fgdata \$@" >> run_atlas.sh
chmod 755 run_atlas.sh chmod 755 run_atlas.sh
fi fi
fi
echo "To start fgfs, run the run_fgfs.sh file" echo "To start fgfs, run the run_fgfs.sh file"
echo "To start terrasync, run the run_terrasync.sh file" echo "To start terrasync, run the run_terrasync.sh file"
@ -1487,8 +1432,7 @@ echo "To start fgcom, run the run_fgcom.sh file"
echo "To start fgcom GUI, run the run_fgcomgui.sh file" echo "To start fgcom GUI, run the run_fgcomgui.sh file"
echo "To start atlas, run the run_atlas.sh file" echo "To start atlas, run the run_atlas.sh file"
if [ "$HELP" = "HELP" ]
if [ "$WHATTOBUILD" = "--help" ]
then then
echo "" echo ""
else else