From 29e267f18a0b0cf41dd5e36868828ae4d4f3eb65 Mon Sep 17 00:00:00 2001
From: James Turner <zakalawe@mac.com>
Date: Wed, 22 Aug 2012 22:31:59 +0100
Subject: [PATCH] Fix svn install renaming in Mac packaging

---
 package/mac/build-mac-nightly-dmg.rb     | 19 +++++++++----------
 package/mac/hudson_mac_build_launcher.sh | 15 ---------------
 2 files changed, 9 insertions(+), 25 deletions(-)
 delete mode 100755 package/mac/hudson_mac_build_launcher.sh

diff --git a/package/mac/build-mac-nightly-dmg.rb b/package/mac/build-mac-nightly-dmg.rb
index 967cb60f3..a6661434e 100755
--- a/package/mac/build-mac-nightly-dmg.rb
+++ b/package/mac/build-mac-nightly-dmg.rb
@@ -42,15 +42,6 @@ $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"
-    oldName = "#{$prefixDir}/lib/#{fileName}"
-    newName = "@executable_path/../Frameworks/#{fileName}"
-    `install_name_tool -change #{oldName} #{newName} #{object}`
-  end
-end
-
 puts "Erasing previous image dir"
 `rm -rf #{dmgDir}`
 
@@ -62,6 +53,14 @@ resourcesDir=contents+"/Resources"
 osgPluginsDir=contents+"/PlugIns/osgPlugins-#{osgVersion}"
 volName="\"FlightGear Nightly Build\""
 
+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|
@@ -69,7 +68,7 @@ def copy_svn_libs()
     path = "#{$frameworksDir}/#{libFile}"
     `cp #{$prefixDir}/lib/#{libFile} #{$frameworksDir}`
     fix_svn_install_names(path)
-    `install_name_tool -id #{libFile}  #{path}`    
+   # `install_name_tool -id #{libFile}  #{path}`    
   end
 end
 
diff --git a/package/mac/hudson_mac_build_launcher.sh b/package/mac/hudson_mac_build_launcher.sh
deleted file mode 100755
index dc3bd243a..000000000
--- a/package/mac/hudson_mac_build_launcher.sh
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/bin/sh
-
-SDK_PATH="/Developer/SDKs/MacOSX10.6.sdk"
-OSX_TARGET="10.6"
-
-svn co https://macflightgear.svn.sourceforge.net/svnroot/macflightgear/trunk/FlightGearOSX  macflightgear
-
-pushd macflightgear
-
-# compile the stub executable
-gcc -o FlightGear -mmacosx-version-min=$OSX_TARGET -isysroot $SDK_PATH -arch i386 main.m \
-    -framework Cocoa -framework RubyCocoa -framework Foundation -framework AppKit
-
-popd
-
-- 
2.39.5