Ensure Rakefile checks configure version before anything. Closes rubi…

…nius#385.
mutle · Jun 23, 2010 · e846db9 · e846db9
1 parent ddc4d8a
commit e846db9
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git 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
@@ -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