Permalink
Browse files

Fix a couple of OS X package building issues

  • Loading branch information...
1 parent b0733d5 commit bf38e3aa6cb1286a618335ee9d8f0b7eb179ea70 Evan Phoenix committed Feb 16, 2010
Showing with 3 additions and 3 deletions.
  1. +2 −2 configure
  2. +1 −1 rakelib/package.rake
View
4 configure
@@ -36,7 +36,7 @@ class Configure
@release_date = "2010-02-16"
@config_version = 1
- if File.directory? root + "/.git"
+ if !ENV['RELEASE'] and File.directory?(root + "/.git")
@buildrev = `git rev-list --all | head -n1`.chomp
else
@buildrev = "release"
@@ -89,7 +89,7 @@ class Configure
o.on "-P", "--prefix", "PATH", "Install Rubinius in subdirectories of PATH" do |dir|
dir = File.expand_path dir
- if File.directory? dir and dir !~ /(rubinius|rbx)\/?$/
+ if !ENV['RELEASE'] and File.directory? dir and dir !~ /(rubinius|rbx)\/?$/
puts "The directory #{dir} already exists, installing to #{dir}/rubinius"
dir += "/rubinius"
end
View
2 rakelib/package.rake
@@ -13,7 +13,7 @@ namespace :package do
Rake::Task['install'].invoke
sh "mkdir -p pkgtmp/usr/local/bin"
- sh "ln -sf /usr/local/rubinius/1.0.0-rc2/bin/rbx pkgtmp/usr/local/bin/rbx"
+ sh "ln -sf /usr/local/rubinius/#{Rubinius::BUILD_CONFIG[:version]}/bin/rbx pkgtmp/usr/local/bin/rbx"
sh "/Developer/Applications/Utilities/PackageMaker.app/Contents/MacOS/PackageMaker --root pkgtmp --id com.engineyard.rubinius -o rubinius-#{Rubinius::BUILD_CONFIG[:version]}.pkg -t Rubinius -v"

0 comments on commit bf38e3a

Please sign in to comment.