Permalink
Browse files

Support Ruby 1.8.6

  • Loading branch information...
1 parent 2e28569 commit 81713c813dfdd1cf5ee5a667bbc0df35dc7fd602 @jhs jhs committed Jul 30, 2010
Showing with 5 additions and 5 deletions.
  1. +2 −2 Rakefile
  2. +1 −1 tasks/all.rake
  3. +2 −2 tasks/lib.rb
View
@@ -1,5 +1,5 @@
# Master control of the build system
-HERE = File.expand_path(File.dirname __FILE__)
+HERE = File.expand_path(File.dirname(__FILE__))
require "#{HERE}/tasks/lib"
-Dir[ File.dirname(__FILE__) + '/tasks/*.rake' ].each { |subtask| import subtask }
+Dir[ File.dirname(__FILE__) + '/tasks/*.rake' ].sort.each { |subtask| import subtask }
View
@@ -11,7 +11,7 @@ namespace :build do
task :confirm_ruby => :os_dependencies do
expectation = "#{RUBY_BUILD}/bin"
%w[ ruby gem rake ].each do |cmd|
- raise "#{cmd} not running from #{expectation}. Did you source env.sh?" unless `which #{cmd}`.chomp.match(Regexp.new "#{expectation}/#{cmd}$")
+ raise "#{cmd} not running from #{expectation}. Did you source env.sh?" unless `which #{cmd}`.chomp.match(Regexp.new("#{expectation}/#{cmd}$"))
end
end
View
@@ -3,7 +3,7 @@
require File.dirname(__FILE__) + '/places'
def package_dep opts
- program_file, package = opts.first
+ program_file, package = opts.to_a.first
Rake.application.in_explicit_namespace(':') do
task "package:#{package}" => :known_distro do
@@ -55,7 +55,7 @@ def with_autoconf ver
files.each { |x| ln_canonical x }
yield
ensure
- files.each { |x| FileUtils.rm_f(canonical_path x) }
+ files.each { |x| FileUtils.rm_f(canonical_path(x)) }
end
end

0 comments on commit 81713c8

Please sign in to comment.