Keep Windows script in sync with new data name.

This simplifies life for the upload step which only needs to deal
with one file suffix, not two.

.gitignore

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

.gitmodules

@@ -4,6 +4,9 @@
 [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

CMakeLists.txt

@@ -0,0 +1,173 @@
+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,6 +97,9 @@ 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')
@@ -108,7 +111,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\ot12-OpenThreads.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')
@@ -144,7 +147,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\ot12-OpenThreads.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')

create_catalog.py

@@ -0,0 +1,171 @@
+#!/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

@@ -5,6 +5,8 @@ if [ "$WORKSPACE" == "" ]; then
     exit 1
 fi
 
+VERSION=`cat flightgear/version`
+
 #####################################################################################
 # remove old and create fresh build directories
 rm -rf sgBuild
@@ -53,3 +55,14 @@ 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 Release -target install  build
+xcodebuild -configuration RelWithDebInfo -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 Release -target install  build
+xcodebuild -configuration RelWithDebInfo -target install  build
 
 if [ $? -ne '0' ]; then
     echo "make flightgear failed"
@@ -49,12 +49,17 @@ chmod +x $WORKSPACE/dist/bin/osgversion
 ################################################################################
 echo "Building Macflightgear launcher"
 
-OSX_TARGET="10.6"
+#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 -mmacosx-version-min=$OSX_TARGET -isysroot $SDK_PATH -arch i386 main.m \
+gcc -o FlightGear main.m \
     -framework Cocoa -framework RubyCocoa -framework Foundation -framework AppKit
 
 popd

hudson_mac_package_release.rb

@@ -22,8 +22,6 @@ puts "Code signing identity is #{$codeSignIdentity}"
 
 puts "osgVersion=#{osgVersion}, so-number=#{$osgSoVersion}"
 
-$alutSourcePath='/Library/Frameworks/ALUT.framework'
-
 $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']
@@ -40,10 +38,6 @@ def fix_install_names(object)
   oldName = "libOpenThreads.#{$openThreadsSoVersion}.dylib"
   newName= "@executable_path/../Frameworks/#{oldName}"
   `install_name_tool -change #{oldName} #{newName} #{object}`
-  
-  alutBundlePath = "@executable_path/../Frameworks/ALUT.framework"
-  alutLib = "Versions/A/ALUT"
-  `install_name_tool -change #{$alutSourcePath}/#{alutLib} #{alutBundlePath}/#{alutLib} #{object}`
 end
 
 $prefixDir=Dir.pwd + "/dist"
@@ -92,7 +86,7 @@ fgCurrentYear = t.year
 fgVersion = File.read("#{srcDir}/version").strip
 volName="\"FlightGear #{fgVersion}\""
 
-dmgPath = Dir.pwd + "/output/fg_mac_#{fgVersion}.dmg"
+dmgPath = Dir.pwd + "/output/FlightGear-#{fgVersion}.dmg"
 
 puts "Creating directory structure"
 `mkdir -p #{macosDir}`
@@ -132,16 +126,12 @@ end
 
 copy_svn_libs()
 
-# custom ALUT
-# must copy frameworks using ditto
-`ditto #{$alutSourcePath} #{$frameworksDir}/ALUT.framework`
-
 # Macflightgear launcher
 puts "Copying Macflightgear launcher files"
 
 Dir.chdir "maclauncher/FlightGearOSX" do
   `cp FlightGear #{macosDir}`
-  `rsync -a *.rb *.lproj *.sh *.tiff #{resourcesDir}`
+  `rsync -a *.rb *.lproj *.sh *.tiff *.html #{resourcesDir}`
 end
 
 if File.exist?("#{$prefixDir}/bin/fgcom-data")
@@ -160,6 +150,10 @@ 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,15 +1,22 @@
-
 IF NOT DEFINED WORKSPACE SET WORKSPACE=%~dp0
 
-ECHO #define SIMGEAR_VERSION "2.8.0" > %WORKSPACE%\simgear\simgear\version.h
+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
+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
+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,15 +1,24 @@
-
 IF NOT DEFINED WORKSPACE SET WORKSPACE=%~dp0
 
-ECHO #define SIMGEAR_VERSION "2.8.0" > %WORKSPACE%\simgear\simgear\version.h
+
+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
+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
+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

@@ -10,21 +10,31 @@ 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
 
-Compil32 /cc FlightGear.iss
-
-
-
+iscc FlightGear.iss

installWinDeps.bat

@@ -0,0 +1,12 @@
+
+
+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"