diff options
| author | David Heinemeier Hansson <david@loudthinking.com> | 2005-03-20 22:41:35 +0000 |
|---|---|---|
| committer | David Heinemeier Hansson <david@loudthinking.com> | 2005-03-20 22:41:35 +0000 |
| commit | 20e3cfe52d294893ad46307440e4acf1f02165ea (patch) | |
| tree | b555bce70a9841d06b731eb8fe76697cd8c708d7 /railties/Rakefile | |
| parent | a61360688cd0e1f43f523866384d0d0796a4ea73 (diff) | |
| download | rails-20e3cfe52d294893ad46307440e4acf1f02165ea.tar.gz rails-20e3cfe52d294893ad46307440e4acf1f02165ea.tar.bz2 rails-20e3cfe52d294893ad46307440e4acf1f02165ea.zip | |
Combined the script/environment.rb used for gems and regular files version. If vendor/rails/* has all the frameworks, then files version is used, otherwise gems #878 [Nicholas Seckar]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@946 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'railties/Rakefile')
| -rw-r--r-- | railties/Rakefile | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/railties/Rakefile b/railties/Rakefile index 1399242205..90fddb3b4a 100644 --- a/railties/Rakefile +++ b/railties/Rakefile @@ -90,16 +90,15 @@ 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') + File.join(PKG_DESTINATION, 'vendor', 'rails') end desc "Link in all the Rails packages to vendor" task :link_vendor_libraries do - return_dir = File.dirname(File.expand_path(__FILE__)) - cd File.join(PKG_DESTINATION, 'vendor') - VENDOR_LIBS.each { |dir| ln_s File.dirname(__FILE__) + "/../../#{dir}", "." } - cd return_dir + branch_root = File.dirname(File.dirname(File.expand_path(__FILE__))) + ln_s branch_root, File.join(PKG_DESTINATION, 'vendor', 'rails') end @@ -138,7 +137,7 @@ task :copy_configs do cp "configs/apache.conf", "#{PKG_DESTINATION}/public/.htaccess" - cp "environments/shared.rb", "#{PKG_DESTINATION}/config/environment.rb" + cp "environments/environment.rb", "#{PKG_DESTINATION}/config/environment.rb" cp "environments/production.rb", "#{PKG_DESTINATION}/config/environments/production.rb" cp "environments/development.rb", "#{PKG_DESTINATION}/config/environments/development.rb" cp "environments/test.rb", "#{PKG_DESTINATION}/config/environments/test.rb" @@ -207,7 +206,7 @@ end # Generate GEM ---------------------------------------------------------------------------- task :copy_gem_environment do - cp "environments/shared_for_gem.rb", "#{PKG_DESTINATION}/config/environment.rb" + cp "environments/environment.rb", "#{PKG_DESTINATION}/config/environment.rb" dest_file = File.join(PKG_DESTINATION, 'script', 'breakpointer') copy_with_rewritten_ruby_path(File.join('bin', 'breakpointer_for_gem'), dest_file) chmod 0755, dest_file |