diff options
Diffstat (limited to 'railties')
| -rw-r--r-- | railties/Rakefile | 3 | ||||
| -rw-r--r-- | railties/environments/shared.rb | 1 | ||||
| -rw-r--r-- | railties/lib/rails_generator.rb | 3 | ||||
| -rw-r--r-- | railties/lib/rails_generator/base.rb | 4 | ||||
| -rw-r--r-- | railties/lib/rails_generator/options.rb | 2 |
5 files changed, 9 insertions, 4 deletions
diff --git a/railties/Rakefile b/railties/Rakefile index 2cd1086a5a..53880a4f6e 100644 --- a/railties/Rakefile +++ b/railties/Rakefile @@ -41,6 +41,9 @@ task :fresh_rails_without_docs => [ :clean, :make_dir_structure, :initialize_fil desc "Generates a fresh Rails package without documentation (faster)" task :fresh_rails_without_docs_using_links => [ :clean, :make_dir_structure, :initialize_file_stubs, :link_vendor_libraries, :copy_ties_content ] +desc "Generates minimal Rails package using symlinks" +task :dev => [ :clean, :make_dir_structure, :initialize_file_stubs, :link_vendor_libraries, :copy_ties_content ] + desc "Packages the fresh Rails package with documentation" task :package => [ :clean, :fresh_rails ] do system %{cd ..; tar -czvf #{PKG_NAME}-#{PKG_VERSION}.tgz #{PKG_NAME}} diff --git a/railties/environments/shared.rb b/railties/environments/shared.rb index f8a8e8cb6f..6064e18b03 100644 --- a/railties/environments/shared.rb +++ b/railties/environments/shared.rb @@ -19,6 +19,7 @@ ADDITIONAL_LOAD_PATHS.concat %w( vendor vendor/railties vendor/railties/lib + vendor/activesupport/lib vendor/activerecord/lib vendor/actionpack/lib vendor/actionmailer/lib diff --git a/railties/lib/rails_generator.rb b/railties/lib/rails_generator.rb index ed9b2d9636..edfe86efc4 100644 --- a/railties/lib/rails_generator.rb +++ b/railties/lib/rails_generator.rb @@ -23,7 +23,8 @@ $:.unshift(File.dirname(__FILE__)) -require 'support/core_ext' +require 'active_support/core_ext' + require 'rails_generator/base' require 'rails_generator/lookup' diff --git a/railties/lib/rails_generator/base.rb b/railties/lib/rails_generator/base.rb index b8c926f3ce..54b4b32fd3 100644 --- a/railties/lib/rails_generator/base.rb +++ b/railties/lib/rails_generator/base.rb @@ -1,5 +1,5 @@ -require File.dirname(__FILE__) + '/../support/class_attribute_accessors' -require File.dirname(__FILE__) + '/../support/inflector' +require 'active_support/class_attribute_accessors' +require 'active_support/inflector' require File.dirname(__FILE__) + '/options' require File.dirname(__FILE__) + '/manifest' require File.dirname(__FILE__) + '/spec' diff --git a/railties/lib/rails_generator/options.rb b/railties/lib/rails_generator/options.rb index 4ddeb94887..80af7fedf9 100644 --- a/railties/lib/rails_generator/options.rb +++ b/railties/lib/rails_generator/options.rb @@ -1,5 +1,5 @@ require 'optparse' -require File.dirname(__FILE__) + '/../support/class_inheritable_attributes' +require 'active_support/class_inheritable_attributes' module Rails module Generator |