add_builder() takes an actual builder object instead of the builder class

This commit is contained in:
Josh Holtrop 2013-07-01 17:08:01 -04:00
parent 12d94997dc
commit c008350d87

View File

@ -28,17 +28,17 @@ module Rscons
exclude_builders = Set.new(@variables[:exclude_builders] || []) exclude_builders = Set.new(@variables[:exclude_builders] || [])
DEFAULT_BUILDERS.each do |builder_class| DEFAULT_BUILDERS.each do |builder_class|
unless exclude_builders.include?(builder_class.short_name) unless exclude_builders.include?(builder_class.short_name)
add_builder(builder_class) add_builder(builder_class.new(self))
end end
end end
end end
(@variables[:builders] || []).each do |builder_class| (@variables[:builders] || []).each do |builder|
add_builder(builder_class) add_builder(builder)
end end
end end
def add_builder(builder_class) def add_builder(builder)
@builders[builder_class.short_name] = builder_class @builders[builder.class.short_name] = builder
end end
def [](key, type = nil) def [](key, type = nil)