drbrain	2011-06-24 07:24:44 +0900 (Fri, 24 Jun 2011)

  New Revision: 32218

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=32218

  Log:
    * lib/rake/version.rb:  Fixed VERSION to work with tool/rbinstall.rb
    * bin/rake:  Import bin/rake from 0.9.2
    * tool/rbinstall.rb (install):  Rake::VERSION is now in
      lib/rake/version.rb.  Fixes `make install`

  Modified files:
    trunk/ChangeLog
    trunk/bin/rake
    trunk/lib/rake/version.rb
    trunk/tool/rbinstall.rb

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 32217)
+++ ChangeLog	(revision 32218)
@@ -1,3 +1,10 @@
+Fri Jun 24 07:24:37 2011  Eric Hodel  <drbrain@s...>
+
+	* lib/rake/version.rb:  Fixed VERSION to work with tool/rbinstall.rb
+	* bin/rake:  Import bin/rake from 0.9.2
+	* tool/rbinstall.rb (install):  Rake::VERSION is now in
+	  lib/rake/version.rb.  Fixes `make install`
+
 Fri Jun 24 07:11:37 2011  Eric Hodel  <drbrain@s...>
 
 	* lib/rake: Import Rake 0.9.2
Index: lib/rake/version.rb
===================================================================
--- lib/rake/version.rb	(revision 32217)
+++ lib/rake/version.rb	(revision 32218)
@@ -1,10 +1,8 @@
 module Rake
+  VERSION = '0.9.2'
+
   module Version
-    NUMBERS = [
-      MAJOR = 0,
-      MINOR = 9,
-      BUILD = 2,
-    ]
+    MAJOR, MINOR, BUILD = VERSION.split '.'
+    NUMBERS = [ MAJOR, MINOR, BUILD ]
   end
-  VERSION = Version::NUMBERS.join('.')
 end
Index: bin/rake
===================================================================
--- bin/rake	(revision 32217)
+++ bin/rake	(revision 32218)
@@ -23,9 +23,10 @@
 #++
 
 begin
-  require 'rake'
+  require 'rubygems'
 rescue LoadError
-  require 'rubygems'
-  require 'rake'
 end
+
+require 'rake'
+
 Rake.application.run
Index: tool/rbinstall.rb
===================================================================
--- tool/rbinstall.rb	(revision 32217)
+++ tool/rbinstall.rb	(revision 32218)
@@ -540,7 +540,7 @@
 
   destdir = File.join(gpath, directories.grep(/^spec/)[0])
   default_gems = [
-    ['rake', 'lib/rake.rb'],
+    ['rake', 'lib/rake/version.rb'],
     ['rdoc', 'lib/rdoc.rb'],
     ['minitest', 'lib/minitest/unit.rb'],
     ['json', 'ext/json/lib/json/version.rb'],

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/