From f0dd77c6be6a86fe384bb0015151e0a497973d39 Mon Sep 17 00:00:00 2001 From: Yehuda Katz + Carl Lerche Date: Thu, 24 Sep 2009 14:01:31 -0700 Subject: Move railties/lib/* into railties/lib/* --- railties/Rakefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'railties/Rakefile') diff --git a/railties/Rakefile b/railties/Rakefile index 6ebb11dbb5..787b0be4a8 100644 --- a/railties/Rakefile +++ b/railties/Rakefile @@ -81,7 +81,7 @@ end task :create_rails do require File.join(File.dirname(__FILE__), 'lib', 'generators') - require 'generators/rails/app/app_generator' + 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 -- cgit v1.2.3 From f430d6b63e5a756cf248e92d87a61a505034600c Mon Sep 17 00:00:00 2001 From: Joshua Peek Date: Fri, 25 Sep 2009 00:46:04 -0500 Subject: Make gemspecs the authoritative source instead of generating them from the Rakefile --- railties/Rakefile | 46 +--------------------------------------------- 1 file changed, 1 insertion(+), 45 deletions(-) (limited to 'railties/Rakefile') diff --git a/railties/Rakefile b/railties/Rakefile index 787b0be4a8..47ea4edd84 100644 --- a/railties/Rakefile +++ b/railties/Rakefile @@ -137,56 +137,12 @@ Rake::RDocTask.new { |rdoc| # Generate GEM ---------------------------------------------------------------------------- -PKG_FILES = FileList[ - '[a-zA-Z]*', - 'bin/**/*', - 'builtin/**/*', - 'guides/**/*', - 'lib/**/{*,.[a-z]*}' -] - [ 'test' ] - -spec = Gem::Specification.new do |s| - s.platform = Gem::Platform::RUBY - s.name = 'rails' - s.version = PKG_VERSION - s.summary = "Web-application framework with template engine, control-flow layer, and ORM." - s.description = <<-EOF - Rails is a framework for building web-application using CGI, FCGI, mod_ruby, or WEBrick - on top of either MySQL, PostgreSQL, SQLite, DB2, SQL Server, or Oracle with eRuby- or Builder-based templates. - EOF - - s.add_dependency('rake', '>= 0.8.3') - s.add_dependency('activesupport', '= 3.0.pre' + PKG_BUILD) - s.add_dependency('activerecord', '= 3.0.pre' + PKG_BUILD) - s.add_dependency('actionpack', '= 3.0.pre' + PKG_BUILD) - s.add_dependency('actionmailer', '= 3.0.pre' + PKG_BUILD) - s.add_dependency('activeresource', '= 3.0.pre' + PKG_BUILD) - - s.rdoc_options << '--exclude' << '.' - s.has_rdoc = false - - s.files = PKG_FILES.to_a.delete_if {|f| f =~ %r{\.svn|guides/output}} - s.require_path = 'lib' - s.bindir = "bin" # Use these for applications. - s.executables = ["rails"] - s.default_executable = "rails" - - s.author = "David Heinemeier Hansson" - s.email = "david@loudthinking.com" - s.homepage = "http://www.rubyonrails.org" - s.rubyforge_project = "rails" -end +spec = eval(File.read('rails.gemspec')) Rake::GemPackageTask.new(spec) do |pkg| pkg.gem_spec = spec end -task :gemspec do - File.open(File.join(File.dirname(__FILE__), "#{spec.name}.gemspec"), "w") do |file| - file.puts spec.to_ruby - end -end - # Publishing ------------------------------------------------------- desc "Publish the rails gem" -- cgit v1.2.3 From e01f99786a586e41a36d3c1ddc66f080d04b4036 Mon Sep 17 00:00:00 2001 From: John Trupiano Date: Sun, 27 Sep 2009 10:15:17 -0400 Subject: Allow PKG_NAME env variable to control the directory name used when 'rake dev' is used to generate a new rails app. Signed-off-by: Michael Koziarski [#3278 state:committed] --- railties/Rakefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'railties/Rakefile') diff --git a/railties/Rakefile b/railties/Rakefile index 47ea4edd84..e36930af4f 100644 --- a/railties/Rakefile +++ b/railties/Rakefile @@ -9,7 +9,7 @@ require 'rbconfig' require File.join(File.dirname(__FILE__), 'lib/rails', 'version') PKG_BUILD = ENV['PKG_BUILD'] ? '.' + ENV['PKG_BUILD'] : '' -PKG_NAME = 'rails' +PKG_NAME = ENV['PKG_NAME'] || 'rails' PKG_VERSION = Rails::VERSION::STRING + PKG_BUILD PKG_FILE_NAME = "#{PKG_NAME}-#{PKG_VERSION}" PKG_DESTINATION = ENV["RAILS_PKG_DESTINATION"] || "../#{PKG_NAME}" -- cgit v1.2.3