diff options
author | drbrain <drbrain@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2011-06-23 22:24:44 +0000 |
---|---|---|
committer | drbrain <drbrain@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2011-06-23 22:24:44 +0000 |
commit | ea9c30bec1856e1a1c8c856d1f752258c70c15db (patch) | |
tree | dc28e04074dfc9305f408a42abbc39cfb91638c4 | |
parent | d001539a0538cba0e48be2ebdafe29e67b006a4e (diff) |
* 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`
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@32218 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 7 | ||||
-rwxr-xr-x | bin/rake | 7 | ||||
-rw-r--r-- | lib/rake/version.rb | 10 | ||||
-rwxr-xr-x | tool/rbinstall.rb | 2 |
4 files changed, 16 insertions, 10 deletions
@@ -1,3 +1,10 @@ +Fri Jun 24 07:24:37 2011 Eric Hodel <drbrain@segment7.net> + + * 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@segment7.net> * lib/rake: Import Rake 0.9.2 @@ -23,9 +23,10 @@ #++ begin - require 'rake' -rescue LoadError require 'rubygems' - require 'rake' +rescue LoadError end + +require 'rake' + Rake.application.run diff --git a/lib/rake/version.rb b/lib/rake/version.rb index dbad21e52d..7f22595640 100644 --- a/lib/rake/version.rb +++ b/lib/rake/version.rb @@ -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 diff --git a/tool/rbinstall.rb b/tool/rbinstall.rb index f0a08b8ebd..8490175d36 100755 --- a/tool/rbinstall.rb +++ b/tool/rbinstall.rb @@ -540,7 +540,7 @@ install?(:ext, :comm, :gem) do 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'], |