From 0d7f99e261d22ab7bffa09de19ddcb2dd4516abc Mon Sep 17 00:00:00 2001
From: James Turner <zakalawe@mac.com>
Date: Tue, 14 Aug 2012 10:46:00 +0100
Subject: [PATCH] Tweak Mac code-signing for 2.8 release.

---
 hudson_mac_package_release.rb | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/hudson_mac_package_release.rb b/hudson_mac_package_release.rb
index 07ad53d..23a0713 100755
--- a/hudson_mac_package_release.rb
+++ b/hudson_mac_package_release.rb
@@ -26,7 +26,7 @@ $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_svn', 'svn_subr', 'svn_ra_neon']
 
 def fix_install_names(object)
   #puts "fixing install names for #{object}"
@@ -109,7 +109,6 @@ bins.each do |b|
   `cp #{$prefixDir}/bin/#{b} #{outPath}`
   fix_install_names(outPath)
   fix_svn_install_names(outPath)
-  code_sign(outPath)
 end
 
 puts "copying libraries"
@@ -148,8 +147,6 @@ if File.exist?("#{$prefixDir}/bin/fgcom-data")
   `ditto #{$prefixDir}/bin/fgcom-data #{resourcesDir}/fgcom-data`
 end
 
-code_sign("#{macosDir}/FlightGear")
-
 # Info.plist
 template = File.read("Info.plist.in")
 output = ERB.new(template).result(binding)
@@ -164,6 +161,15 @@ File.open("#{contents}/Info.plist", 'w') { |f|
 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}"