fly/flightgear
1
0
Fork 0
Code Activity

Don't hard code OSG version in packaging script

Browse source
This commit is contained in:
James Turner 2010-11-03 08:32:59 +00:00
parent c053de6b4c
commit 27276c35e9
1 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
package/mac/build-mac-nightly-dmg.rb
View file

@ -33,12 +33,16 @@ dmgPath = Dir.pwd + "/fg_mac_nightly.dmg"
puts "Erasing previous image dir" puts "Erasing previous image dir"
`rm -rf #{dmgDir}` `rm -rf #{dmgDir}`
osgVersion = `export PKG_CONFIG_PATH=#{prefixDir}/lib/pkgconfig; pkg-config --modversion openscenegraph`
osgVersion = osgVersion.chomp # strip trailing newlines
puts "osgVersion='#{osgVersion}'"
bundle=dmgDir + "/FlightGear.app" bundle=dmgDir + "/FlightGear.app"
contents=bundle + "/Contents" contents=bundle + "/Contents"
macosDir=contents + "/MacOS" macosDir=contents + "/MacOS"
frameworksDir=contents +"/Frameworks" frameworksDir=contents +"/Frameworks"
resourcesDir=contents+"/Resources" resourcesDir=contents+"/Resources"
osgPluginsDir=contents+"/PlugIns/osgPlugins-2.9.7" osgPluginsDir=contents+"/PlugIns/osgPlugins-#{osgVersion}"
volName="\"FlightGear Nightly Build\"" volName="\"FlightGear Nightly Build\""
puts "Creating directory structure" puts "Creating directory structure"
@ -67,7 +71,7 @@ libFile = "libOpenThreads.12.dylib"
$osgPlugins.each do |p| $osgPlugins.each do |p|
pluginFile = "osgdb_#{p}.so" pluginFile = "osgdb_#{p}.so"
`cp #{prefixDir}/lib/osgPlugins-2.9.7/#{pluginFile} #{osgPluginsDir}` `cp #{prefixDir}/lib/osgPlugins-#{osgVersion}/#{pluginFile} #{osgPluginsDir}`
fix_install_names("#{osgPluginsDir}/#{pluginFile}") fix_install_names("#{osgPluginsDir}/#{pluginFile}")
end end