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.

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

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.bz 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_package_release.bat

@@ -10,10 +10,6 @@ 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
@@ -26,11 +22,9 @@ ECHO #define FGVersion "%FLIGHTGEAR_VERSION%" > InstallConfig.iss
 ECHO #define OSGVersion "%OSG_VERSION%" >> InstallConfig.iss
 ECHO #define OSGSoNumber "%OSG_SO_NUMBER%" >> InstallConfig.iss
 
-set DATA_FILE=FlightGear-%FLIGHTGEAR_VERSION%-data
-
-REM extract the data files
-7z e -aoa %DATA_FILE%.tar.bz && 7z x -aoa %DATA_FILE%.tar
-
 REM run Inno-setup!
 
 Compil32 /cc FlightGear.iss
+
+
+