Change submodules to use git protocol (Hudson doesn't like SSH)

.gitignore

@@ -1,20 +0,0 @@
-dist
-.DS_Store
-install
-3rdParty
-boost_1_44_0
-InstallConfig.iss
-Output
-output
-fgBuild
-sgBuild
-image
-macflightgear
-fgdata
-src
-tmp
-Makefile
-CMakeFiles
-archivebuild
-osgbuild
-CMakeCache.txt

.gitmodules

@@ -1,12 +1,7 @@
-[submodule "simgear"]
-	path = simgear
-	url = git://gitorious.org/fg/simgear.git
 [submodule "flightgear"]
 	path = flightgear
 	url = git://gitorious.org/fg/flightgear.git
-[submodule "fgrun"]
-	path = fgrun
-	url = git://gitorious.org/fg/fgrun.git
-[submodule "maclauncher"]
-	path = maclauncher
-	url = git://gitorious.org/fg/maclauncher.git
+	
+[submodule "simgear"]
+	path = simgear
+	url = git://gitorious.org/fg/simgear.git

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

@@ -1,296 +0,0 @@
-; Script generated by the Inno Setup Script Wizard.
-; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!
-;
-; This script creates an installable FlightGear package for Win32 using the
-; "Inno Setup" package builder.  Inno Setup is free (but probably not open
-; source?.)  The official web site for this package building software is:
-;
-;     http://www.jrsoftware.org/isinfo.php
-;
-; Note: the files must appear in the X: drive.
-; You can do this with the command below:
-;
-;     subst X: path_to_files
-;
-; For example:
-;
-;     C:\> subst X: F:\Path\to\FlightGear\root
-;     C:\> subst X: F:\
-;
-
-#include "InstallConfig.iss"
-
-#if GetEnv("VSINSTALLDIR") == ""
-  #define VSInstallDir "C:\Program Files (x86)\Microsoft Visual Studio 10.0"
-#else
-  #define VSInstallDir GetEnv("VSINSTALLDIR")
-#endif
-
-#define VCInstallDir VSInstallDir + "\VC"
-#define OSGInstallDir "X:\install\msvc100\OpenSceneGraph"
-#define OSGPluginsDir OSGInstallDir + "\bin\osgPlugins-" + OSGVersion
-
-#define OSG64InstallDir "X:\install\msvc100-64\OpenSceneGraph"
-#define OSG64PluginsDir OSG64InstallDir + "\bin\osgPlugins-" + OSGVersion
-
-[Setup]
-AppId=FlightGear
-AppName=FlightGear
-AppPublisher=The FlightGear Team
-OutputBaseFilename=fgsetup-{#FGVersion}
-AppVerName=FlightGear v{#FGVersion}
-AppPublisherURL=http://www.flightgear.org
-AppSupportURL=http://www.flightgear.org
-AppUpdatesURL=http://www.flightgear.org
-DefaultDirName={pf}\FlightGear
-DefaultGroupName=FlightGear {#FGVersion}
-LicenseFile=X:\flightgear\COPYING
-Uninstallable=yes
-SetupIconFile=X:\flightgear\package\flightgear.ico
-VersionInfoVersion={#FGVersion}.0
-WizardImageFile=X:\flightgear\package\Win32-Inno\setupimg.bmp
-WizardImageStretch=No
-WizardSmallImageFile=X:\flightgear\package\Win32-Inno\setupsmall.bmp
-VersionInfoCompany=The FlightGear Team
-UninstallDisplayIcon=X:\flightgear\projects\VC90\flightgear.ico
-ArchitecturesInstallIn64BitMode=x64
-ArchitecturesAllowed=x86 x64
-
-[Tasks]
-; NOTE: The following entry contains English phrases ("Create a desktop icon" and "Additional icons"). You are free to translate them into another language if required.
-Name: "desktopicon"; Description: "Create a &desktop icon"; GroupDescription: "Additional icons:"
-Name: "insoal"; Description: "Install OpenAL (the sound engine)"
-Name: "force32"; Description: "Force 32bit install on 64bit system"; Check: Is64BitInstallMode
-
-[Files]
-; NOTE: run subst X: F:\ (or whatever path the expanded tree resides at)
-;Source: "X:\*.txt"; DestDir: "{app}"; Flags: ignoreversion
-Source: "X:\install\msvc100\FlightGear\bin\fgfs.exe"; DestDir: "{app}\bin\Win32"; Flags: ignoreversion; Check: not Is64BitInstallMode or IsTaskSelected('force32')
-Source: "X:\install\msvc100-64\FlightGear\bin\fgfs.exe"; DestDir: "{app}\bin\Win64"; Flags: ignoreversion skipifsourcedoesntexist; Check: Is64BitInstallMode and not IsTaskSelected('force32')
-
-;Unconditional install
-Source: "X:\install\msvc100\FlightGear\bin\fgadmin.exe"; DestDir: "{app}\bin\Win32"; Flags: ignoreversion
-Source: "X:\install\msvc100\FlightGear\bin\terrasync.exe"; DestDir: "{app}\bin\Win32"; Flags: ignoreversion
-Source: "X:\install\msvc100\FlightGear\bin\js_demo.exe"; DestDir: "{app}\bin\Win32"; Flags: ignoreversion
-Source: "X:\install\msvc100\FlightGear\bin\fgjs.exe"; DestDir: "{app}\bin\Win32"; Flags: ignoreversion
-Source: "X:\install\msvc100\FlightGear\bin\fgpanel.exe"; DestDir: "{app}\bin\Win32"; Flags: ignoreversion
-Source: "X:\install\msvc100\FlightGear\bin\GPSsmooth.exe"; DestDir: "{app}\bin\Win32"; Flags: ignoreversion
-Source: "X:\install\msvc100\FlightGear\bin\UGsmooth.exe"; DestDir: "{app}\bin\Win32"; Flags: ignoreversion
-Source: "X:\install\msvc100\FlightGear\bin\MIDGsmooth.exe"; DestDir: "{app}\bin\Win32"; Flags: ignoreversion
-Source: "X:\install\msvc100\FlightGear\bin\metar.exe"; DestDir: "{app}\bin\Win32"; Flags: ignoreversion
-Source: "X:\install\msvc100\FlightGear\bin\yasim.exe"; DestDir: "{app}\bin\Win32"; Flags: ignoreversion
-Source: "X:\3rdParty\bin\*.dll"; DestDir: "{app}\bin\Win32"
-
-Source: "X:\install\msvc100\FGRun\bin\fgrun.exe"; DestDir: "{app}\bin\Win32"; Flags: ignoreversion ; Check: not Is64BitInstallMode or IsTaskSelected('force32')
-Source: "X:\install\msvc100\FGRun\share\locale\*"; DestDir: "{app}\bin\Win32\locale"; Flags: ignoreversion recursesubdirs; Check: not Is64BitInstallMode or IsTaskSelected('force32')
-
-Source: "X:\install\msvc100-64\FGRun\bin\fgrun.exe"; DestDir: "{app}\bin\Win64"; Flags: ignoreversion skipifsourcedoesntexist; Check: Is64BitInstallMode and not IsTaskSelected('force32')
-Source: "X:\install\msvc100-64\FGRun\share\locale\*"; DestDir: "{app}\bin\Win64\locale"; Flags: ignoreversion recursesubdirs skipifsourcedoesntexist; Check: Is64BitInstallMode and not IsTaskSelected('force32')
-
-Source: "X:\3rdParty.x64\bin\*.dll"; DestDir: "{app}\bin\Win64"; Flags: skipifsourcedoesntexist; Check: Is64BitInstallMode and not IsTaskSelected('force32')
-
-Source: "{#VCInstallDir}\redist\x86\Microsoft.VC100.CRT\*.dll"; DestDir:  "{app}\bin\Win32"
-Source: "{#VCInstallDir}\redist\x64\Microsoft.VC100.CRT\*.dll"; DestDir:  "{app}\bin\Win64";  Flags: skipifsourcedoesntexist;   Check: Is64BitInstallMode and not IsTaskSelected('force32')
-Source: "X:\3rdParty\bin\vcredist_x86.exe"; DestDir: "{app}\bin\Win32"; Flags: skipifsourcedoesntexist
-Source: "X:\3rdParty.x64\bin\vcredist_x64.exe"; DestDir: "{app}\bin\Win64"; Flags: skipifsourcedoesntexist; Check: Is64BitInstallMode and not IsTaskSelected('force32')
-
-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')
-Source: "{#OSGInstallDir}\bin\osg{#OSGSoNumber}-osgGA.dll"; DestDir: "{app}\bin\Win32"; Check: not Is64BitInstallMode or IsTaskSelected('force32')
-Source: "{#OSGInstallDir}\bin\osg{#OSGSoNumber}-osgParticle.dll"; DestDir: "{app}\bin\Win32"; Check: not Is64BitInstallMode or IsTaskSelected('force32')
-Source: "{#OSGInstallDir}\bin\osg{#OSGSoNumber}-osgText.dll"; DestDir: "{app}\bin\Win32"; Check: not Is64BitInstallMode or IsTaskSelected('force32')
-Source: "{#OSGInstallDir}\bin\osg{#OSGSoNumber}-osgUtil.dll"; DestDir: "{app}\bin\Win32"; Check: not Is64BitInstallMode or IsTaskSelected('force32')
-Source: "{#OSGInstallDir}\bin\osg{#OSGSoNumber}-osgViewer.dll"; DestDir: "{app}\bin\Win32"; Check: not Is64BitInstallMode or IsTaskSelected('force32')
-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: "{#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')
-Source: "{#OSGPluginsDir}\osgdb_osga.dll"; DestDir: "{app}\bin\Win32\osgPlugins-{#OSGVersion}"; Check: not Is64BitInstallMode or IsTaskSelected('force32')
-Source: "{#OSGPluginsDir}\osgdb_3ds.dll"; DestDir: "{app}\bin\Win32\osgPlugins-{#OSGVersion}"; Check: not Is64BitInstallMode or IsTaskSelected('force32')
-Source: "{#OSGPluginsDir}\osgdb_mdl.dll"; DestDir: "{app}\bin\Win32\osgPlugins-{#OSGVersion}"; Check: not Is64BitInstallMode or IsTaskSelected('force32')
-Source: "{#OSGPluginsDir}\osgdb_jpeg.dll"; DestDir: "{app}\bin\Win32\osgPlugins-{#OSGVersion}"; Check: not Is64BitInstallMode or IsTaskSelected('force32')
-Source: "{#OSGPluginsDir}\osgdb_rgb.dll"; DestDir: "{app}\bin\Win32\osgPlugins-{#OSGVersion}"; Check: not Is64BitInstallMode or IsTaskSelected('force32')
-Source: "{#OSGPluginsDir}\osgdb_png.dll"; DestDir: "{app}\bin\Win32\osgPlugins-{#OSGVersion}"; Check: not Is64BitInstallMode or IsTaskSelected('force32')
-Source: "{#OSGPluginsDir}\osgdb_dds.dll"; DestDir: "{app}\bin\Win32\osgPlugins-{#OSGVersion}"; Check: not Is64BitInstallMode or IsTaskSelected('force32')
-Source: "{#OSGPluginsDir}\osgdb_txf.dll"; DestDir: "{app}\bin\Win32\osgPlugins-{#OSGVersion}"; Check: not Is64BitInstallMode or IsTaskSelected('force32')
-Source: "{#OSGPluginsDir}\osgdb_freetype.dll"; DestDir: "{app}\bin\Win32\osgPlugins-{#OSGVersion}"; Check: not Is64BitInstallMode or IsTaskSelected('force32')
-Source: "{#OSGPluginsDir}\osgdb_serializers_osg.dll"; DestDir: "{app}\bin\Win32\osgPlugins-{#OSGVersion}"; Check: not Is64BitInstallMode or IsTaskSelected('force32')
-Source: "{#OSGPluginsDir}\osgdb_serializers_osganimation.dll"; DestDir: "{app}\bin\Win32\osgPlugins-{#OSGVersion}"; Check: not Is64BitInstallMode or IsTaskSelected('force32')
-Source: "{#OSGPluginsDir}\osgdb_serializers_osgfx.dll"; DestDir: "{app}\bin\Win32\osgPlugins-{#OSGVersion}"; Check: not Is64BitInstallMode or IsTaskSelected('force32')
-Source: "{#OSGPluginsDir}\osgdb_serializers_osgmanipulator.dll"; DestDir: "{app}\bin\Win32\osgPlugins-{#OSGVersion}"; Check: not Is64BitInstallMode or IsTaskSelected('force32')
-Source: "{#OSGPluginsDir}\osgdb_serializers_osgparticle.dll"; DestDir: "{app}\bin\Win32\osgPlugins-{#OSGVersion}"; Check: not Is64BitInstallMode or IsTaskSelected('force32')
-Source: "{#OSGPluginsDir}\osgdb_serializers_osgshadow.dll"; DestDir: "{app}\bin\Win32\osgPlugins-{#OSGVersion}"; Check: not Is64BitInstallMode or IsTaskSelected('force32')
-Source: "{#OSGPluginsDir}\osgdb_serializers_osgsim.dll"; DestDir: "{app}\bin\Win32\osgPlugins-{#OSGVersion}"; Check: not Is64BitInstallMode or IsTaskSelected('force32')
-Source: "{#OSGPluginsDir}\osgdb_serializers_osgterrain.dll"; DestDir: "{app}\bin\Win32\osgPlugins-{#OSGVersion}"; Check: not Is64BitInstallMode or IsTaskSelected('force32')
-Source: "{#OSGPluginsDir}\osgdb_serializers_osgtext.dll"; DestDir: "{app}\bin\Win32\osgPlugins-{#OSGVersion}"; Check: not Is64BitInstallMode or IsTaskSelected('force32')
-Source: "{#OSGPluginsDir}\osgdb_serializers_osgvolume.dll"; DestDir: "{app}\bin\Win32\osgPlugins-{#OSGVersion}"; Check: not Is64BitInstallMode or IsTaskSelected('force32')
-Source: "{#OSGPluginsDir}\osgdb_deprecated_osg.dll"; DestDir: "{app}\bin\Win32\osgPlugins-{#OSGVersion}"; Check: not Is64BitInstallMode or IsTaskSelected('force32')
-Source: "{#OSGPluginsDir}\osgdb_deprecated_osgparticle.dll"; DestDir: "{app}\bin\Win32\osgPlugins-{#OSGVersion}"; Check: not Is64BitInstallMode or IsTaskSelected('force32')
-
-Source: "{#OSG64InstallDir}\bin\osg{#OSGSoNumber}-osg.dll"; DestDir: "{app}\bin\Win64"; Flags: skipifsourcedoesntexist; Check: Is64BitInstallMode and not IsTaskSelected('force32')
-Source: "{#OSG64InstallDir}\bin\osg{#OSGSoNumber}-osgDB.dll"; DestDir: "{app}\bin\Win64"; Flags: skipifsourcedoesntexist; Check: Is64BitInstallMode and not IsTaskSelected('force32')
-Source: "{#OSG64InstallDir}\bin\osg{#OSGSoNumber}-osgGA.dll"; DestDir: "{app}\bin\Win64"; Flags: skipifsourcedoesntexist; Check: Is64BitInstallMode and not IsTaskSelected('force32')
-Source: "{#OSG64InstallDir}\bin\osg{#OSGSoNumber}-osgParticle.dll"; DestDir: "{app}\bin\Win64"; Flags: skipifsourcedoesntexist; Check: Is64BitInstallMode and not IsTaskSelected('force32')
-Source: "{#OSG64InstallDir}\bin\osg{#OSGSoNumber}-osgText.dll"; DestDir: "{app}\bin\Win64"; Flags: skipifsourcedoesntexist; Check: Is64BitInstallMode and not IsTaskSelected('force32')
-Source: "{#OSG64InstallDir}\bin\osg{#OSGSoNumber}-osgUtil.dll"; DestDir: "{app}\bin\Win64"; Flags: skipifsourcedoesntexist; Check: Is64BitInstallMode and not IsTaskSelected('force32')
-Source: "{#OSG64InstallDir}\bin\osg{#OSGSoNumber}-osgViewer.dll"; DestDir: "{app}\bin\Win64"; Flags: skipifsourcedoesntexist; Check: Is64BitInstallMode and not IsTaskSelected('force32')
-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: "{#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')
-Source: "{#OSG64PluginsDir}\osgdb_osga.dll"; DestDir: "{app}\bin\Win64\osgPlugins-{#OSGVersion}"; Flags: skipifsourcedoesntexist; Check: Is64BitInstallMode and not IsTaskSelected('force32')
-Source: "{#OSG64PluginsDir}\osgdb_3ds.dll"; DestDir: "{app}\bin\Win64\osgPlugins-{#OSGVersion}"; Flags: skipifsourcedoesntexist; Check: Is64BitInstallMode and not IsTaskSelected('force32')
-Source: "{#OSG64PluginsDir}\osgdb_mdl.dll"; DestDir: "{app}\bin\Win64\osgPlugins-{#OSGVersion}"; Flags: skipifsourcedoesntexist; Check: Is64BitInstallMode and not IsTaskSelected('force32')
-Source: "{#OSG64PluginsDir}\osgdb_jpeg.dll"; DestDir: "{app}\bin\Win64\osgPlugins-{#OSGVersion}"; Flags: skipifsourcedoesntexist; Check: Is64BitInstallMode and not IsTaskSelected('force32')
-Source: "{#OSG64PluginsDir}\osgdb_rgb.dll"; DestDir: "{app}\bin\Win64\osgPlugins-{#OSGVersion}"; Flags: skipifsourcedoesntexist; Check: Is64BitInstallMode and not IsTaskSelected('force32')
-Source: "{#OSG64PluginsDir}\osgdb_png.dll"; DestDir: "{app}\bin\Win64\osgPlugins-{#OSGVersion}"; Flags: skipifsourcedoesntexist; Check: Is64BitInstallMode and not IsTaskSelected('force32')
-Source: "{#OSG64PluginsDir}\osgdb_dds.dll"; DestDir: "{app}\bin\Win64\osgPlugins-{#OSGVersion}"; Flags: skipifsourcedoesntexist; Check: Is64BitInstallMode and not IsTaskSelected('force32')
-Source: "{#OSG64PluginsDir}\osgdb_txf.dll"; DestDir: "{app}\bin\Win64\osgPlugins-{#OSGVersion}"; Flags: skipifsourcedoesntexist; Check: Is64BitInstallMode and not IsTaskSelected('force32')
-Source: "{#OSG64PluginsDir}\osgdb_freetype.dll"; DestDir: "{app}\bin\Win64\osgPlugins-{#OSGVersion}"; Flags: skipifsourcedoesntexist; Check: Is64BitInstallMode and not IsTaskSelected('force32')
-Source: "{#OSG64PluginsDir}\osgdb_serializers_osg.dll"; DestDir: "{app}\bin\Win64\osgPlugins-{#OSGVersion}"; Flags: skipifsourcedoesntexist; Check: Is64BitInstallMode and not IsTaskSelected('force32')
-Source: "{#OSG64PluginsDir}\osgdb_serializers_osganimation.dll"; DestDir: "{app}\bin\Win64\osgPlugins-{#OSGVersion}"; Flags: skipifsourcedoesntexist; Check: Is64BitInstallMode and not IsTaskSelected('force32')
-Source: "{#OSG64PluginsDir}\osgdb_serializers_osgfx.dll"; DestDir: "{app}\bin\Win64\osgPlugins-{#OSGVersion}"; Flags: skipifsourcedoesntexist; Check: Is64BitInstallMode and not IsTaskSelected('force32')
-Source: "{#OSG64PluginsDir}\osgdb_serializers_osgmanipulator.dll"; DestDir: "{app}\bin\Win64\osgPlugins-{#OSGVersion}"; Flags: skipifsourcedoesntexist; Check: Is64BitInstallMode and not IsTaskSelected('force32')
-Source: "{#OSG64PluginsDir}\osgdb_serializers_osgparticle.dll"; DestDir: "{app}\bin\Win64\osgPlugins-{#OSGVersion}"; Flags: skipifsourcedoesntexist; Check: Is64BitInstallMode and not IsTaskSelected('force32')
-Source: "{#OSG64PluginsDir}\osgdb_serializers_osgshadow.dll"; DestDir: "{app}\bin\Win64\osgPlugins-{#OSGVersion}"; Flags: skipifsourcedoesntexist; Check: Is64BitInstallMode and not IsTaskSelected('force32')
-Source: "{#OSG64PluginsDir}\osgdb_serializers_osgsim.dll"; DestDir: "{app}\bin\Win64\osgPlugins-{#OSGVersion}"; Flags: skipifsourcedoesntexist; Check: Is64BitInstallMode and not IsTaskSelected('force32')
-Source: "{#OSG64PluginsDir}\osgdb_serializers_osgterrain.dll"; DestDir: "{app}\bin\Win64\osgPlugins-{#OSGVersion}"; Flags: skipifsourcedoesntexist; Check: Is64BitInstallMode and not IsTaskSelected('force32')
-Source: "{#OSG64PluginsDir}\osgdb_serializers_osgtext.dll"; DestDir: "{app}\bin\Win64\osgPlugins-{#OSGVersion}"; Flags: skipifsourcedoesntexist; Check: Is64BitInstallMode and not IsTaskSelected('force32')
-Source: "{#OSG64PluginsDir}\osgdb_serializers_osgvolume.dll"; DestDir: "{app}\bin\Win64\osgPlugins-{#OSGVersion}"; Flags: skipifsourcedoesntexist; Check: Is64BitInstallMode and not IsTaskSelected('force32')
-Source: "{#OSG64PluginsDir}\osgdb_deprecated_osg.dll"; DestDir: "{app}\bin\Win64\osgPlugins-{#OSGVersion}"; Flags: skipifsourcedoesntexist; Check: Is64BitInstallMode and not IsTaskSelected('force32')
-Source: "{#OSG64PluginsDir}\osgdb_deprecated_osgparticle.dll"; DestDir: "{app}\bin\Win64\osgPlugins-{#OSGVersion}"; Flags: skipifsourcedoesntexist; Check: Is64BitInstallMode and not IsTaskSelected('force32')
-
-[Dirs]
-; Make the user installable scenery directory
-Name: "{app}\scenery"; Permissions: everyone-modify
-Name: "{code:TerrasyncDir}"; Permissions: everyone-modify
-
-[Icons]
-Name: "{group}\FlightGear Launcher"; Filename: "{app}\bin\Win32\fgrun.exe"; WorkingDir: "{app}"; Check: not Is64BitInstallMode or IsTaskSelected('force32')
-Name: "{group}\FlightGear Launcher"; Filename: "{app}\bin\Win64\fgrun.exe"; WorkingDir: "{app}"; Check: Is64BitInstallMode and not IsTaskSelected('force32')
-; Name: "{group}\FlightGear"; Filename: "{app}\bin\Win32\fgfs.exe"; Parameters: "--fg-root=."; WorkingDir: "{app}";
-Name: "{group}\FlightGear Manual"; Filename: "{app}\data\Docs\getstart.pdf"
-Name: "{group}\FlightGear Documentation"; Filename: "{app}\data\Docs\index.html"
-Name: "{group}\Flightgear Wiki"; Filename: "http://wiki.flightgear.org"
-Name: "{userdesktop}\FlightGear {#FGVersion}"; Filename: "{app}\bin\Win32\fgrun.exe"; WorkingDir: "{app}"; Tasks: desktopicon; Check: not Is64BitInstallMode or IsTaskSelected('force32')
-Name: "{userdesktop}\FlightGear {#FGVersion}"; Filename: "{app}\bin\Win64\fgrun.exe"; WorkingDir: "{app}"; Tasks: desktopicon; Check: Is64BitInstallMode and not IsTaskSelected('force32')
-
-Name: "{group}\Tools\Install & Uninstall Scenery"; Filename: "{app}\bin\Win32\fgadmin.exe"; WorkingDir: "{app}"
-Name: "{group}\Tools\TerraSync"; Filename: "{app}\bin\Win32\terrasync.exe"; Parameters: "-S -p 5505 -d ""{app}\terrasync"""; WorkingDir: "{app}"
-Name: "{group}\Tools\Uninstall FlightGear"; Filename: "{uninstallexe}"
-
-Name: "{group}\Tools\js_demo"; Filename: "{app}\bin\Win32\js_demo.exe"
-Name: "{group}\Tools\fgjs"; Filename: "cmd"; Parameters: "/k fgjs.exe ""--fg-root={app}\data"""; WorkingDir: "{app}\bin\Win32";
-Name: "{group}\Tools\GPSsmooth"; Filename: "cmd"; Parameters: "/k ""{app}\bin\Win32\GPSsmooth.exe"" -h"; WorkingDir: "{app}\bin\Win32";
-Name: "{group}\Tools\UGsmooth"; Filename: "cmd"; Parameters: "/k ""{app}\bin\Win32\UGsmooth.exe"" -h"; WorkingDir: "{app}\bin\Win32";
-Name: "{group}\Tools\MIDGsmooth"; Filename: "cmd"; Parameters: "/k ""{app}\bin\Win32\MIDGsmooth.exe"" -h"; WorkingDir: "{app}\bin\Win32";
-Name: "{group}\Tools\metar"; Filename: "cmd"; Parameters: "/k ""{app}\bin\Win32\metar.exe"" -h"; WorkingDir: "{app}\bin\Win32";
-Name: "{group}\Tools\yasim"; Filename: "cmd"; Parameters: "/k ""{app}\bin\Win32\yasim.exe"" -h"; WorkingDir: "{app}\bin\Win32";
-Name: "{group}\Tools\fgpanel"; Filename: "cmd"; Parameters: "/k ""{app}\bin\Win32\fgpanel.exe"" -h"; WorkingDir: "{app}\bin\Win32";
-
-Name: "{group}\Tools\Explore Documentation Folder"; Filename: "{app}\data\Docs"
-
-; For running flightgear directly
-; Name: "{userdesktop}\FlightGear v2.0.0"; Filename: "{app}\bin\Win32\fgfs.exe"; Parameters: "--fg-root=."; WorkingDir: "{app}"; Tasks: desktopicon
-
-[Run]
-filename: "cmd.exe"; WorkingDir: "{app}\bin\Win32"; Parameters: "/C del msvc*.dll"; Check: FileExists(ExpandConstant('{app}\bin\Win32\vcredist_x86.exe'))
-filename: "cmd.exe"; WorkingDir: "{app}\bin\Win64"; Parameters: "/C del msvc*.dll"; Check: FileExists(ExpandConstant('{app}\bin\Win64\vcredist_x64.exe'))
-filename: "{app}\bin\Win32\vcredist_x86.exe"; WorkingDir: "{app}\bin\Win32"; Parameters: "/passive /norestart"; Description: "Installing MS Visual C++ runtime components"; Check: FileExists(ExpandConstant('{app}\bin\Win32\vcredist_x86.exe'))
-filename: "{app}\bin\Win64\vcredist_x64.exe"; WorkingDir: "{app}\bin\Win64"; Parameters: "/passive /norestart"; Description: "Installing MS Visual C++ runtime components"; Check: Is64BitInstallMode and not IsTaskSelected('force32') and FileExists(ExpandConstant('{app}\bin\Win64\vcredist_x64.exe'))
-filename: "{app}\bin\Win32\oalinst.exe"; WorkingDir: "{app}\bin\Win32"; Description: "Installing OpenAL"; Check: IsTaskSelected('insoal') and FileExists(ExpandConstant('{app}\bin\Win32\oalinst.exe'))
-
-; Put installation directory into the fgrun.prefs
-filename: "{app}\bin\Win32\fgrun.exe"; WorkingDir: "{app}\bin\Win32"; Parameters: "--silent ""--fg-exe={app}\bin\Win32\fgfs.exe"" ""--ts-exe={app}\bin\Win32\terrasync.exe"" ""--fg-root={app}\data"" ""--fg-scenery={app}\data\Scenery;{app}\scenery;{code:TerrasyncDir}"" --ts-dir=3 --version={#FGVersion}"; Check: not Is64BitInstallMode or IsTaskSelected('force32')
-filename: "{app}\bin\Win64\fgrun.exe"; WorkingDir: "{app}\bin\Win64"; Parameters: "--silent ""--fg-exe={app}\bin\Win64\fgfs.exe"" ""--ts-exe={app}\bin\Win32\terrasync.exe"" ""--fg-root={app}\data"" ""--fg-scenery={app}\data\Scenery;{app}\scenery;{code:TerrasyncDir}"" --ts-dir=3 --version={#FGVersion}"; Check: Is64BitInstallMode and not IsTaskSelected('force32')
-
-; Put installation and source directories into the fgadmin.prefs
-filename: "{app}\bin\Win32\fgadmin.exe"; WorkingDir: "{app}\bin\Win32"; Parameters: "--silent ""--install-source={src}\..\Scenery"" ""--scenery-dest={app}\scenery"""
-
-[Registry]
-Root: HKLM; Subkey: "Software\flightgear.org"; ValueType: string; ValueName: "TerrasyncDir"; ValueData: "{code:TerrasyncDir}"
-
-[Code]
-var
-  TerrasyncDirPage: TInputDirWizardPage;
-
-procedure URLLabelOnClick(Sender: TObject);
-var
-  ErrorCode: Integer;
-begin
-  ShellExec('open', 'http://www.flightgear.org', '', '', SW_SHOWNORMAL, ewNoWait, ErrorCode);
-end;
-
-procedure CreateURLLabel(ParentForm: TSetupForm; CancelButton: TNewButton);
-var
-  URLLabel: TNewStaticText;
-begin
-  URLLabel := TNewStaticText.Create(ParentForm);
-  URLLabel.Caption := 'www.flightgear.org';
-  URLLabel.Cursor := crHand;
-  URLLabel.OnClick := @URLLabelOnClick;
-  URLLabel.Parent := ParentForm;
-  { Alter Font *after* setting Parent so the correct defaults are inherited first }
-  URLLabel.Font.Style := URLLabel.Font.Style + [fsUnderline];
-  URLLabel.Font.Color := clBlue;
-  URLLabel.Top := CancelButton.Top + CancelButton.Height - URLLabel.Height - 2;
-  URLLabel.Left := ScaleX(20);
-end;
-
-procedure InitializeWizard();
-begin
-  TerrasyncDirPage := CreateInputDirPage(wpSelectDir,
-    'Select Terrasync Directory', 'Where should scenery downloaded by Terrasync be put?',
-    'Select the folder in which Terrasync would download additional scenery, then click Next.',
-    False, 'Terrasync Folder');
-  TerrasyncDirPage.Add('');
-
-  CreateURLLabel(WizardForm, WizardForm.CancelButton);
-end;
-
-function NextButtonClick(CurPageID: Integer): Boolean;
-begin
-  if CurPageID = wpSelectDir then begin
-    TerrasyncDirPage.Values[0] := GetPreviousData( 'TerrasyncDir', ExpandConstant('{reg:HKLM\Software\flightgear.org,TerrasyncDir|{app}\terrasync}') );
-  end;
-  Result := True;
-end;
-
-function TerrasyncDir(Param: String): String;
-begin
-  Result := TerrasyncDirPage.Values[0];
-end;
-
-procedure RegisterPreviousData(PreviousDataKey: Integer);
-begin
-  { Store the settings so we can restore them next time }
-  SetPreviousData(PreviousDataKey, 'TerrasyncDir', TerrasyncDirPage.Values[0]);
-end;
-
-function UpdateReadyMemo(Space, NewLine, MemoUserInfoInfo, MemoDirInfo, MemoTypeInfo, MemoComponentsInfo, MemoGroupInfo, MemoTasksInfo: String): String;
-var
-  S: String;
-begin
-  S := '';
-  S := S + MemoDirInfo + NewLine + NewLine;
-  S := S + 'Terrasync folder:' + NewLine;
-  S := S + Space + TerrasyncDirPage.Values[0] + NewLine + NewLine;
-  S := S + MemoGroupInfo + NewLine + NewLine;
-  S := S + MemoTasksInfo + NewLine + NewLine;
-
-  Result := S;
-end;
-

Info.plist.in

@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-    <key>CFBundleDevelopmentRegion</key>
-    <string>English</string>
-	<key>CFBundleIconFile</key>
-	<string>FlightGear.icns</string>
-	<key>CFBundlePackageType</key>
-	<string>APPL</string>
-	<key>CFBundleGetInfoString</key>
-	<string>FlightGear, the open-source flight simulator, <%= fgVersion %>. ©1996-<%= fgCurrentYear%>, The FlightGear Project</string>
-	<key>CFBundleSignature</key>
-	<string>????</string>
-	<key>CFBundleExecutable</key>
-	<string>FlightGear</string>
-	<key>CFBundleIdentifier</key>
-	<string>org.flightgear.FlightGear</string>
-	<key>CFBundleVersion</key>
-	<string><%= fgVersion %></string>
-	<key>CFBundleShortVersionString</key>
-	<string><%= fgVersion %></string>
-	<key>LSMinimumSystemVersion</key>
-	<string>10.6.0</string>
-	<key>NSMainNibFile</key>
-	<string>MainMenu</string>
-	<key>NSPrincipalClass</key>
-	<string>NSApplication</string>
-    <key>NSHumanReadableCopyright</key>
-    <string>©1996-<%= fgCurrentYear%>, The FlightGear Project</string>
-</dict>
-</plist>
-

base-package.rules

@@ -1,38 +0,0 @@
-- .git
-- *.xcf
-- *.tex
-
-+ /fgdata/Aircraft/Generic
-+ /fgdata/Aircraft/Instruments
-+ /fgdata/Aircraft/Instruments-3d
-
-+ /fgdata/Aircraft/UIUC
-+ /fgdata/Aircraft/c172p
-+ /fgdata/Aircraft/777
-+ /fgdata/Aircraft/777-200
-+ /fgdata/Aircraft/b1900d
-+ /fgdata/Aircraft/ufo
-+ /fgdata/Aircraft/CitationX
-+ /fgdata/Aircraft/ZLT-NT
-+ /fgdata/Aircraft/dhc2
-+ /fgdata/Aircraft/Cub
-+ /fgdata/Aircraft/sopwithCamel
-+ /fgdata/Aircraft/f-14b
-+ /fgdata/Aircraft/ASK13
-+ /fgdata/Aircraft/bo105
-+ /fgdata/Aircraft/Dragonfly
-+ /fgdata/Aircraft/SenecaII
-+ /fgdata/Aircraft/A6M2
-
-- /fgdata/Aircraft/*
-
-- /fgdata/Textures.high/*.new
-- /fgdata/Textures.high/*.orig
-- /fgdata/Textures.high/*.save
-- /fgdata/Textures/Unused
-- /fgdata/Textures/*.orig
-- /fgdata/Docs/source
-- /fgdata/Models/Airspace
-- /fgdata/Models/MNUAV
-
-

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')
-

hudson_build_release.sh

@@ -1,68 +1,2 @@
 #!/bin/sh
-
-if [ "$WORKSPACE" == "" ]; then
-    echo "ERROR: Missing WORKSPACE environment variable."
-    exit 1
-fi
-
-VERSION=`cat flightgear/version`
-
-#####################################################################################
-# remove old and create fresh build directories
-rm -rf sgBuild
-rm -rf fgBuild
-mkdir -p sgBuild
-mkdir -p fgBuild
-mkdir -p output
-rm -rf output/*
-rm -rf $WORKSPACE/dist/include/simgear $WORKSPACE/dist/libSim* $WORKSPACE/dist/libsg*.a
-
-#####################################################################################
-echo "Starting on SimGear"
-cd sgBuild
-cmake -DCMAKE_INSTALL_PREFIX:PATH=$WORKSPACE/dist -DSIMGEAR_SHARED:BOOL="ON" ../simgear
-
-# compile
-make
-
-if [ $? -ne '0' ]; then
-    echo "make simgear failed"
-    exit 1
-fi
-
-make install
-
-# build source package and copy to output
-make package_source
-cp simgear-*.tar.bz2 ../output/.
-
-#####################################################################################
-echo "Starting on FlightGear"
-cd ../fgBuild
-cmake -DCMAKE_INSTALL_PREFIX:PATH=$WORKSPACE/dist -DSIMGEAR_SHARED:BOOL="ON" ../flightgear
-
-# compile
-make
-
-if [ $? -ne '0' ]; then
-    echo "make flightgear failed"
-    exit 1
-fi
-
-make install
-
-# build source package and copy to output
-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/
-
+echo "Write me!"

hudson_mac_build_release.sh

@@ -1,77 +0,0 @@
-#!/bin/sh
-
-if [ "$WORKSPACE" == "" ]; then
-    echo "ERROR: Missing WORKSPACE environment variable."
-    exit 1
-fi
-
-###############################################################################
-# remove old and create fresh build directories
-rm -rf sgBuild
-rm -rf fgBuild
-mkdir -p sgBuild
-mkdir -p fgBuild
-mkdir -p output
-rm -rf output/*
-rm -rf $WORKSPACE/dist/include/simgear $WORKSPACE/dist/libSim* $WORKSPACE/dist/libsg*.a
-
-###############################################################################
-echo "Starting on SimGear"
-pushd sgBuild
-cmake -DCMAKE_INSTALL_PREFIX:PATH=$WORKSPACE/dist -G Xcode ../simgear
-
-# compile
-xcodebuild -configuration RelWithDebInfo -target install  build
-
-if [ $? -ne '0' ]; then
-    echo "make simgear failed"
-    exit 1
-fi
-
-popd
-
-################################################################################
-echo "Starting on FlightGear"
-pushd fgBuild
-cmake -DCMAKE_INSTALL_PREFIX:PATH=$WORKSPACE/dist -G Xcode ../flightgear
-
-xcodebuild -configuration RelWithDebInfo -target install  build
-
-if [ $? -ne '0' ]; then
-    echo "make flightgear failed"
-    exit 1
-fi
-
-popd
-
-chmod +x $WORKSPACE/dist/bin/osgversion
-
-################################################################################
-echo "Building Macflightgear launcher"
-
-#OSX_TARGET="10.6"
-# JMT - disabling setting the sysroot since it's breaking things on 
-# current build slave. Sinc ethe slave runs 10.6 natively, we don't 
-# actually need to set these. Real solution would be to use a proper
-# build system for the Mac-launcher of course.
-# -mmacosx-version-min=$OSX_TARGET -isysroot $SDK_PATH
-
-pushd maclauncher/FlightGearOSX
-
-# compile the stub executable
-gcc -o FlightGear main.m \
-    -framework Cocoa -framework RubyCocoa -framework Foundation -framework AppKit
-
-popd
-
-################################################################################
-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 .
-
-# run the unlock script now - we need to do this right before code-signing,
-# or the keychain may automatically re-lock after some period of time
-unlock-keychain.sh
-
-echo "Running package script"
-./hudson_mac_package_release.rb

hudson_mac_package_release.rb

@@ -1,174 +0,0 @@
-#!/usr/bin/ruby
-
-require 'ERB'
-require 'fileutils' #I know, no underscore is not ruby-like
-include FileUtils
-
-$osgLibs = ['osgFX', 'osgParticle', 'osg', 'osgGA', 'osgText', 'osgUtil', 'osgSim', 'osgViewer', 'osgDB']
-$osgPlugins = ['ac', 'osg', 'freetype', 'imageio', 'rgb', 'txf', 'mdl', '3ds']
-
-def runOsgVersion(option)
-  env = "export DYLD_LIBRARY_PATH=#{Dir.pwd}/dist/lib"
-  bin = Dir.pwd + "/dist/bin/osgversion"
-  return `#{env}; #{bin} --#{option}`.chomp
-end
-
-osgVersion = runOsgVersion('version-number')
-$osgSoVersion=runOsgVersion('so-number')
-$openThreadsSoVersion=runOsgVersion('openthreads-soversion-number')
-
-$codeSignIdentity = ENV['FG_CODESIGN_IDENTITY']
-puts "Code signing identity is #{$codeSignIdentity}"
-
-puts "osgVersion=#{osgVersion}, so-number=#{$osgSoVersion}"
-
-$svnLibs = ['svn_client', 'svn_wc', 'svn_delta', 'svn_diff', 'svn_ra', 
-  'svn_ra_local', 'svn_repos', 'svn_fs', 'svn_fs_fs', 'svn_fs_util',
-  'svn_ra_svn', 'svn_subr', 'svn_ra_neon']
-
-def fix_install_names(object)
-  #puts "fixing install names for #{object}"
-  
-  $osgLibs.each do |l|
-    oldName = "lib#{l}.#{$osgSoVersion}.dylib"
-    newName = "@executable_path/../Frameworks/#{oldName}"
-    `install_name_tool -change #{oldName} #{newName} #{object}`
-  end
-  
-  oldName = "libOpenThreads.#{$openThreadsSoVersion}.dylib"
-  newName= "@executable_path/../Frameworks/#{oldName}"
-  `install_name_tool -change #{oldName} #{newName} #{object}`
-end
-
-$prefixDir=Dir.pwd + "/dist"
-dmgDir=Dir.pwd + "/image"
-srcDir=Dir.pwd + "/flightgear"
-
-def fix_svn_install_names(object)
-  $svnLibs.each do |l|
-    fileName = "lib#{l}-1.0.dylib"
-    newName = "@executable_path/../Frameworks/#{fileName}"
-    `install_name_tool -change #{fileName} #{newName} #{object}`
-  end
-end
-
-def copy_svn_libs()
-  puts "Copying Subversion client libraries"
-  $svnLibs.each do |l|
-    libFile = "lib#{l}-1.0.dylib"
-    path = "#{$frameworksDir}/#{libFile}"
-    `cp #{$prefixDir}/lib/#{libFile} #{$frameworksDir}`
-    fix_svn_install_names(path)
-   # `install_name_tool -id #{libFile}  #{path}`    
-  end
-end
-
-def code_sign(path)
-  puts "Signing #{path}"
-  `codesign -s "#{$codeSignIdentity}" #{path}`
-end
-
-
-puts "Erasing previous image dir"
-`rm -rf #{dmgDir}`
-
-bundle=dmgDir + "/FlightGear.app"
-contents=bundle + "/Contents"
-macosDir=contents + "/MacOS"
-$frameworksDir=contents +"/Frameworks"
-resourcesDir=contents+"/Resources"
-osgPluginsDir=contents+"/PlugIns/osgPlugins-#{osgVersion}"
-
-# for writing copyright year to Info.plist
-t = Time.new
-fgCurrentYear = t.year
-
-fgVersion = File.read("#{srcDir}/version").strip
-volName="\"FlightGear #{fgVersion}\""
-
-dmgPath = Dir.pwd + "/output/FlightGear-#{fgVersion}.dmg"
-
-puts "Creating directory structure"
-`mkdir -p #{macosDir}`
-`mkdir -p #{$frameworksDir}`
-`mkdir -p #{resourcesDir}`
-`mkdir -p #{osgPluginsDir}`
-
-puts "Copying binaries"
-bins = ['fgfs', 'fgjs', 'fgcom', 'fgviewer']
-bins.each do |b|
-  if !File.exist?("#{$prefixDir}/bin/#{b}")
-    next
-  end
-  
-  outPath = "#{macosDir}/#{b}"
-  `cp #{$prefixDir}/bin/#{b} #{outPath}`
-  fix_install_names(outPath)
-  fix_svn_install_names(outPath)
-end
-
-puts "copying libraries"
-$osgLibs.each do |l|
-  libFile = "lib#{l}.#{$osgSoVersion}.dylib"
-  `cp #{$prefixDir}/lib/#{libFile} #{$frameworksDir}`
-  fix_install_names("#{$frameworksDir}/#{libFile}")
-end
-
-# and not forgetting OpenThreads
-libFile = "libOpenThreads.#{$openThreadsSoVersion}.dylib"
-`cp #{$prefixDir}/lib/#{libFile} #{$frameworksDir}`
-
-$osgPlugins.each do |p|
-  pluginFile = "osgdb_#{p}.so"
-  `cp #{$prefixDir}/lib/osgPlugins-#{osgVersion}/#{pluginFile} #{osgPluginsDir}`
-  fix_install_names("#{osgPluginsDir}/#{pluginFile}")
-end
-
-copy_svn_libs()
-
-# Macflightgear launcher
-puts "Copying Macflightgear launcher files"
-
-Dir.chdir "maclauncher/FlightGearOSX" do
-  `cp FlightGear #{macosDir}`
-  `rsync -a *.rb *.lproj *.sh *.tiff *.html #{resourcesDir}`
-end
-
-if File.exist?("#{$prefixDir}/bin/fgcom-data")
-  puts "Copying FGCom data files"
-  `ditto #{$prefixDir}/bin/fgcom-data #{resourcesDir}/fgcom-data`
-end
-
-# Info.plist
-template = File.read("Info.plist.in")
-output = ERB.new(template).result(binding)
-
-File.open("#{contents}/Info.plist", 'w') { |f|
-  f.write(output)
-}
-
-`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`
-
-# code sign all executables in MacOS dir. Do this last since reource
-# changes will invalidate the signature!
-Dir.foreach(macosDir) do |b|
-    if b == '.' or b == '..' then
-        next
-    end
-  code_sign("#{macosDir}/#{b}")
-end
-
-puts "Creating DMG"
-
-createArgs = "-format UDBZ -imagekey bzip2-level=9 -quiet -volname #{volName}"
-
-`rm #{dmgPath}`
-`hdiutil create -srcfolder #{dmgDir} #{createArgs} #{dmgPath}`

hudson_win_build32.bat

@@ -1,22 +0,0 @@
-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 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
-cd build-sg
-cmake ..\simgear -G "Visual Studio 10" -DMSVC_3RDPARTY_ROOT=%WORKSPACE% -DCMAKE_INSTALL_PREFIX:PATH=%WORKSPACE%/install/msvc100/SimGear -DBOOST_ROOT=%WORKSPACE%/Boost
-cmake --build . --config Release --target INSTALL
-
-cd ..\build-fg
-cmake ..\flightgear -G "Visual Studio 10" -DMSVC_3RDPARTY_ROOT=%WORKSPACE% -DCMAKE_INSTALL_PREFIX:PATH=%WORKSPACE%/install/msvc100/FlightGear -DFLTK_FLUID_EXECUTABLE=%WORKSPACE%/3rdParty/bin/fluid.exe -DBOOST_ROOT=%WORKSPACE%/Boost
-cmake --build . --config Release --target INSTALL
-
-cd ..\build-fgrun
-cmake ..\fgrun -G "Visual Studio 10" -DMSVC_3RDPARTY_ROOT:PATH=%WORKSPACE% -DCMAKE_INSTALL_PREFIX:PATH=%WORKSPACE%/install/msvc100/FGRun -DFLTK_FLUID_EXECUTABLE:FILEPATH=%WORKSPACE%/3rdParty/bin/fluid.exe -DGETTEXT_MSGFMT_EXECUTABLE:FILEPATH=%WORKSPACE%/3rdParty/bin/msgfmt.exe -DGETTEXT_MSGMERGE_EXECUTABLE:FILEPATH=%WORKSPACE%/3rdParty/bin/msgmerge.exe -DBOOST_ROOT=%WORKSPACE%/Boost
-cmake --build . --config Release --target INSTALL

hudson_win_build64.bat

@@ -1,24 +0,0 @@
-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
-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
-cd build-sg64
-cmake ..\SimGear -G "Visual Studio 10 Win64" -DMSVC_3RDPARTY_ROOT=%WORKSPACE% -DCMAKE_INSTALL_PREFIX:PATH=%WORKSPACE%/install/msvc100-64/SimGear -DBOOST_ROOT=%WORKSPACE%/Boost
-cmake --build . --config Release --target INSTALL
-
-cd ..\build-fg64
-cmake ..\flightgear -G "Visual Studio 10 Win64" -DMSVC_3RDPARTY_ROOT=%WORKSPACE% -DCMAKE_INSTALL_PREFIX:PATH=%WORKSPACE%/install/msvc100-64/FlightGear -DFLTK_FLUID_EXECUTABLE=%WORKSPACE%/3rdParty/bin/fluid.exe -DBOOST_ROOT=%WORKSPACE%/Boost -DWITH_FGPANEL=OFF -DENABLE_PROFILE=OFF
-cmake --build . --config Release --target INSTALL
-
-cd ..\build-fgrun64
-cmake ..\fgrun -G "Visual Studio 10 Win64" -DMSVC_3RDPARTY_ROOT:PATH=%WORKSPACE% -DCMAKE_INSTALL_PREFIX:PATH=%WORKSPACE%/install/msvc100-64/FGRun -DFLTK_FLUID_EXECUTABLE:FILEPATH=%WORKSPACE%/3rdParty/bin/fluid.exe -DGETTEXT_MSGFMT_EXECUTABLE:FILEPATH=%WORKSPACE%/3rdParty/bin/msgfmt.exe -DGETTEXT_MSGMERGE_EXECUTABLE:FILEPATH=%WORKSPACE%/3rdParty/bin/msgmerge.exe -DBOOST_ROOT=%WORKSPACE%/Boost
-cmake --build . --config Release --target INSTALL

hudson_win_package_release.bat

@@ -1,40 +0,0 @@
-ECHO OFF
-
-IF NOT DEFINED WORKSPACE SET WORKSPACE=%~dp0
-ECHO Packaging root is %WORKSPACE%
-
-subst X: /D
-subst X: %WORKSPACE%.
-
-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

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"