From e3eb2aa3476a57777de2c644aa063761cbf4b9d8 Mon Sep 17 00:00:00 2001
From: James Turner <zakalawe@mac.com>
Date: Wed, 29 Apr 2015 21:48:39 +0100
Subject: [PATCH] Win & Mac package fixes.

---
 FlightGear.iss                | 4 +++-
 hudson_mac_package_release.rb | 2 ++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/FlightGear.iss b/FlightGear.iss
index 048aa0e..635bc54 100755
--- a/FlightGear.iss
+++ b/FlightGear.iss
@@ -101,9 +101,11 @@ Source: "{#VCInstallDir}\redist\x64\Microsoft.VC100.CRT\*.dll"; DestDir: "{app}\
 Source: "X:\install\msvc100\FlightGear\bin\fgpanel.exe"; DestDir: "{app}\bin"; Flags: ignoreversion
 Source: "X:\3rdParty\bin\oalinst.exe"; DestDir: "{app}\bin"; Flags: ignoreversion skipifsourcedoesntexist
 
-; Include the base package
+; Include the base package
 #if IncludeData == "TRUE"
 Source: "X:\fgdata\*.*"; DestDir: "{app}\fgdata"; Flags: ignoreversion recursesubdirs skipifsourcedoesntexist
+; work-around for 3.6: look for additional aircraft data
+Source: "X:\extended-data\*.*"; DestDir: "{app}\fgdata"; Flags: ignoreversion recursesubdirs skipifsourcedoesntexist
 #endif
 
 ; 32 bits install
diff --git a/hudson_mac_package_release.rb b/hudson_mac_package_release.rb
index 869cd67..fbe1189 100755
--- a/hudson_mac_package_release.rb
+++ b/hudson_mac_package_release.rb
@@ -132,6 +132,8 @@ File.open("#{contents}/Info.plist", 'w') { |f|
 
 createArgs = "-format UDBZ -imagekey bzip2-level=9 -quiet -volname #{volName}"
 
+# work-around for 3.6: copy aircraft files too
+`rsync -a extended-data/ #{resourcesDir}/data`
 
 if !$isRelease
   # create the 'lite' DMG without the base files