diff options
| author | Andrew White <andyw@pixeltrix.co.uk> | 2010-03-29 05:10:42 +0100 |
|---|---|---|
| committer | wycats <wycats@gmail.com> | 2010-03-28 22:45:03 -0700 |
| commit | d39ec8195546075afb5830c7f5a53bb74946521c (patch) | |
| tree | 984a532cc304e761f6c71ea5dd10e25809218d49 | |
| parent | d31e03f3566471f2ad04dc6dace889fae962f7a8 (diff) | |
| download | rails-d39ec8195546075afb5830c7f5a53bb74946521c.tar.gz rails-d39ec8195546075afb5830c7f5a53bb74946521c.tar.bz2 rails-d39ec8195546075afb5830c7f5a53bb74946521c.zip | |
Make Railties RDoc task work again [#4291 state:resolved]
Signed-off-by: wycats <wycats@gmail.com>
| -rw-r--r-- | Rakefile | 4 | ||||
| -rw-r--r-- | railties/Rakefile | 8 |
2 files changed, 4 insertions, 8 deletions
@@ -72,8 +72,8 @@ Rake::RDocTask.new do |rdoc| rdoc.rdoc_files.include('railties/CHANGELOG') rdoc.rdoc_files.include('railties/MIT-LICENSE') rdoc.rdoc_files.include('railties/README') - rdoc.rdoc_files.include('railties/lib/{*.rb,commands/*.rb,rails/*.rb,generators/*.rb}') - rdoc.rdoc_files.exclude('railties/lib/vendor/*') + rdoc.rdoc_files.include('railties/lib/**/*.rb') + rdoc.rdoc_files.exclude('railties/lib/rails/generators/**/templates/*') rdoc.rdoc_files.include('activerecord/README') rdoc.rdoc_files.include('activerecord/CHANGELOG') diff --git a/railties/Rakefile b/railties/Rakefile index 6368456366..d88036f829 100644 --- a/railties/Rakefile +++ b/railties/Rakefile @@ -1,5 +1,3 @@ -require File.expand_path('../../load_paths', __FILE__) - require 'rake' require 'rake/testtask' require 'rake/rdoctask' @@ -60,10 +58,8 @@ Rake::RDocTask.new { |rdoc| rdoc.options << '--charset' << 'utf-8' rdoc.template = ENV['template'] ? "#{ENV['template']}.rb" : '../doc/template/horo' rdoc.rdoc_files.include('README', 'CHANGELOG') - rdoc.rdoc_files.include('lib/*.rb') - rdoc.rdoc_files.include('lib/rails/*.rb') - rdoc.rdoc_files.include('lib/rails/generators/*.rb') - rdoc.rdoc_files.include('lib/rails/commands/**/*.rb') + rdoc.rdoc_files.include('lib/**/*.rb') + rdoc.rdoc_files.exclude('lib/rails/generators/**/templates/*') } # Generate GEM ---------------------------------------------------------------------------- |