diff --git a/package/mac/build-mac-nightly-dmg.rb b/package/mac/build-mac-nightly-dmg.rb deleted file mode 100755 index 41bde80c8..000000000 --- a/package/mac/build-mac-nightly-dmg.rb +++ /dev/null @@ -1,124 +0,0 @@ -#!/usr/bin/ruby - -require 'rubygems' # needed for Ruby 1.8 -require 'plist' - -$osgLibs = ['osgFX', 'osgParticle', 'osg', 'osgGA', 'osgText', 'osgUtil', 'osgSim', 'osgViewer', 'osgDB'] -$osgPlugins = ['ac', 'osg', 'freetype', 'imageio', 'rgb', 'txf', 'mdl', '3ds', 'dds'] - -def runOsgVersion(option) - env = "export DYLD_LIBRARY_PATH=#{Dir.pwd}/dist/lib" - bin = Dir.pwd + "/dist/bin/osgversion" - return `#{env}; #{bin} --#{option}`.chomp -end - -osgVersion = runOsgVersion('version-number') -$osgSoVersion=runOsgVersion('so-number') -$openThreadsSoVersion=runOsgVersion('openthreads-soversion-number') - -$codeSignIdentity = ENV['FG_CODESIGN_IDENTITY'] -puts "Code signing identity is #{$codeSignIdentity}" - -puts "osgVersion=#{osgVersion}, so-number=#{$osgSoVersion}" - -def fix_install_names(object) - puts "fixing install names for #{object}" - - $osgLibs.each do |l| - oldName = "lib#{l}.#{$osgSoVersion}.dylib" - newName = "@executable_path/../Frameworks/#{oldName}" - `install_name_tool -change #{oldName} #{newName} #{object}` - end - - oldName = "libOpenThreads.#{$openThreadsSoVersion}.dylib" - newName= "@executable_path/../Frameworks/#{oldName}" - `install_name_tool -change #{oldName} #{newName} #{object}` -end - -$prefixDir=Dir.pwd + "/dist" -dmgDir=Dir.pwd + "/image" -srcDir=Dir.pwd + "/flightgear" - -puts "Erasing previous image dir" -`rm -rf #{dmgDir}` - -bundle=dmgDir + "/FlightGear.app" - -# run macdeployt before we rename the bundle, otherwise it -# can't find the bundle executable -puts "Running macdeployqt on the bundle to copy Qt libraries" -`macdeployqt #{$prefixDir}/fgfs.app` - -puts "Moving & renaming app bundle" -`mkdir -p #{dmgDir}` -`mv #{$prefixDir}/fgfs.app #{bundle}` - -contents=bundle + "/Contents" -macosDir=contents + "/MacOS" -$frameworksDir=contents +"/Frameworks" -resourcesDir=contents+"/Resources" - -# changed this for customised OSG -osgPluginsDir=contents+"/PlugIns/osgPlugins" -volName="\"FlightGear Nightly Build\"" - -fgVersion = File.read("#{srcDir}/version").strip - -dmgPath = Dir.pwd + "/fg_mac_nightly_#{fgVersion}.dmg" - -puts "Creating directory structure" -`mkdir -p #{$frameworksDir}` -`mkdir -p #{resourcesDir}` -`mkdir -p #{osgPluginsDir}` - -# fix install names on the primary executable -fix_install_names("#{macosDir}/fgfs") - -puts "Copying auxilliary binaries" -bins = ['fgjs', 'fgcom'] -bins.each do |b| - if !File.exist?("#{$prefixDir}/bin/#{b}") - next - end - - outPath = "#{macosDir}/#{b}" - `cp #{$prefixDir}/bin/#{b} #{outPath}` - fix_install_names(outPath) -end - -puts "copying libraries" -$osgLibs.each do |l| - libFile = "lib#{l}.#{$osgSoVersion}.dylib" - `cp #{$prefixDir}/lib/#{libFile} #{$frameworksDir}` - fix_install_names("#{$frameworksDir}/#{libFile}") -end - -# and not forgetting OpenThreads -libFile = "libOpenThreads.#{$openThreadsSoVersion}.dylib" -`cp #{$prefixDir}/lib/#{libFile} #{$frameworksDir}` - -$osgPlugins.each do |p| - pluginFile = "osgdb_#{p}.dylib" - `cp #{$prefixDir}/lib/osgPlugins/#{pluginFile} #{osgPluginsDir}` - fix_install_names("#{osgPluginsDir}/#{pluginFile}") -end - -`cp #{srcDir}/package/mac/nightly-readme.rtf #{dmgDir}/ReadMe.rtf` -`cp #{srcDir}/package/mac/FlightGear.icns #{resourcesDir}/FlightGear.icns` -`cp #{srcDir}/COPYING #{dmgDir}` - -if File.exist?("#{$prefixDir}/share/flightgear") - puts "Copying FGCom data files" - `ditto #{$prefixDir}/share/flightgear #{resourcesDir}` -end - -# code sign the entire bundle once complete - v2 code-signing -puts "Signing #{bundle}" -`codesign --deep -s "#{$codeSignIdentity}" #{bundle}` - -puts "Creating DMG" - -createArgs = "-format UDBZ -imagekey bzip2-level=9 -quiet -volname #{volName}" - -`rm -f #{dmgPath}` -`hdiutil create -srcfolder #{dmgDir} #{createArgs} #{dmgPath}` diff --git a/package/mac/nightly-readme.rtf b/package/mac/nightly-readme.rtf deleted file mode 100644 index 10e4c54a2..000000000 --- a/package/mac/nightly-readme.rtf +++ /dev/null @@ -1,53 +0,0 @@ -{\rtf1\ansi\ansicpg1252\cocoartf1038\cocoasubrtf320 -{\fonttbl\f0\fswiss\fcharset0 Helvetica;\f1\fmodern\fcharset0 Courier;} -{\colortbl;\red255\green255\blue255;} -\paperw11900\paperh16840\margl1440\margr1440\vieww14720\viewh15300\viewkind0 -\pard\tx566\tx1133\tx1700\tx2267\tx2834\tx3401\tx3968\tx4535\tx5102\tx5669\tx6236\tx6803\qc\pardirnatural - -\f0\b\fs30 \cf0 FlightGear nightly build -\b0\fs24 \ -\ -\pard\tx566\tx1133\tx1700\tx2267\tx2834\tx3401\tx3968\tx4535\tx5102\tx5669\tx6236\tx6803\pardirnatural - -\b\fs26 \cf0 Introduction -\b0\fs24 \ -\ -This is an automatically generated build of FlightGear from the developer code repositories (Git), for Intel Macs running Mac OSX 10.5 (Leopard) or higher. It does not include a GUI launcher, despite being packaged as an application - see 'Running' below.\ -\ -This build receives NO manual testing, and only the most limited automatic testing (at present). Use it at your own risk, and report problems you encounter via the appropriate project communication channels - the {\field{\*\fldinst{HYPERLINK "https://lists.sourceforge.net/lists/listinfo/flightgear-devel"}}{\fldrslt developer mailing list}} or the {\field{\*\fldinst{HYPERLINK "http://code.google.com/p/flightgear-bugs/issues/list"}}{\fldrslt bug tracker}}. Please don't use IRC or the forums as a bug-reporting tool, since they are difficult to track over time.\ -\ - -\b\fs26 Running -\b0\fs24 \ -\ -No GUI launcher tool is included, unlike official releases. Launch the -\f1 fgfs -\f0 binary from Terminal, passing appropriate arguments, such as -\f1 --fg-root -\f0 , -\f1 --aircraft -\f0 and -\f1 --airport -\f0 . If you're not familiar with using Terminal to launch a bundled application, or specifying arguments directly to FlightGear, this build is not for you!\ -\ -This build will read settings from -\f1 .fgfsrc -\f0 as normal, if you wish to save standard options (such as the root, aircraft and scenery dirs) instead of specifying them on the command line. Note all directory paths passed to FlightGear must be absolute.\ -\ - -\b\fs26 Examples -\b0\fs24 \ -\ - -\f1 ./FlightGear.app/Contents/MacOS/fgfs --fg-root=$HOME/Documents/fgdata --aircraft=b1900d\ - -\f0 \ - -\f1 ./FlightGear.app/Contents/MacOS/fgfs --fg-root=$HOME/fgdata --fg-scenery=$HOME/terrasync-scenery -\f0 \ -\ - -\b\fs26 TerraSync -\b0\fs24 \ -\ -A terrasync binary is included in the bundle, also in Contents/MacOS. Again it is assumed the user is familiar with manually specifying appropriate terrasync arguments to specify a scenery direction, and also connecting terrasync to FlightGear.} \ No newline at end of file