Disable explicit SDK setting for Mac launcher.

Setting an SDK is breaking, but since the build slave is running our lowest supported OS version anyway, we can live with the default setting.

.gitignore

@@ -11,10 +11,3 @@ sgBuild
 image
 macflightgear
 fgdata
-src
-tmp
-Makefile
-CMakeFiles
-archivebuild
-osgbuild
-CMakeCache.txt

CMakeLists.txt

@@ -1,173 +0,0 @@
-cmake_minimum_required (VERSION 2.6.4)
-
-include (ExternalProject)
-
-project(FlightGear-Meta)
-
-if (UNIX)
-    set(BOOST_BOOTSTRAP "./bootstrap.sh" --prefix=${CMAKE_INSTALL_PREFIX})
-else()
-    set(BOOST_BOOTSTRAP "bootstrap.bat")
-endif()
-
-set(SG_DEPS OSG)
-set(FG_DEPS SimGear)
-
-if(APPLE)
-
-    set(BOOST_ARGS link=static stage --with-system)
-    ExternalProject_Add(Boost
-           PREFIX ${CMAKE_BINARY_DIR}
-           SVN_REPOSITORY http://svn.boost.org/svn/boost/tags/release/Boost_1_52_0
-           UPDATE_COMMAND ${BOOST_BOOTSTRAP}
-           CONFIGURE_COMMAND ""
-           BUILD_COMMAND ./bjam ${BOOST_ARGS}
-           BUILD_IN_SOURCE 1
-           INSTALL_COMMAND ./b2 install ${BOOST_ARGS})
-           
-           
-    ExternalProject_Add(libSvn
-        DOWNLOAD_COMMAND URL http://flightgear.simpits.org:8080/job/Mac-Subversion-libs/lastSuccessfulBuild/artifact/dist/*zip*/dist.zip
-        PREFIX ${CMAKE_BINARY_DIR}
-        CONFIGURE_COMMAND ""
-        BUILD_COMMAND ""
-        INSTALL_COMMAND cp -r ${CMAKE_BINARY_DIR}/src/libSvn/include ${CMAKE_INSTALL_PREFIX} && cp -r ${CMAKE_BINARY_DIR}/src/libSvn/lib ${CMAKE_INSTALL_PREFIX}
-    )
-           
-    list(APPEND SG_DEPS Boost libSvn)
-endif()  # of Apple
-
-set (OSG_INSTALL_PREFIX ${CMAKE_INSTALL_PREFIX})
-
-# OpenSceneGraph configuration
-if (APPLE)
-    SET(SDKROOT /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.7.sdk)
-    # force disable Qt and Jasper, and ensure an SDKROOT is set, or
-    # osgViewer system detection goes wrongh
-    SET(OSG_CMAKE_ARGS -DCMAKE_OSX_SYSROOT=${SDKROOT} 
-        -DOSG_USE_QT=0 
-        -DJASPER_LIBRARY= 
-        -DSDL_LIBRARY:FILEPATH=
-        -DCMAKE_OSX_ARCHITECTURES=x86_64
-        -DCMAKE_OSX_DEPLOYMENT_TARGET=10.7
-    )
-    # OSG with some patches applied for Mac
-#    SET(OSG_SOURCE GIT_REPOSITORY git://gitorious.org/+flightgear-developers/openscenegraph/mac-release-osg.git)
-    SET(OSG_SOURCE URL http://www.openscenegraph.org/downloads/developer_releases/OpenSceneGraph-3.1.4.zip)
-
-elseif(MSVC)
-	set( OSG_MSVC "msvc" )
-    if (${MSVC_VERSION} EQUAL 1700)
-      set( OSG_MSVC ${OSG_MSVC}110 )
-    elseif (${MSVC_VERSION} EQUAL 1600)
-      set( OSG_MSVC ${OSG_MSVC}100 )
-    else (${MSVC_VERSION} EQUAL 1700)
-      set( OSG_MSVC ${OSG_MSVC}90 )
-    endif (${MSVC_VERSION} EQUAL 1700)
-  
-	SET(OSG_CMAKE_ARGS
-		-DACTUAL_3RDPARTY_DIR:PATH=${CMAKE_BINARY_DIR}/3rdParty
-		-DBUILD_OSG_APPLICATIONS:BOOL=ON
-		-DCMAKE_INSTALL_PREFIX:PATH=
-		-DOSG_PLUGIN_SEARCH_INSTALL_DIR_FOR_PLUGINS:BOOL=OFF
-		-DFREETYPE_LIBRARY:FILEPATH=${CMAKE_BINARY_DIR}/3rdParty/lib/freetype243.lib
-		-DGDAL_INCLUDE_DIR:PATH=
-		-DGDAL_LIBRARY:FILEPATH=
-    )
-	
-	# for compatability with MSVC directory layout
-	set(OSG_INSTALL_PREFIX ${CMAKE_BINARY_DIR}/install/${OSG_MSVC}/OpenSceneGraph)
-	SET(OSG_SOURCE URL http://www.openscenegraph.org/downloads/developer_releases/OpenSceneGraph-3.1.4.zip)
-	
-    list(APPEND OSG_DEPS WinDeps)
-else()
-    # normal OSG
-    SET(OSG_SOURCE URL http://www.openscenegraph.org/downloads/developer_releases/OpenSceneGraph-3.1.4.zip)
-endif()
-
-if (MSVC)
-# download 3rdparty dependeancies zip, including boost
-	ExternalProject_Add(WinDeps
-		DOWNLOAD_COMMAND URL http://files.goneabitbursar.com/fg/fgfs-win32-VS100-3rdParty+OSG-20120411.zip
-# extract to current root
-		SOURCE_DIR ${CMAKE_BINARY_DIR}/winDeps 
-		BINARY_DIR ${CMAKE_BINARY_DIR} 
-		CONFIGURE_COMMAND ""
-		BUILD_COMMAND ${CMAKE_SOURCE_DIR}/installWinDeps.bat
-		INSTALL_COMMAND ""
-	)
-    
-	ExternalProject_Add(Boost
-		DOWNLOAD_COMMAND URL http://flightgear.simpits.org:8080/job/Boost-Win/lastSuccessfulBuild/artifact/Boost/boost/*zip*/boost.zip
-		SOURCE_DIR ${CMAKE_BINARY_DIR}/Boost/boost
-        CONFIGURE_COMMAND ""
-        BUILD_COMMAND ""
-        INSTALL_COMMAND ""
-    )
-	
-	list(APPEND SG_DEPS Boost)
-	
-	list(APPEND SG_CMAKE_ARGS -DBOOST_ROOT=${CMAKE_BINARY_DIR})
-	list(APPEND FG_CMAKE_ARGS -DBOOST_ROOT=${CMAKE_BINARY_DIR})
-endif(MSVC) # of Windows
-
-ExternalProject_Add(OSG
-	DEPENDS ${OSG_DEPS}
-    PREFIX ${CMAKE_BINARY_DIR}
-    ${OSG_SOURCE}
-    BINARY_DIR osgbuild
-    CMAKE_ARGS ${OSG_CMAKE_ARGS} -DCMAKE_INSTALL_PREFIX=${OSG_INSTALL_PREFIX}
-# force Release build of OpenSceneGraph
-#	BUILD_COMMAND "cmake --build . --config Release"
-)
-
-set(SG_CMAKE_ARGS -DENABLE_PACKAGE=1)
-set(FG_CMAKE_ARGS "")
-
-# FIXME install of OpenRTI is failing on Windows, files in PREFIX/share which
-# are ending up in C:/Program Files/OpenRTI
-if (NOT MSVC)
-    ExternalProject_Add(OpenRTI
-        PREFIX ${CMAKE_BINARY_DIR}
-        DOWNLOAD_COMMAND GIT_REPOSITORY git://gitorious.org/openrti/openrti.git
-        BINARY_DIR rtibuild 
-        CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${CMAKE_INSTALL_PREFIX}
-    )
-	
-	list(APPEND SG_DEPS OpenRTI)
-	list(APPEND SG_CMAKE_ARGS -DENABLE_RTI=1)
-	list(APPEND FG_CMAKE_ARGS -DENABLE_RTI=1)
-endif()
-
-ExternalProject_Add(SimGear 
-    PREFIX ${CMAKE_BINARY_DIR}
-    DEPENDS ${SG_DEPS}
-    DOWNLOAD_COMMAND ""     # no need to download
-    UPDATE_COMMAND       ""    # or update.
-    SOURCE_DIR ${CMAKE_CURRENT_LIST_DIR}/simgear
-    BINARY_DIR sgbuild 
-    CMAKE_ARGS ${SG_CMAKE_ARGS} -DCMAKE_INSTALL_PREFIX=${CMAKE_INSTALL_PREFIX})
-
-# on Windows, PLIB is in the 3rd-party dependancies zip
-if (NOT WIN32)
-	SET(PLIB_ARGS --disable-pw --disable-sl --disable-psl --disable-ssg --disable-ssgaux)
-
-	ExternalProject_Add(PLIB 
-		PREFIX ${CMAKE_BINARY_DIR}
-		URL http://plib.sourceforge.net/dist/plib-1.8.5.tar.gz
-		CONFIGURE_COMMAND <SOURCE_DIR>/configure --prefix=${CMAKE_INSTALL_PREFIX} ${PLIB_ARGS}
-		BUILD_IN_SOURCE 1
-	)
-    
-    list(APPEND FG_DEPS PLIB)
-endif()
-
-ExternalProject_Add(FlightGear
-    PREFIX ${CMAKE_BINARY_DIR}
-    DEPENDS ${FG_DEPS}
-    DOWNLOAD_COMMAND ""     # no need to download
-    UPDATE_COMMAND       ""    # or update.
-    SOURCE_DIR ${CMAKE_CURRENT_LIST_DIR}/flightgear
-    BINARY_DIR fgbuild 
-    CMAKE_ARGS ${FG_CMAKE_ARGS} -DCMAKE_INSTALL_PREFIX=${CMAKE_INSTALL_PREFIX}
-	)

FlightGear.iss

@@ -97,9 +97,6 @@ Source: "X:\3rdParty.x64\bin\vcredist_x64.exe"; DestDir: "{app}\bin\Win64"; Flag
 Source: "X:\3rdParty\bin\oalinst.exe"; DestDir: "{app}\bin\Win32"; Flags: ignoreversion skipifsourcedoesntexist
 
 Source: "X:\data\*.*"; DestDir: "{app}\data"; Flags: ignoreversion recursesubdirs skipifsourcedoesntexist
-; NOTE: tar.gz file uses name 'fgdata', to avoid renaming it, look for both names.
-; assuming no setup has both names and hence we don't package twice :)
-Source: "X:\fgdata\*.*"; DestDir: "{app}\data"; Flags: ignoreversion recursesubdirs skipifsourcedoesntexist
 
 Source: "{#OSGInstallDir}\bin\osg{#OSGSoNumber}-osg.dll"; DestDir: "{app}\bin\Win32"; Check: not Is64BitInstallMode or IsTaskSelected('force32')
 Source: "{#OSGInstallDir}\bin\osg{#OSGSoNumber}-osgDB.dll"; DestDir: "{app}\bin\Win32"; Check: not Is64BitInstallMode or IsTaskSelected('force32')
@@ -111,7 +108,7 @@ Source: "{#OSGInstallDir}\bin\osg{#OSGSoNumber}-osgViewer.dll"; DestDir: "{app}\
 Source: "{#OSGInstallDir}\bin\osg{#OSGSoNumber}-osgSim.dll"; DestDir: "{app}\bin\Win32"; Check: not Is64BitInstallMode or IsTaskSelected('force32')
 Source: "{#OSGInstallDir}\bin\osg{#OSGSoNumber}-osgFX.dll"; DestDir: "{app}\bin\Win32"; Check: not Is64BitInstallMode or IsTaskSelected('force32')
 
-Source: "{#OSGInstallDir}\bin\ot{#OTSoNumber}-OpenThreads.dll"; DestDir: "{app}\bin\Win32"; Check: not Is64BitInstallMode or IsTaskSelected('force32')
+Source: "{#OSGInstallDir}\bin\ot12-OpenThreads.dll"; DestDir: "{app}\bin\Win32"; Check: not Is64BitInstallMode or IsTaskSelected('force32')
 
 Source: "{#OSGPluginsDir}\osgdb_ac.dll"; DestDir: "{app}\bin\Win32\osgPlugins-{#OSGVersion}"; Check: not Is64BitInstallMode or IsTaskSelected('force32')
 Source: "{#OSGPluginsDir}\osgdb_osg.dll"; DestDir: "{app}\bin\Win32\osgPlugins-{#OSGVersion}"; Check: not Is64BitInstallMode or IsTaskSelected('force32')
@@ -147,7 +144,7 @@ Source: "{#OSG64InstallDir}\bin\osg{#OSGSoNumber}-osgViewer.dll"; DestDir: "{app
 Source: "{#OSG64InstallDir}\bin\osg{#OSGSoNumber}-osgSim.dll"; DestDir: "{app}\bin\Win64"; Flags: skipifsourcedoesntexist; Check: Is64BitInstallMode and not IsTaskSelected('force32')
 Source: "{#OSG64InstallDir}\bin\osg{#OSGSoNumber}-osgFX.dll"; DestDir: "{app}\bin\Win64"; Flags: skipifsourcedoesntexist; Check: Is64BitInstallMode and not IsTaskSelected('force32')
 
-Source: "{#OSG64InstallDir}\bin\ot{#OTSoNumber}-OpenThreads.dll"; DestDir: "{app}\bin\Win64"; Flags: skipifsourcedoesntexist; Check: Is64BitInstallMode and not IsTaskSelected('force32')
+Source: "{#OSG64InstallDir}\bin\ot12-OpenThreads.dll"; DestDir: "{app}\bin\Win64"; Flags: skipifsourcedoesntexist; Check: Is64BitInstallMode and not IsTaskSelected('force32')
 
 Source: "{#OSG64PluginsDir}\osgdb_ac.dll"; DestDir: "{app}\bin\Win64\osgPlugins-{#OSGVersion}"; Flags: skipifsourcedoesntexist; Check: Is64BitInstallMode and not IsTaskSelected('force32')
 Source: "{#OSG64PluginsDir}\osgdb_osg.dll"; DestDir: "{app}\bin\Win64\osgPlugins-{#OSGVersion}"; Flags: skipifsourcedoesntexist; Check: Is64BitInstallMode and not IsTaskSelected('force32')

create_catalog.py

@@ -1,171 +0,0 @@
-#!/usr/bin/python
-
-import os
-import sys
-import fnmatch
-import tarfile
-import hashlib
-import shutil
-
-import xml.etree.cElementTree as ET
-
-rootPath = sys.argv[1]
-outputDir = sys.argv[2]
-
-existingCatalogPath = os.path.join(outputDir, 'catalog.xml')
-existingCatalog = None
-print 'existing ctalog path:' + existingCatalogPath
-if os.path.exists(existingCatalogPath):
-    existingCatalog = ET.parse(existingCatalogPath)
-
-for file in os.listdir(outputDir):
-    if fnmatch.fnmatch(file, '*.tar.gz'):
-        os.remove(os.path.join(outputDir, file));
-
-
-thumbsDir = os.path.join(outputDir, 'thumbs')
-shutil.rmtree(thumbsDir)
-os.makedirs(thumbsDir)
-
-def setProperty(node, id, value):
-    s = node.find(id) # check for existing
-    if s is None: 
-        s = ET.SubElement(node, id)
-    s.text = value
-
-def clearChildren(node, tag):
-    for c in node.findall(tag):
-        node.remove(c)
-
-def parse_setXml(path):
-    tree = ET.parse(path)
-    
-    desc = tree.find('sim/description')
-    ratings = tree.find('sim/rating')
-    if (ratings is not None):
-        for rating in list(ratings):
-            if rating.tag == 'status':
-                continue
-                
-            rvalue = int(rating.text)
-            if rvalue < 2:
-                return None
-    else:
-        return None
-    
-    d = {}
-    
-    d['desc'] = desc
-    d['ratings'] = ratings;
-    d['status'] = tree.find('sim/status')
-    d['authors'] = tree.findall('sim/author')
-
-    return d
-    
-def process_aircraft(acft, path):
-    print '===' + acft + '==='
-    setFiles = []
-    thumbs = []
-    
-    for file in os.listdir(path):
-        if fnmatch.fnmatch(file, '*-set.xml'):
-            setFiles.append(file);
-        
-        if fnmatch.fnmatch(file, 'thumbnail*'):
-            thumbs.append(file)
-    
-    aircraft = []
-    for s in setFiles:
-        d = parse_setXml(os.path.join(path, s))
-        if d is None:
-            continue
-        
-        d['set'] = s[0:-8]
-        aircraft.append(d)
-    
-    thumbnailNames = []
-    # copy thumbnails
-    for t in thumbs:
-        outThumb = os.path.join(thumbsDir, acft + "-" + t)
-        thumbnailNames.append(acft + "-" + t)
-        shutil.copyfile(os.path.join(path, t), outThumb)
-            
-    if len(aircraft) == 0:
-        print "no aircraft profiles for " + acft
-        return
-            
-    # tarball creation
-    outTar = os.path.join(outputDir, acft + ".tar.gz")
-    tar = tarfile.open(outTar, "w:gz")
-    tar.add(path, acft)
-    tar.close()
-
-    digest = hashlib.md5(open(outTar, 'r').read()).hexdigest()
-    revision = 1
-    
-    # revision check
-    if acft in existingPackages:
-        previousMd5 = existingPackages[acft].find('md5').text
-        previousRevsion = int(existingPackages[acft].find('revision').text)
-        if digest != previousMd5:
-            print acft + ": MD5 has changed"
-            revision = previousRevsion + 1
-        else:
-            print acft + ": MD5 is unchanged"
-    else:    
-        existingPackages[acft] = ET.Element('package')
-        setProperty(existingPackages[acft], 'id', acft)
-    
-    setProperty(existingPackages[acft], 'revision', str(revision))
-    setProperty(existingPackages[acft], 'md5', digest)
-    setProperty(existingPackages[acft], 'description', aircraft[0]['desc'])
-        
-    clearChildren(existingPackages[acft], 'thumbnail')
-    for t in thumbnailNames:
-        tn = ET.SubElement(existingPackages[acft], 'thumbnail')
-        tn.text = 'thumbs/' + t
-    
-    clearChildren(existingPackages[acft], 'rating')
-    existingPackages[acft].append(aircraft[0]['ratings'])
-    
-    print "wrote tarfile, digest is " + digest
-    
-root = ET.Element('PropertyList')
-catalogTree = ET.ElementTree(root)
-
-existingPackages = dict()
-
-if (existingCatalog is not None):
-    print 'have existing catalog data'
-    
-    root.append(existingCatalog.find('license'))
-    root.append(existingCatalog.find('url'))
-    root.append(existingCatalog.find('description'))
-    root.append(existingCatalog.find('id'))
-    
-    # existing data (for revision incrementing)
-    for n in existingCatalog.findall('package'):
-        idNode = n.find('id')
-        if idNode is None:
-            print 'Missing <id> tag on package'
-            continue
-            
-        existingPackages[idNode.text] = n;
-        
-#licenseElement = ET.SubElement(root, 'license')
-#licenseElement.text = 'gpl'
-
-#urlElement = ET.SubElement(root, 'url')
-#urlElement.text = 'http://catalog.xml'
-
-for acft in os.listdir(rootPath):
-    path = os.path.join(rootPath, acft);
-    if (os.path.isdir(path)):
-        process_aircraft(acft, path)
-
-
-for ep in existingPackages:
-    root.append(existingPackages[ep])
-
-catalogTree.write(os.path.join(outputDir, 'catalog.xml'), 'UTF-8')
-

download_and_compile.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 #* Written by Francesco Angelo Brisa, started January 2008.
 #
-# Copyright (C) 2013 Francesco Angelo Brisa
+# Copyright (C) 2008 Francesco Angelo Brisa
 # email: fbrisa@gmail.com   -   fbrisa@yahoo.it
 #
 # This program is free software: you can redistribute it and/or modify
@@ -17,7 +17,8 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-VERSION="1.9-10"
+
+VERSION="1.9-4"
 
 #COMPILE GIT FGFS
 
@@ -29,13 +30,13 @@ VERSION="1.9-10"
 # Thanks to "Pat Callahan" for patches for fgrun compilation
 # Thanks to "F-JJTH" for bug fixes and suggestions
 # Thanks again to "F-JJTH" for OpenRTI and FGX 
-# Thanks to André, ( taureau89_9 ) for debian stable packages fixes
+
+
 
 LOGFILE=compilation_log.txt
 LOGSEP="***********************************"
 
 WHATTOBUILD=
-WHATTOBUILDALL=( PLIB OSG OPENRTI SIMGEAR FGFS DATA FGRUN FGCOM FGCOMGUI)
 UPDATE=
 STABLE=
 
@@ -46,13 +47,14 @@ COMPILE="y"
 RECONFIGURE="y"
 DOWNLOAD="y"
 
+
 JOPTION=""
 OOPTION=""
 DEBUG=""
 WITH_EVENT_INPUT=""
 WITH_OPENRTI=""
 
-while getopts "suhgeixvwc:p:a:d:r:j:O:" OPTION
+while getopts "suhc:p:a:d:r:j:O:gei" OPTION
 do
      case $OPTION in
          s)
@@ -62,7 +64,7 @@ do
              UPDATE="UPDATE"
              ;;
          h)
-             HELP="HELP"
+             WHATTOBUILD="--help"
              ;;
          a)
              APT_GET_UPDATE=$OPTARG
@@ -94,18 +96,11 @@ do
          i)
              WITH_OPENRTI="-D ENABLE_RTI=ON"
              ;;
-         x)
-             set -x
-             ;;
-         v)
-             set -v
-             ;;
-         w)
-	     VERBOSE_MAKEFILE="-D CMAKE_VERBOSE_MAKEFILE=ON"
-	     ;;
+
+
          ?)
              echo "error"
-             HELP="HELP"
+             WHATTOBUILD="--help"
              #exit
              ;;
      esac
@@ -116,31 +111,24 @@ shift $(($OPTIND - 1))
 
 if [ ! "$#" = "0" ]
 then
-	for arg in $*
-	do
-		#echo  "$arg"
-		if [ "${arg^^}" == "UPDATE" ]
-		then
-			UPDATE="UPDATE"
-		else
-			WHATTOBUILD=( "${WHATTOBUILD[@]}" "${arg^^}" )
-		fi
-	done
-else
-	WHATTOBUILD=( "${WHATTOBUILDALL[@]}" )
+	if [ "$WHATTOBUILD" = "" ]
+	then
+		WHATTOBUILD="$1"
+	fi
+	
+	if [ ! "$#" = "1" ]
+	then
+		UPDATE="$2"
+	fi
+	
 fi
 
-if [[ "$(declare -p WHATTOBUILD)" =~ '['([0-9]+)']="ALL"' ]]
-then
-	WHATTOBUILD=( "${WHATTOBUILDALL[@]}" )
-fi
 
-#printf "%s\n" "${WHATTOBUILD[@]}"
 
 #######################################################
 # Last stable revision: currently FlightGear 2.4.0 with 3.0.1
 PLIB_STABLE_REVISION="2172"
-OSG_STABLE_REVISION="http://svn.openscenegraph.org/osg/OpenSceneGraph/tags/OpenSceneGraph-3.0.1/"
+OSG_STABLE_REVISION="http://www.openscenegraph.org/svn/osg/OpenSceneGraph/tags/OpenSceneGraph-3.0.1"
 
 # common stable branch for flightgear, simgear and fgdata
 FGSG_STABLE_GIT_BRANCH="release/2.8.0"
@@ -164,13 +152,15 @@ FGCOM_UNSTABLE_GIT_BRANCH="master"
 FGCOMGUI_STABLE_REVISION="46"
 
 # Current developer revision: latest FlightGear GIT (2.5.0) with OSG 3.0.1
-OSG_UNSTABLE_REVISION="http://svn.openscenegraph.org/osg/OpenSceneGraph/tags/OpenSceneGraph-3.0.1/"
+OSG_UNSTABLE_REVISION="http://www.openscenegraph.org/svn/osg/OpenSceneGraph/tags/OpenSceneGraph-3.0.1"
 
 #######################################################
 # set script to stop if an error occours
 set -e
 
-if [ "$HELP" = "HELP" ]
+
+
+if [ "$WHATTOBUILD" = "--help" ]
 then
 	echo "$0 Version $VERSION"
 	echo "Usage:"
@@ -196,6 +186,7 @@ then
 	exit
 fi
 
+
 #######################################################
 #######################################################
 # Warning about compilation time and size
@@ -211,6 +202,9 @@ echo "* Please, be patient ......          *"
 echo "*                                    *"
 echo "**************************************"
 
+
+
+
 #######################################################
 #######################################################
 # Debian 4.0rX (Etch) backports.org
@@ -252,6 +246,7 @@ fi
 #######################################################
 #######################################################
 
+
 echo $0 $* > $LOGFILE
 
 echo "APT_GET_UPDATE=$APT_GET_UPDATE" >> $LOGFILE
@@ -263,6 +258,7 @@ echo "JOPTION=$JOPTION" >> $LOGFILE
 echo "OOPTION=$OOPTION" >> $LOGFILE
 echo "DEBUG=$DEBUG" >> $LOGFILE
 
+
 echo "$LOGSEP" >> $LOGFILE
 
 # discovering linux
@@ -271,14 +267,12 @@ then
 	. /etc/lsb-release
 fi
 
+
 # default is hardy
-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"
+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"
 
 UBUNTU_PACKAGES="freeglut3-dev libjpeg62-dev libjpeg62 libapr1-dev libfltk1.3-dev libfltk1.3"
-
-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"
+DEBIAN_PACKAGES="freeglut3-dev libjpeg8-dev libjpeg8 libfltk-dev libfltk1.1"
 
 # checking linux distro and version to differ needed packages
 if [ "$DISTRIB_ID" = "Ubuntu" -o "$DISTRIB_ID" = "LinuxMint" ]
@@ -287,20 +281,14 @@ then
 	DISTRO_PACKAGES="$DISTRO_PACKAGES $UBUNTU_PACKAGES"
 else
 	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"
 fi
 echo "$LOGSEP" >> $LOGFILE
 
+
 if [ "$DOWNLOAD_PACKAGES" = "y" ]
 then
+
 	echo -n "PACKAGE INSTALLATION ... " >> $LOGFILE
 
 	LIBOPENALPACKAGE=$(apt-cache search libopenal | grep "libopenal. " | sed s/\ .*//)
@@ -334,8 +322,19 @@ then
 	echo " OK" >> $LOGFILE
 fi
 
+
+
+
+
+
+
+
+
 COMPILE_BASE_DIR=.
 
+
+
+
 #cd into compile base directory
 cd "$COMPILE_BASE_DIR"
 
@@ -344,9 +343,11 @@ CBD=$(pwd)
 
 LOGFILE=$CBD/$LOGFILE
 
+
 echo "DIRECTORY= $CBD" >> $LOGFILE
 echo "$LOGSEP" >> $LOGFILE
 
+
 if [ ! -d install ]
 then
 	mkdir install
@@ -359,17 +360,19 @@ INSTALL_DIR=$CBD/$SUB_INSTALL_DIR
 cd "$CBD"
 mkdir -p build
 
+
 #######################################################
 # PLIB
 #######################################################
 PLIB_INSTALL_DIR=plib
 INSTALL_DIR_PLIB=$INSTALL_DIR/$PLIB_INSTALL_DIR
 
+
 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"' ]]
+if [ "$WHATTOBUILD" = "" -o "$WHATTOBUILD" = "PLIB" -o "$WHATTOBUILD" = "ALL" ]
 then
 	if [ ! "$UPDATE" = "UPDATE" ]
 	then
@@ -398,7 +401,7 @@ then
 				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
@@ -449,6 +452,7 @@ then
 	fi
 fi
 
+
 #######################################################
 # OpenSceneGraph
 #######################################################
@@ -456,7 +460,7 @@ OSG_INSTALL_DIR=OpenSceneGraph
 INSTALL_DIR_OSG=$INSTALL_DIR/$OSG_INSTALL_DIR
 cd "$CBD"
 
-if [[ "$(declare -p WHATTOBUILD)" =~ '['([0-9]+)']="OSG"' ]]
+if [ "$WHATTOBUILD" = "" -o "$WHATTOBUILD" = "OSG" -o "$WHATTOBUILD" = "ALL" ]
 then
 	echo "****************************************" | tee -a $LOGFILE
 	echo "**************** OSG *******************" | tee -a $LOGFILE
@@ -491,7 +495,7 @@ then
 
 
 
-			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
+			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
 			
 			echo "RECONFIGURE OSG DONE." >> $LOGFILE
 			
@@ -527,6 +531,8 @@ then
 	cd -
 fi
 
+
+
 #######################################################
 # OPENRTI
 #######################################################
@@ -539,7 +545,7 @@ then
 	mkdir "openrti"
 fi
 
-if [[ "$(declare -p WHATTOBUILD)" =~ '['([0-9]+)']="OPENRTI"' ]]
+if [ "$WHATTOBUILD" = "" -o "$WHATTOBUILD" = "OPENRTI" -o "$WHATTOBUILD" = "ALL" ]
 then
 	echo "****************************************" | tee -a $LOGFILE
 	echo "**************** OPENRTI ***************" | tee -a $LOGFILE
@@ -600,7 +606,7 @@ then
 			cd "$CBD"/build/openrti
 			echo -n "RECONFIGURE OPENRTI ... " >> $LOGFILE
 			rm -f ../../openrti/openrti/CMakeCache.txt
-			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
+			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
 			echo " OK" >> $LOGFILE
 
 
@@ -623,6 +629,8 @@ then
 	cd -
 fi
 
+
+
 #######################################################
 # SIMGEAR
 #######################################################
@@ -635,7 +643,7 @@ then
 	mkdir "simgear"
 fi
 
-if [[ "$(declare -p WHATTOBUILD)" =~ '['([0-9]+)']="SIMGEAR"' ]]
+if [ "$WHATTOBUILD" = "" -o "$WHATTOBUILD" = "SIMGEAR" -o "$WHATTOBUILD" = "ALL" ]
 then
 	echo "****************************************" | tee -a $LOGFILE
 	echo "**************** SIMGEAR ***************" | tee -a $LOGFILE
@@ -700,7 +708,7 @@ then
 			cd "$CBD"/build/simgear
 			echo -n "RECONFIGURE SIMGEAR ... " >> $LOGFILE
 			rm -f ../../simgear/simgear/CMakeCache.txt
-			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
+			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
 			echo " OK" >> $LOGFILE
 
 
@@ -723,6 +731,7 @@ then
 	cd -
 fi
 
+
 #######################################################
 # FGFS
 #######################################################
@@ -735,8 +744,7 @@ then
 	mkdir "fgfs"
 fi
 
-#if [ "$WHATTOBUILD" = "" -o "$WHATTOBUILD" = "FGFS" -o "$WHATTOBUILD" = "DATA" -o "$WHATTOBUILD" = "ALL" ]
-if [[ "$(declare -p WHATTOBUILD)" =~ '['([0-9]+)']="FGFS"' || "$(declare -p WHATTOBUILD)" =~ '['([0-9]+)']="DATA"' ]]
+if [ "$WHATTOBUILD" = "" -o "$WHATTOBUILD" = "FGFS" -o "$WHATTOBUILD" = "DATA" -o "$WHATTOBUILD" = "ALL" ]
 then
 
 	echo "****************************************" | tee -a $LOGFILE
@@ -745,7 +753,7 @@ then
 
 	cd fgfs
 
-	if [[ "$(declare -p WHATTOBUILD)" =~ '['([0-9]+)']="FGFS"' ]]
+	if [ "$WHATTOBUILD" = "" -o "$WHATTOBUILD" = "FGFS" -o "$WHATTOBUILD" = "ALL" ]
 	then
 		if [ "$DOWNLOAD" = "y" ]
 		then
@@ -818,9 +826,15 @@ then
 				#cp -f  utils/fgadmin/src/CMakeLists_without_err.txt utils/fgadmin/src/CMakeLists.txt
 
 		
-				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
+				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
 
 				echo " OK" >> $LOGFILE
+
+
+
+
+
+
 			fi
 		fi
 		
@@ -841,7 +855,8 @@ then
 	fi
 	cd ..
 
-	if [[ "$(declare -p WHATTOBUILD)" =~ '['([0-9]+)']="DATA"' ]]
+
+	if [ "$WHATTOBUILD" = "" -o "$WHATTOBUILD" = "DATA" -o "$WHATTOBUILD" = "ALL" ]
 	then
 		if [ ! "$UPDATE" = "UPDATE" ]
 		then
@@ -883,6 +898,37 @@ then
 
 				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
 				cd "$EXDIR"
 			fi
@@ -928,7 +974,7 @@ fi
 FGO_INSTALL_DIR=fgo
 INSTALL_DIR_FGO=$INSTALL_DIR/$FGO_INSTALL_DIR
 cd "$CBD"
-if [[ "$(declare -p WHATTOBUILD)" =~ '['([0-9]+)']="FGO"' ]]
+if [ "$WHATTOBUILD" = "" -o "$WHATTOBUILD" = "FGO" -o "$WHATTOBUILD" = "ALL" ]
 then
 	echo "****************************************" | tee -a $LOGFILE
 	echo "***************** FGO ******************" | tee -a $LOGFILE
@@ -958,13 +1004,14 @@ then
 
 fi
 
+
 #######################################################
 # FGx
 #######################################################
 FGX_INSTALL_DIR=fgx
 INSTALL_DIR_FGX=$INSTALL_DIR/$FGX_INSTALL_DIR
 cd "$CBD"
-if [[ "$(declare -p WHATTOBUILD)" =~ '['([0-9]+)']="FGX"' ]]
+if [ "$WHATTOBUILD" = "" -o "$WHATTOBUILD" = "FGX" ]
 then
 	echo "****************************************" | tee -a $LOGFILE
 	echo "***************** FGX ******************" | tee -a $LOGFILE
@@ -994,6 +1041,7 @@ then
 
 	cd ..
 
+
 	cd fgx/src/
 
 	#Patch in order to pre-setting paths
@@ -1052,6 +1100,7 @@ then
 
 fi
 
+
 #######################################################
 # FGRUN
 #######################################################
@@ -1059,7 +1108,7 @@ FGRUN_INSTALL_DIR=fgrun
 INSTALL_DIR_FGRUN=$INSTALL_DIR/$FGRUN_INSTALL_DIR
 cd "$CBD"
 
-if [[ "$(declare -p WHATTOBUILD)" =~ '['([0-9]+)']="FGRUN"' ]]
+if [ "$WHATTOBUILD" = "" -o "$WHATTOBUILD" = "FGRUN" -o "$WHATTOBUILD" = "ALL" ]
 then
 	echo "****************************************" | tee -a $LOGFILE
 	echo "**************** FGRUN *****************" | tee -a $LOGFILE
@@ -1125,7 +1174,7 @@ then
 			echo -n "RECONFIGURE FGRUN ... " >> $LOGFILE
 			rm -f ../../fgrun/CMakeCache.txt
 			
-			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
+			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
 
 			echo " OK" >> $LOGFILE
 		fi
@@ -1157,6 +1206,8 @@ then
 
 fi
 
+
+
 #######################################################
 # FGCOM
 #######################################################
@@ -1164,7 +1215,7 @@ FGCOM_INSTALL_DIR=fgcom
 INSTALL_DIR_FGCOM=$INSTALL_DIR/$FGCOM_INSTALL_DIR
 cd "$CBD"
 
-if [[ "$(declare -p WHATTOBUILD)" =~ '['([0-9]+)']="FGCOM"' ]]
+if [ "$WHATTOBUILD" = "ALL" -o "$WHATTOBUILD" = "FGCOM" ]
 then
 	echo "****************************************" | tee -a $LOGFILE
 	echo "**************** FGCOM *****************" | tee -a $LOGFILE
@@ -1213,93 +1264,96 @@ then
 		
 		echo " OK" >> $LOGFILE
 		cd ..
-			
+		
+
+
+		
 #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
 		mv fgcom/iaxclient/lib/libiax2/src/iax_ok.c fgcom/iaxclient/lib/libiax2/src/iax.c
 	fi
 	
-	cd "$CBD"
-	if [ -d "fgcom" ]
+	
+	if [ "$RECONFIGURE" = "y" ]
 	then
-		if [ "$RECONFIGURE" = "y" ]
-		then
-			cd "$CBD"
-			mkdir -p build/fgcom
-
-			cd "$CBD"/build/fgcom
-			echo -n "RECONFIGURE FGCOM ... " >> $LOGFILE
-			rm -f CMakeCache.txt
-			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
-
-			cd "$CBD"/fgcom/src/
-
-			cp Makefile Makefile.original
-			cat Makefile | sed s/\\//MY_SLASH_HERE/g > Makefile_NOSLASHES
-	
-			# 1
-			INSTALL_DIR_PLIB_NO_SLASHES=$(echo "$INSTALL_DIR_PLIB" | sed -e 's/\//MY_SLASH_HERE/g')
-			cat Makefile_NOSLASHES | sed s/PLIB_PREFIX\ *:=\ *MY_SLASH_HEREusrMY_SLASH_HERElocalMY_SLASH_HEREsrcMY_SLASH_HEREfgfs-builderMY_SLASH_HEREinstall/PLIB_PREFIX\ :=\ $INSTALL_DIR_PLIB_NO_SLASHES/g > Makefile_temp
-			mv -f Makefile_temp Makefile_NOSLASHES
-	
-			#2
-			CXXFLAGS=$(cat Makefile_NOSLASHES | grep ^CXXFLAGS | head -n 1)
-			CXXFLAGS2=$CXXFLAGS" -I $INSTALL_DIR_SIMGEAR/include -I $INSTALL_DIR_OSG/include" 
-			CXXFLAGS3=$(echo $CXXFLAGS2 | sed s/\\//MY_SLASH_HERE/g)
-	
-			cat Makefile_NOSLASHES | sed s/^CXXFLAGS\ *:=.*/"$CXXFLAGS3"/g  > Makefile_temp
-			mv -f Makefile_temp Makefile_NOSLASHES	
-	
-			#3
-			LDFLAGS=$(cat Makefile_NOSLASHES | grep ^LDFLAGS | head -n 1)
-			LDFLAGS2=$LDFLAGS" -L $INSTALL_DIR_SIMGEAR/lib" 
-			LDFLAGS3=$(echo $LDFLAGS2 | sed s/\\//MY_SLASH_HERE/g)
-	
-			cat Makefile_NOSLASHES | sed s/^LDFLAGS.*/"$LDFLAGS3"/g  > Makefile_temp
-			mv -f Makefile_temp Makefile_NOSLASHES	
-	
-			#4
-			INSTALL_DIR_FGCOM_NO_SLASHS=$(echo "$INSTALL_DIR_FGCOM" | sed -e 's/\//MY_SLASH_HERE/g')
-			INSTALL_BIN_FGCOM_NO_SLASHS="$INSTALL_DIR_FGCOM_NO_SLASHS""MY_SLASH_HEREbin"
-	
-			cat Makefile_NOSLASHES | sed s/INSTALL_BIN\ *:=\ *MY_SLASH_HEREusrMY_SLASH_HERElocalMY_SLASH_HEREbin/INSTALL_BIN\ :=\ $INSTALL_BIN_FGCOM_NO_SLASHS/g > Makefile_temp		
-			mv -f Makefile_temp Makefile_NOSLASHES	
-	
-			cat Makefile_NOSLASHES | sed s/INSTALL_DIR\ *:=\ *MY_SLASH_HEREusrMY_SLASH_HERElocal/INSTALL_DIR\ :=\ $INSTALL_DIR_FGCOM_NO_SLASHS/g > Makefile_temp		
-			mv -f Makefile_temp Makefile_NOSLASHES	
-		
-	
-			#last
-			cat Makefile_NOSLASHES | sed s/MY_SLASH_HERE/\\//g > Makefile
-
-		fi
+		cd "$CBD"
+		mkdir -p build/fgcom
 
 		cd "$CBD"/build/fgcom
+		echo -n "RECONFIGURE FGCOM ... " >> $LOGFILE
+		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
 
-		mkdir -p "$INSTALL_DIR_FGCOM"/bin
+		echo " OK" >> $LOGFILE
 
-		if [ "$COMPILE" = "y" ]
-		then
-			echo "MAKE FGCOM" >> $LOGFILE
-			echo "cmake --build . --config Release" >> $LOGFILE
-			cmake --build . --config Release 2>&1 | tee -a $LOGFILE
+	        cd "$CBD"/fgcom/src/
+
+		cp Makefile Makefile.original
+		cat Makefile | sed s/\\//MY_SLASH_HERE/g > Makefile_NOSLASHES
+	
+		# 1
+		INSTALL_DIR_PLIB_NO_SLASHES=$(echo "$INSTALL_DIR_PLIB" | sed -e 's/\//MY_SLASH_HERE/g')
+		cat Makefile_NOSLASHES | sed s/PLIB_PREFIX\ *:=\ *MY_SLASH_HEREusrMY_SLASH_HERElocalMY_SLASH_HEREsrcMY_SLASH_HEREfgfs-builderMY_SLASH_HEREinstall/PLIB_PREFIX\ :=\ $INSTALL_DIR_PLIB_NO_SLASHES/g > Makefile_temp
+		mv -f Makefile_temp Makefile_NOSLASHES
+	
+		#2
+		CXXFLAGS=$(cat Makefile_NOSLASHES | grep ^CXXFLAGS | head -n 1)
+		CXXFLAGS2=$CXXFLAGS" -I $INSTALL_DIR_SIMGEAR/include -I $INSTALL_DIR_OSG/include" 
+		CXXFLAGS3=$(echo $CXXFLAGS2 | sed s/\\//MY_SLASH_HERE/g)
+	
+		cat Makefile_NOSLASHES | sed s/^CXXFLAGS\ *:=.*/"$CXXFLAGS3"/g  > Makefile_temp
+		mv -f Makefile_temp Makefile_NOSLASHES	
+	
+		#3
+		LDFLAGS=$(cat Makefile_NOSLASHES | grep ^LDFLAGS | head -n 1)
+		LDFLAGS2=$LDFLAGS" -L $INSTALL_DIR_SIMGEAR/lib" 
+		LDFLAGS3=$(echo $LDFLAGS2 | sed s/\\//MY_SLASH_HERE/g)
+	
+		cat Makefile_NOSLASHES | sed s/^LDFLAGS.*/"$LDFLAGS3"/g  > Makefile_temp
+		mv -f Makefile_temp Makefile_NOSLASHES	
+	
+		#4
+		INSTALL_DIR_FGCOM_NO_SLASHS=$(echo "$INSTALL_DIR_FGCOM" | sed -e 's/\//MY_SLASH_HERE/g')
+		INSTALL_BIN_FGCOM_NO_SLASHS="$INSTALL_DIR_FGCOM_NO_SLASHS""MY_SLASH_HEREbin"
+	
+		cat Makefile_NOSLASHES | sed s/INSTALL_BIN\ *:=\ *MY_SLASH_HEREusrMY_SLASH_HERElocalMY_SLASH_HEREbin/INSTALL_BIN\ :=\ $INSTALL_BIN_FGCOM_NO_SLASHS/g > Makefile_temp		
+		mv -f Makefile_temp Makefile_NOSLASHES	
+	
+		cat Makefile_NOSLASHES | sed s/INSTALL_DIR\ *:=\ *MY_SLASH_HEREusrMY_SLASH_HERElocal/INSTALL_DIR\ :=\ $INSTALL_DIR_FGCOM_NO_SLASHS/g > Makefile_temp		
+		mv -f Makefile_temp Makefile_NOSLASHES	
 		
-			echo "INSTALL FGCOM" >> $LOGFILE
-			cmake ${VERBOSE_MAKEFILE} -DBUILD_TYPE=Release -P cmake_install.cmake 2>&1 | tee -a $LOGFILE
-		fi
-		cd "$CBD"
+	
+		#last
+		cat Makefile_NOSLASHES | sed s/MY_SLASH_HERE/\\//g > Makefile
 
-		echo "#!/bin/sh" > run_fgcom.sh
-		echo "cd \$(dirname \$0)" >> run_fgcom.sh
-		echo "cd $SUB_INSTALL_DIR/$FGCOM_INSTALL_DIR/bin" >> 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
-		chmod 755 run_fgcom.sh
 	fi
+
+	cd "$CBD"/build/fgcom
+
+	mkdir -p "$INSTALL_DIR_FGCOM"/bin
+
+	if [ "$COMPILE" = "y" ]
+	then
+		echo "MAKE FGCOM" >> $LOGFILE
+		echo "cmake --build . --config Release" >> $LOGFILE
+		cmake --build . --config Release 2>&1 | tee -a $LOGFILE
+		
+		echo "INSTALL FGCOM" >> $LOGFILE
+		cmake -DBUILD_TYPE=Release -P cmake_install.cmake 2>&1 | tee -a $LOGFILE
+	fi
+	cd "$CBD"
+
+	echo "#!/bin/sh" > run_fgcom.sh
+	echo "cd \$(dirname \$0)" >> run_fgcom.sh
+	echo "cd $SUB_INSTALL_DIR/$FGCOM_INSTALL_DIR/bin" >> 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
+	chmod 755 run_fgcom.sh
+
 fi
 
+
+
 #######################################################
 # FGCOMGUI
 #######################################################
@@ -1307,7 +1361,7 @@ FGCOMGUI_INSTALL_DIR=fgcomgui
 INSTALL_DIR_FGCOMGUI=$INSTALL_DIR/$FGCOMGUI_INSTALL_DIR
 cd "$CBD"
 
-if [[ "$(declare -p WHATTOBUILD)" =~ '['([0-9]+)']="FGCOMGUI"' ]]
+if [ "$WHATTOBUILD" = "ALL" -o "$WHATTOBUILD" = "FGCOMGUI" ]
 then
 	echo "****************************************" | tee -a $LOGFILE
 	echo "*************** FGCOMGUI ***************" | tee -a $LOGFILE
@@ -1329,30 +1383,30 @@ then
 		
 	fi
 	
-	if [ -d "fgcomgui" ]
-	then
-		cd fgcomgui/
+	cd fgcomgui/
 	
-		mkdir -p "$INSTALL_DIR_FGCOMGUI"
+	mkdir -p "$INSTALL_DIR_FGCOMGUI"
 
-		if [ "$COMPILE" = "y" ]
-		then
-			echo "SCONS FGCOMGUI" >> $LOGFILE
-			echo "scons prefix=\"$INSTALL_DIR_FGCOMGUI\" $JOPTION" >> $LOGFILE
-			scons prefix="$INSTALL_DIR_FGCOMGUI" $JOPTION 2>&1 | tee -a $LOGFILE
-			echo "INSTALL FGCOM" >> $LOGFILE
-			scons install 2>&1 | tee -a $LOGFILE
-		fi
-		cd "$CBD"
-
-		echo "#!/bin/sh" > run_fgcomgui.sh
-		echo "cd \$(dirname \$0)" >> run_fgcomgui.sh
-		echo "cd $SUB_INSTALL_DIR/$FGCOMGUI_INSTALL_DIR/bin" >> run_fgcomgui.sh
-		echo "export LD_LIBRARY_PATH=../../$PLIB_INSTALL_DIR/lib:../../$OSG_INSTALL_DIR/lib:../../$SIMGEAR_INSTALL_DIR/lib" >> run_fgcomgui.sh
-		echo "export PATH=../../fgcom/bin/:$PATH" >> run_fgcomgui.sh
-		echo "./fgcomgui \$@" >> run_fgcomgui.sh
-		chmod 755 run_fgcomgui.sh
+	if [ "$COMPILE" = "y" ]
+	then
+		
+		
+		echo "SCONS FGCOMGUI" >> $LOGFILE
+		echo "scons prefix=\"$INSTALL_DIR_FGCOMGUI\" $JOPTION" >> $LOGFILE
+		scons prefix="$INSTALL_DIR_FGCOMGUI" $JOPTION 2>&1 | tee -a $LOGFILE
+		echo "INSTALL FGCOM" >> $LOGFILE
+		scons install 2>&1 | tee -a $LOGFILE
 	fi
+	cd "$CBD"
+
+	echo "#!/bin/sh" > run_fgcomgui.sh
+	echo "cd \$(dirname \$0)" >> run_fgcomgui.sh
+	echo "cd $SUB_INSTALL_DIR/$FGCOMGUI_INSTALL_DIR/bin" >> run_fgcomgui.sh
+	echo "export LD_LIBRARY_PATH=../../$PLIB_INSTALL_DIR/lib:../../$OSG_INSTALL_DIR/lib:../../$SIMGEAR_INSTALL_DIR/lib" >> run_fgcomgui.sh
+	echo "export PATH=../../fgcom/bin/:$PATH" >> run_fgcomgui.sh
+	echo "./fgcomgui \$@" >> run_fgcomgui.sh
+	chmod 755 run_fgcomgui.sh
+
 fi
 
 
@@ -1363,68 +1417,69 @@ ATLAS_INSTALL_DIR=atlas
 INSTALL_DIR_ATLAS=$INSTALL_DIR/$ATLAS_INSTALL_DIR
 cd "$CBD"
 
-if [[ "$(declare -p WHATTOBUILD)" =~ '['([0-9]+)']="ATLAS"' ]]
+if [ "$WHATTOBUILD" = "ALL" -o "$WHATTOBUILD" = "ATLAS" ]
 then
 	echo "****************************************" | tee -a $LOGFILE
 	echo "**************** ATLAS *****************" | tee -a $LOGFILE
 	echo "****************************************" | tee -a $LOGFILE
 
+
+
 	if [ "$DOWNLOAD" = "y" ]
 	then
 		echo -n "CSV FROM atlas.cvs.sourceforge.net:/cvsroot/atlas ... " >> $LOGFILE
 		cvs -z3 -d:pserver:anonymous@atlas.cvs.sourceforge.net:/cvsroot/atlas co Atlas
 		echo " OK" >> $LOGFILE
 
-		echo "fixing old function name \".get_gbs_center2(\" in Subbucket.cxx"
-		cd Atlas/src
-		cp Subbucket.cxx Subbucket.cxx.original
-		cat Subbucket.cxx.original | sed s/\.get_gbs_center2\(/\.get_gbs_center\(/g > Subbucket.cxx
-		cd "$CBD"
+        echo "fixing old function name \".get_gbs_center2(\" in Subbucket.cxx"
+        cd Atlas/src
+        cp Subbucket.cxx Subbucket.cxx.original
+        cat Subbucket.cxx.original | sed s/\.get_gbs_center2\(/\.get_gbs_center\(/g > Subbucket.cxx
+        cd "$CBD"
 	fi
-	
-	if [ -d "Atlas" ]
+	cd Atlas
+
+	if [ ! "$UPDATE" = "UPDATE" ]
 	then
-		cd Atlas
-
-		if [ ! "$UPDATE" = "UPDATE" ]
+		if [ "$RECONFIGURE" = "y" ]
 		then
-			if [ "$RECONFIGURE" = "y" ]
-			then
 
-				cd "$CBD"
-		                mkdir -p build/atlas
+			cd "$CBD"
+                        mkdir -p build/atlas
 
-				cd Atlas
-				echo "AUTOGEN ATLAS" >> $LOGFILE
-				./autogen.sh 2>&1 | tee -a $LOGFILE
-				echo "CONFIGURE ATLAS" >> $LOGFILE
-				cd "$CBD"/build/atlas
-				../../Atlas/configure --prefix=$INSTALL_DIR_ATLAS --exec-prefix=$INSTALL_DIR_ATLAS  --with-plib=$INSTALL_DIR_PLIB --with-simgear="$INSTALL_DIR_SIMGEAR" --with-fgbase="$INSTALL_DIR_FGFS/fgdata" CXXFLAGS="$CXXFLAGS -I$CBD/OpenSceneGraph/include" 2>&1 | tee -a $LOGFILE
-				make clean
-			fi
-		fi
-		if [ "$COMPILE" = "y" ]
-		then
-			echo "MAKE ATLAS" >> $LOGFILE
-			echo "make $JOPTION $OOPTION" >> $LOGFILE
-		
+			cd Atlas
+			echo "AUTOGEN ATLAS" >> $LOGFILE
+			./autogen.sh 2>&1 | tee -a $LOGFILE
+			echo "CONFIGURE ATLAS" >> $LOGFILE
 			cd "$CBD"/build/atlas
-			make $JOPTION $OOPTION 2>&1 | tee -a $LOGFILE
-
-			echo "INSTALL ATLAS" >> $LOGFILE
-			make install 2>&1 | tee -a $LOGFILE
+			../../Atlas/configure --prefix=$INSTALL_DIR_ATLAS --exec-prefix=$INSTALL_DIR_ATLAS  --with-plib=$INSTALL_DIR_PLIB --with-simgear="$INSTALL_DIR_SIMGEAR" --with-fgbase="$INSTALL_DIR_FGFS/fgdata" CXXFLAGS="$CXXFLAGS -I$CBD/OpenSceneGraph/include" 2>&1 | tee -a $LOGFILE
+			make clean
 		fi
-		cd "$CBD"
-
-		echo "#!/bin/sh" > run_atlas.sh
-		echo "cd \$(dirname \$0)" >> run_atlas.sh
-		echo "cd $SUB_INSTALL_DIR/$ATLAS_INSTALL_DIR/bin" >> 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
-		chmod 755 run_atlas.sh
 	fi
+	if [ "$COMPILE" = "y" ]
+	then
+		echo "MAKE ATLAS" >> $LOGFILE
+		echo "make $JOPTION $OOPTION" >> $LOGFILE
+		
+		cd "$CBD"/build/atlas
+		make $JOPTION $OOPTION 2>&1 | tee -a $LOGFILE
+
+		echo "INSTALL ATLAS" >> $LOGFILE
+		make install 2>&1 | tee -a $LOGFILE
+	fi
+	cd "$CBD"
+
+	echo "#!/bin/sh" > run_atlas.sh
+	echo "cd \$(dirname \$0)" >> run_atlas.sh
+	echo "cd $SUB_INSTALL_DIR/$ATLAS_INSTALL_DIR/bin" >> 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
+	chmod 755 run_atlas.sh
+
 fi
 
+
+
 echo "To start fgfs, run the run_fgfs.sh file"
 echo "To start terrasync, run the run_terrasync.sh file"
 echo "To start fgrun, run the run_fgrun.sh file"
@@ -1432,7 +1487,8 @@ echo "To start fgcom, run the run_fgcom.sh file"
 echo "To start fgcom GUI, run the run_fgcomgui.sh file"
 echo "To start atlas, run the run_atlas.sh file"
 
-if [ "$HELP" = "HELP" ]
+
+if [ "$WHATTOBUILD" = "--help" ]
 then
 	echo ""
 else

hudson_build_release.sh

@@ -5,8 +5,6 @@ if [ "$WORKSPACE" == "" ]; then
     exit 1
 fi
 
-VERSION=`cat flightgear/version`
-
 #####################################################################################
 # remove old and create fresh build directories
 rm -rf sgBuild
@@ -55,14 +53,3 @@ make install
 make package_source
 cp flightgear-*.tar.bz2 ../output/.
 
-#####################################################################################
-
-echo "Assembling base package"
-cd $WORKSPACE
-
-echo "Syncing base packages files from sphere.telascience.org"
-rsync -avz --filter 'merge base-package.rules' \
- -e ssh jturner@sphere.telascience.org:/home/jturner/fgdata .
-
-tar cjf output/FlightGear-$VERSION-data.tar.bz2 fgdata/
-

hudson_mac_build_release.sh

@@ -21,7 +21,7 @@ pushd sgBuild
 cmake -DCMAKE_INSTALL_PREFIX:PATH=$WORKSPACE/dist -G Xcode ../simgear
 
 # compile
-xcodebuild -configuration RelWithDebInfo -target install  build
+xcodebuild -configuration Release -target install  build
 
 if [ $? -ne '0' ]; then
     echo "make simgear failed"
@@ -35,7 +35,7 @@ echo "Starting on FlightGear"
 pushd fgBuild
 cmake -DCMAKE_INSTALL_PREFIX:PATH=$WORKSPACE/dist -G Xcode ../flightgear
 
-xcodebuild -configuration RelWithDebInfo -target install  build
+xcodebuild -configuration Release -target install  build
 
 if [ $? -ne '0' ]; then
     echo "make flightgear failed"

hudson_mac_package_release.rb

@@ -86,7 +86,7 @@ fgCurrentYear = t.year
 fgVersion = File.read("#{srcDir}/version").strip
 volName="\"FlightGear #{fgVersion}\""
 
-dmgPath = Dir.pwd + "/output/FlightGear-#{fgVersion}.dmg"
+dmgPath = Dir.pwd + "/output/fg_mac_#{fgVersion}.dmg"
 
 puts "Creating directory structure"
 `mkdir -p #{macosDir}`
@@ -131,7 +131,7 @@ puts "Copying Macflightgear launcher files"
 
 Dir.chdir "maclauncher/FlightGearOSX" do
   `cp FlightGear #{macosDir}`
-  `rsync -a *.rb *.lproj *.sh *.tiff *.html #{resourcesDir}`
+  `rsync -a *.rb *.lproj *.sh *.tiff #{resourcesDir}`
 end
 
 if File.exist?("#{$prefixDir}/bin/fgcom-data")
@@ -150,10 +150,6 @@ File.open("#{contents}/Info.plist", 'w') { |f|
 `cp #{srcDir}/package/mac/FlightGear.icns #{resourcesDir}/FlightGear.icns`
 `cp #{srcDir}/COPYING #{dmgDir}`
 
-# move documentation to a public place
-`mv fgdata/Docs/FGShortRef.pdf "#{dmgDir}/Quick Reference.pdf"`
-`mv fgdata/Docs/getstart.pdf "#{dmgDir}/Getting Started.pdf"`
-
 puts "Copying base package files into the image"
 `rsync -a fgdata/ #{resourcesDir}/data`
 

hudson_win_build32.bat

@@ -1,11 +1,9 @@
+
 IF NOT DEFINED WORKSPACE SET WORKSPACE=%~dp0
 
-SET /P SIMGEAR_VERSION=<%WORKSPACE%\simgear\version
-ECHO #define SIMGEAR_VERSION "%SIMGEAR_VERSION%" > %WORKSPACE%\simgear\simgear\version.h
-
+ECHO #define SIMGEAR_VERSION "2.9.0" > %WORKSPACE%\simgear\simgear\version.h
 rem set PATH=%PATH%;D:\Program Files (x86)\CMake 2.8\bin
 rem call "C:\Program Files (x86)\Microsoft Visual Studio 10.0\Common7\Tools\vsvars32.bat"
-
 md build-sg
 md build-fg
 md build-fgrun

hudson_win_build64.bat

@@ -1,13 +1,9 @@
+
 IF NOT DEFINED WORKSPACE SET WORKSPACE=%~dp0
 
-
-SET /P SIMGEAR_VERSION=<%WORKSPACE%\simgear\version
-ECHO #define SIMGEAR_VERSION "%SIMGEAR_VERSION%" > %WORKSPACE%\simgear\simgear\version.h
-
-rem ECHO #define SIMGEAR_VERSION "2.9.0" > %WORKSPACE%\simgear\simgear\version.h
+ECHO #define SIMGEAR_VERSION "2.9.0" > %WORKSPACE%\simgear\simgear\version.h
 rem set PATH=%PATH%;D:\Program Files (x86)\CMake 2.8\bin
 rem call "C:\Program Files (x86)\Microsoft Visual Studio 10.0\VC\vcvarsall.bat" amd64
-
 md build-sg64
 md build-fg64
 md build-fgrun64

hudson_win_package_release.bat

@@ -10,31 +10,21 @@ REM construct information file to be read by Inno-setup
 
 
 set PATH=%WORKSPACE%\install\msvc100\OpenSceneGraph\bin;%PATH%
-
-REM add 7-zip to the PATH
-set PATH=%PATH%;C:\Program Files\7-zip
-
 REM indirect way to get command output into an environment variable
 osgversion --so-number > %TEMP%\osg-so-number.txt
 osgversion --version-number > %TEMP%\osg-version.txt
-osgversion --openthreads-soversion-number > %TEMP%\openthreads-so-number.txt
 
 SET /P FLIGHTGEAR_VERSION=<flightgear\version
 SET /P OSG_VERSION=<%TEMP%\osg-version.txt
 SET /P OSG_SO_NUMBER=<%TEMP%\osg-so-number.txt
-SET /P OT_SO_NUMBER=<%TEMP%\openthreads-so-number.txt
 
 ECHO #define FGVersion "%FLIGHTGEAR_VERSION%" > InstallConfig.iss
 ECHO #define OSGVersion "%OSG_VERSION%" >> InstallConfig.iss
 ECHO #define OSGSoNumber "%OSG_SO_NUMBER%" >> InstallConfig.iss
-ECHO #define OTSoNumber "%OT_SO_NUMBER%" >> InstallConfig.iss
-
-set DATA_FILE=FlightGear-%FLIGHTGEAR_VERSION%-data
-
-REM extract the data files
-7z e -aoa %DATA_FILE%.tar.bz2 && 7z x -aoa %DATA_FILE%.tar
 
 REM run Inno-setup!
-REM use iscc instead of compil32 for better error reporting
 
-iscc FlightGear.iss
+Compil32 /cc FlightGear.iss
+
+
+

installWinDeps.bat

@@ -1,12 +0,0 @@
-
-
-REM ExternalProject can't cleanly extract a zip into an existing directory
-REM Instead we extract to a subdir, and then move the directories we want
-REM using this bat file.
-
-echo %CD%
-
-md 3rdParty
-xcopy /Y /E winDeps/3rdParty 3rdParty
-
-echo "Done copying Windows deps"