Navigation

Changeset 9240

Timestamp:

04/08/08 04:21:32 (3 months ago)

Author:

rick

Message:

Don't require rails/gem_builder during rails initialization, it's only needed for the gems:build task. [rick]

Files:

r9236	r9240
1	1	SVN
	2
	3	* Don't require rails/gem_builder during rails initialization, it's only needed for the gems:build task. [rick]
2	4
3	5	* script/performance/profiler compatibility with the ruby-prof >= 0.5.0. Closes #9176. [Catfish]

r9215	r9240
15	15	@lib = options[:lib]
16	16	@source = options[:source]
17		@loaded = false
18		@load_paths_added = false
	17	@loaded = @frozen = @load_paths_added = false
19	18	@unpack_directory = nil
20	19	end
…	…
29	28	else
30	29	$LOAD_PATH << File.join(unpacked_paths.first, 'lib')
	30	@frozen = true
31	31	end
32	32	@load_paths_added = true
…	…
46	46	puts $!.to_s
47	47	$!.backtrace.each { \|b\| puts b }
	48	end
	49
	50	def frozen?
	51	@frozen
48	52	end
49	53

r9215	r9240
2	2	task :gems => :environment do
3	3	Rails.configuration.gems.each do \|gem\|
4		puts "[#{gem.loaded? ? '*' : ' '}] #{gem.name} #{gem.requirement.to_s}"
	4	code = gem.loaded? ? (gem.frozen? ? "F" : "I") : " "
	5	puts "[#{code}] #{gem.name} #{gem.requirement.to_s}"
5	6	end
	7	puts
	8	puts "I = Installed"
	9	puts "F = Frozen"
6	10	end
7	11
…	…
9	13	desc "Build any native extensions for unpacked gems"
10	14	task :build do
	15	require 'rails/gem_builder'
11	16	Dir[File.join(RAILS_ROOT, 'vendor', 'gems', '*')].each do \|gem_dir\|
12	17	spec_file = File.join(gem_dir, '.specification')
…	…
27	32
28	33	desc "Unpacks the specified gem into vendor/gems."
29		task :unpack do
30		Rake::Task["environment"].invoke
	34	task :unpack => :environment do
31	35	require 'rubygems'
32	36	require 'rubygems/gem_runner'
33	37	Rails.configuration.gems.each do \|gem\|
34		next unless ~~ENV['GEM'].blank? \|\| ENV['GEM'] == gem.name~~
	38	next unless !gem.frozen? && (ENV['GEM'].blank? \|\| ENV['GEM'] == gem.name)
35	39	gem.unpack_to(File.join(RAILS_ROOT, 'vendor', 'gems')) if gem.loaded?
36	40	end

r9215	r9240
8	8	require 'rails/plugin/locator'
9	9	require 'rails/plugin/loader'
10		~~require 'rails/gem_builder'~~
11	10	require 'rails/gem_dependency'
12	11