Fixed stuff for vendor/rails

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@953 5ecf4fe2-1ee6-0310-87b1-e25e094e27de

2 files changed, 21 insertions, 22 deletions

diff --git a/railties/Rakefile b/railties/Rakefile
index 90fddb3b4a..996b5bffc7 100644
--- a/railties/Rakefile
+++ b/railties/Rakefile
@@ -91,14 +91,13 @@ end
 desc "Copy in all the Rails packages to vendor"
 task :copy_vendor_libraries do
   mkdir File.join(PKG_DESTINATION, 'vendor', 'rails')
-  cp_r VENDOR_LIBS.map { |dir| File.join('..', dir) },
-       File.join(PKG_DESTINATION, 'vendor', 'rails')
+  VENDOR_LIBS.each { |dir| cp_r File.join('..', dir), File.join(PKG_DESTINATION, 'vendor', 'rails', dir) }
 end
 
 desc "Link in all the Rails packages to vendor"
 task :link_vendor_libraries do
-  branch_root = File.dirname(File.dirname(File.expand_path(__FILE__)))
-  ln_s branch_root, File.join(PKG_DESTINATION, 'vendor', 'rails')
+  mkdir File.join(PKG_DESTINATION, 'vendor', 'rails')
+  VENDOR_LIBS.each { |dir| ln_s File.join('..', '..', '..', dir), File.join(PKG_DESTINATION, 'vendor', 'rails', dir) }
 end
 
 
diff --git a/railties/fresh_rakefile b/railties/fresh_rakefile
index 3ac1d9b12f..62ecd4d9f7 100755
--- a/railties/fresh_rakefile
+++ b/railties/fresh_rakefile
@@ -75,24 +75,24 @@ Rake::RDocTask.new("apidoc") { |rdoc|
   rdoc.options << '--line-numbers --inline-source'
   rdoc.rdoc_files.include('README')
   rdoc.rdoc_files.include('CHANGELOG')
-  rdoc.rdoc_files.include('vendor/railties/CHANGELOG')
-  rdoc.rdoc_files.include('vendor/railties/MIT-LICENSE')
-  rdoc.rdoc_files.include('vendor/activerecord/README')
-  rdoc.rdoc_files.include('vendor/activerecord/CHANGELOG')
-  rdoc.rdoc_files.include('vendor/activerecord/lib/active_record/**/*.rb')
-  rdoc.rdoc_files.exclude('vendor/activerecord/lib/active_record/vendor/*')
-  rdoc.rdoc_files.include('vendor/actionpack/README')
-  rdoc.rdoc_files.include('vendor/actionpack/CHANGELOG')
-  rdoc.rdoc_files.include('vendor/actionpack/lib/action_controller/**/*.rb')
-  rdoc.rdoc_files.include('vendor/actionpack/lib/action_view/**/*.rb')
-  rdoc.rdoc_files.include('vendor/actionmailer/README')
-  rdoc.rdoc_files.include('vendor/actionmailer/CHANGELOG')
-  rdoc.rdoc_files.include('vendor/actionmailer/lib/action_mailer/base.rb')
-  rdoc.rdoc_files.include('vendor/actionwebservice/README')
-  rdoc.rdoc_files.include('vendor/actionwebservice/ChangeLog')
-  rdoc.rdoc_files.include('vendor/actionwebservice/lib/action_web_service/**/*.rb')
-  rdoc.rdoc_files.include('vendor/activesupport/README')
-  rdoc.rdoc_files.include('vendor/activesupport/lib/active_support/**/*.rb')
+  rdoc.rdoc_files.include('vendor/rails/railties/CHANGELOG')
+  rdoc.rdoc_files.include('vendor/rails/railties/MIT-LICENSE')
+  rdoc.rdoc_files.include('vendor/rails/activerecord/README')
+  rdoc.rdoc_files.include('vendor/rails/activerecord/CHANGELOG')
+  rdoc.rdoc_files.include('vendor/rails/activerecord/lib/active_record/**/*.rb')
+  rdoc.rdoc_files.exclude('vendor/rails/activerecord/lib/active_record/vendor/*')
+  rdoc.rdoc_files.include('vendor/rails/actionpack/README')
+  rdoc.rdoc_files.include('vendor/rails/actionpack/CHANGELOG')
+  rdoc.rdoc_files.include('vendor/rails/actionpack/lib/action_controller/**/*.rb')
+  rdoc.rdoc_files.include('vendor/rails/actionpack/lib/action_view/**/*.rb')
+  rdoc.rdoc_files.include('vendor/rails/actionmailer/README')
+  rdoc.rdoc_files.include('vendor/rails/actionmailer/CHANGELOG')
+  rdoc.rdoc_files.include('vendor/rails/actionmailer/lib/action_mailer/base.rb')
+  rdoc.rdoc_files.include('vendor/rails/actionwebservice/README')
+  rdoc.rdoc_files.include('vendor/rails/actionwebservice/ChangeLog')
+  rdoc.rdoc_files.include('vendor/rails/actionwebservice/lib/action_web_service/**/*.rb')
+  rdoc.rdoc_files.include('vendor/rails/activesupport/README')
+  rdoc.rdoc_files.include('vendor/rails/activesupport/lib/active_support/**/*.rb')
 }
 
 desc "Report code statistics (KLOCs, etc) from the application"