From e846db9f3cf744387f152663c73005facb871c31 Mon Sep 17 00:00:00 2001 From: Brian Ford Date: Wed, 23 Jun 2010 09:45:54 -0700 Subject: [PATCH] Ensure Rakefile checks configure version before anything. Closes #385. --- Rakefile | 10 +++++----- configure | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Rakefile b/Rakefile index 0c83a887f8..72003cbef7 100644 --- a/Rakefile +++ b/Rakefile @@ -22,14 +22,14 @@ end require config_rb BUILD_CONFIG = Rubinius::BUILD_CONFIG -# Yes, this is duplicated from the configure script for now. -unless BUILD_CONFIG[:which_ruby] == :ruby or BUILD_CONFIG[:which_ruby] == :rbx - STDERR.puts "Sorry, building Rubinius requires MRI or Rubinius" +unless BUILD_CONFIG[:config_version] == 11 + STDERR.puts "Your configuration is outdated, please run ./configure first" exit 1 end -unless BUILD_CONFIG[:config_version] == 10 - STDERR.puts "Your configuration is outdated, please run ./configure first" +# Yes, this is duplicated from the configure script for now. +unless BUILD_CONFIG[:which_ruby] == :ruby or BUILD_CONFIG[:which_ruby] == :rbx + STDERR.puts "Sorry, building Rubinius requires MRI or Rubinius" exit 1 end diff --git a/configure b/configure index a39acb0e40..bf8f95509d 100755 --- a/configure +++ b/configure @@ -59,7 +59,7 @@ class Configure @libversion = "1.0" @version = "#{@libversion}.1" @release_date = "2010-06-03" - @config_version = 10 + @config_version = 11 if !ENV['RELEASE'] and File.directory?(root + "/.git") @buildrev = `git rev-list --all | head -n1`.chomp