replace Builder.makes_object_file? with Builder.produces?
This commit is contained in:
1 parent
119f3c9f0f
commit
fdd21754d1
3 files changed
+4
-6
No files matched your search
@@ -1,6 +1,6 @@
|
|||||||
module Rscons
|
module Rscons
|
||||||
class Builder
|
class Builder
|
||||||
def self.makes_object_file?(env, fname)
|
def self.produces?(env, suffix)
|
||||||
false
|
false
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|||||||
@@ -8,10 +8,8 @@ module Rscons
|
|||||||
'CEXTS' => ['.c'],
|
'CEXTS' => ['.c'],
|
||||||
}
|
}
|
||||||
|
|
||||||
def self.makes_object_file?(env, fname)
|
def self.produces?(env, suffix)
|
||||||
env['CEXTS'].find do |cext|
|
suffix == env['OBJSUFFIX']
|
||||||
fname =~ /#{cext}$/
|
|
||||||
end
|
|
||||||
end
|
end
|
||||||
|
|
||||||
def run(env, target, source)
|
def run(env, target, source)
|
||||||
|
|||||||
@@ -16,7 +16,7 @@ module Rscons
|
|||||||
if source =~ /#{env['OBJSUFFIX']}$/ or source =~ /#{env['LIBSUFFIX']}$/
|
if source =~ /#{env['OBJSUFFIX']}$/ or source =~ /#{env['LIBSUFFIX']}$/
|
||||||
source
|
source
|
||||||
else
|
else
|
||||||
builder_class = env.builders.values.find { |klass| klass.makes_object_file?(env, source) }
|
builder_class = env.builders.values.find { |klass| klass.produces?(env, env['OBJSUFFIX']) }
|
||||||
if builder_class
|
if builder_class
|
||||||
builder = builder_class.new
|
builder = builder_class.new
|
||||||
builder.run(env, env.stem(source) + env['OBJSUFFIX'], source)
|
builder.run(env, env.stem(source) + env['OBJSUFFIX'], source)
|
||||||
|
|||||||
Reference in new issue
Block a user