From f2ad92e0bb64a9b0ab3090b5e4faa37dc7672e4a Mon Sep 17 00:00:00 2001 From: murphy Date: Sun, 12 Jun 2011 01:09:36 +0000 Subject: more task cleanups; speedup Rakefile loading --- Rakefile | 2 -- rake_tasks/documentation.rake | 3 +++ rake_tasks/gem.rake | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/Rakefile b/Rakefile index d7a743a..2a2a681 100644 --- a/Rakefile +++ b/Rakefile @@ -1,6 +1,4 @@ $:.unshift File.dirname(__FILE__) unless $:.include? '.' -gem 'rdoc' if defined? gem -require 'rdoc/task' ROOT = '.' LIB_ROOT = File.join ROOT, 'lib' diff --git a/rake_tasks/documentation.rake b/rake_tasks/documentation.rake index 162699d..16142fd 100644 --- a/rake_tasks/documentation.rake +++ b/rake_tasks/documentation.rake @@ -1,3 +1,6 @@ +gem 'rdoc' if defined? gem +require 'rdoc/task' + desc 'Generate documentation for CodeRay' Rake::RDocTask.new :doc do |rd| rd.main = 'lib/README' diff --git a/rake_tasks/gem.rake b/rake_tasks/gem.rake index c9d8937..61945e6 100644 --- a/rake_tasks/gem.rake +++ b/rake_tasks/gem.rake @@ -1,7 +1,7 @@ require 'rubygems/package_task' def svn_head_revision - @svn_head_revision ||= `svn up --ignore-externals && svn info`[/Revision: (\d+)/,1] + @svn_head_revision ||= `svnversion`.scan(/\d+/).map { |r| r.to_i }.max end def coderay_version -- cgit v1.2.1