From 8ff310aef4e7ed424429059d10e3af0f169323fb Mon Sep 17 00:00:00 2001 From: Carlhuda Date: Mon, 30 Nov 2009 16:46:09 -0800 Subject: Break up rails and railties: * rails is now a metagem (gem install rails works as it does now) * railties includes the glue layer, so you can easily declare dependencies on railties, actionpack, and actionmailer and not get ActiveRecord's rake tasks, initializers, etc. --- railties/Rakefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'railties/Rakefile') diff --git a/railties/Rakefile b/railties/Rakefile index e6f698fc74..cb482c90bf 100644 --- a/railties/Rakefile +++ b/railties/Rakefile @@ -10,7 +10,7 @@ $LOAD_PATH.unshift "#{File.dirname(__FILE__)}/lib" require 'rails/version' PKG_BUILD = ENV['PKG_BUILD'] ? '.' + ENV['PKG_BUILD'] : '' -PKG_NAME = ENV['PKG_NAME'] || 'rails' +PKG_NAME = ENV['PKG_NAME'] || 'railties' PKG_VERSION = Rails::VERSION::STRING + PKG_BUILD PKG_FILE_NAME = "#{PKG_NAME}-#{PKG_VERSION}" PKG_DESTINATION = ENV["RAILS_PKG_DESTINATION"] || "../#{PKG_NAME}" @@ -141,7 +141,7 @@ Rake::RDocTask.new { |rdoc| # Generate GEM ---------------------------------------------------------------------------- -spec = eval(File.read('rails.gemspec')) +spec = eval(File.read('railties.gemspec')) Rake::GemPackageTask.new(spec) do |pkg| pkg.gem_spec = spec -- cgit v1.2.3 From 51d84eff126392e3a19a7e1bf293d1f1eee21623 Mon Sep 17 00:00:00 2001 From: Jeremy Kemper Date: Sat, 26 Dec 2009 22:22:48 -0800 Subject: Require bundled environment, if present, so Active Support can load i18n --- railties/Rakefile | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'railties/Rakefile') diff --git a/railties/Rakefile b/railties/Rakefile index cb482c90bf..07c2ff84a0 100644 --- a/railties/Rakefile +++ b/railties/Rakefile @@ -1,3 +1,8 @@ +begin + require File.expand_path('../../vendor/gems/environment', __FILE__) +rescue LoadError +end + require 'rake' require 'rake/testtask' require 'rake/rdoctask' -- cgit v1.2.3 From 0b375725526a2d1d952938610a66291f00849713 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Valim?= Date: Tue, 29 Dec 2009 12:19:38 +0100 Subject: Clean up railties Rakefile from old responsibilities which are now part of main Rakefile --- railties/Rakefile | 69 ++----------------------------------------------------- 1 file changed, 2 insertions(+), 67 deletions(-) (limited to 'railties/Rakefile') diff --git a/railties/Rakefile b/railties/Rakefile index 07c2ff84a0..eff59f1f40 100644 --- a/railties/Rakefile +++ b/railties/Rakefile @@ -15,7 +15,7 @@ $LOAD_PATH.unshift "#{File.dirname(__FILE__)}/lib" require 'rails/version' PKG_BUILD = ENV['PKG_BUILD'] ? '.' + ENV['PKG_BUILD'] : '' -PKG_NAME = ENV['PKG_NAME'] || 'railties' +PKG_NAME = 'railties' PKG_VERSION = Rails::VERSION::STRING + PKG_BUILD PKG_FILE_NAME = "#{PKG_NAME}-#{PKG_VERSION}" PKG_DESTINATION = ENV["RAILS_PKG_DESTINATION"] || "../#{PKG_NAME}" @@ -25,7 +25,6 @@ RELEASE_NAME = "REL #{PKG_VERSION}" RUBY_FORGE_PROJECT = "rails" RUBY_FORGE_USER = "webster132" - task :default => :test task :test => 'test:isolated' @@ -50,33 +49,6 @@ Rake::TestTask.new('test:regular') do |t| t.verbose = true end -VENDOR_LIBS = %w( actionpack activerecord actionmailer activesupport activeresource railties ) - -desc "Generates a fresh Rails package with documentation" -task :fresh_rails => [ :clean, :create_rails, :copy_vendor_libraries, :generate_documentation ] - -desc "Generates a fresh Rails package using GEMs with documentation" -task :fresh_gem_rails => [ :clean, :create_rails ] - -desc "Generates a fresh Rails package without documentation (faster)" -task :fresh_rails_without_docs => [ :clean, :create_rails, :copy_vendor_libraries ] - -desc "Generates a fresh Rails package without documentation using links (faster)" -task :fresh_rails_without_docs_using_links => [ :clean, :create_rails, :link_vendor_libraries ] - -desc "Generates minimal Rails package using symlinks" -task :dev => [ :clean, :create_rails, :link_vendor_libraries ] - -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}} - system %{cd ..; zip -r #{PKG_NAME}-#{PKG_VERSION}.zip #{PKG_NAME}} -end - -task :clean do - rm_rf PKG_DESTINATION -end - # Update spinoffs ------------------------------------------------------------------- desc "Updates application README to the latest version Railties README" @@ -86,51 +58,14 @@ task :update_readme do cp "./README", readme end -# Run application generator ------------------------------------------------------------- - -task :create_rails do - require 'rails/generators' - require 'rails/generators/rails/app/app_generator' - Rails::Generators::AppGenerator.start [ File.basename(PKG_DESTINATION), "--quiet" ], - :destination_root => File.expand_path(File.dirname(PKG_DESTINATION)) -end - -# Copy Vendors ---------------------------------------------------------------------------- - -desc "Copy in all the Rails packages to vendor" -task :copy_vendor_libraries do - mkdir File.join(PKG_DESTINATION, 'vendor', 'rails') - VENDOR_LIBS.each { |dir| cp_r File.join('..', dir), File.join(PKG_DESTINATION, 'vendor', 'rails', dir) } - FileUtils.rm_r(Dir.glob(File.join(PKG_DESTINATION, 'vendor', 'rails', "**", ".git"))) -end - -desc "Link in all the Rails packages to vendor" -task :link_vendor_libraries do - mkdir File.join(PKG_DESTINATION, 'vendor', 'rails') - VENDOR_LIBS.each { |dir| ln_s File.join('..', '..', '..', dir), File.join(PKG_DESTINATION, 'vendor', 'rails', dir) } -end - - desc 'Generate guides (for authors), use ONLY=foo to process just "foo.textile"' task :generate_guides do ENV["WARN_BROKEN_LINKS"] = "1" # authors can't disable this ruby "guides/rails_guides.rb" end - # Generate documentation ------------------------------------------------------------------ -desc "Generate documentation for the framework and for the empty application" -task :generate_documentation => [ :generate_app_doc, :generate_rails_framework_doc ] - -task :generate_rails_framework_doc do - system %{cd #{PKG_DESTINATION}; rake doc:rails} -end - -task :generate_app_doc do - system %{cd #{PKG_DESTINATION}; rake doc:app} -end - Rake::RDocTask.new { |rdoc| rdoc.rdoc_dir = 'doc' rdoc.title = "Railties -- Gluing the Engine to the Rails" @@ -152,8 +87,8 @@ Rake::GemPackageTask.new(spec) do |pkg| pkg.gem_spec = spec end - # Publishing ------------------------------------------------------- + desc "Publish the rails gem" task :pgem => [:gem] do require 'rake/contrib/sshpublisher' -- cgit v1.2.3