Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
8fcbd39057 | ||
|
|
d0bbc78751 | ||
|
|
7249e57951 | ||
|
|
d01913641f | ||
|
|
d5be569cd5 |
No files matched your search
@@ -17,6 +17,7 @@ module Rscons
|
|||||||
def run(target, sources, cache, env, vars = {})
|
def run(target, sources, cache, env, vars = {})
|
||||||
# build sources to linkable objects
|
# build sources to linkable objects
|
||||||
objects = env.build_sources(sources, [env['OBJSUFFIX'], env['LIBSUFFIX']].flatten, cache, vars)
|
objects = env.build_sources(sources, [env['OBJSUFFIX'], env['LIBSUFFIX']].flatten, cache, vars)
|
||||||
|
return false unless objects
|
||||||
ld = if env["LD"]
|
ld = if env["LD"]
|
||||||
env["LD"]
|
env["LD"]
|
||||||
elsif sources.find {|s| s.has_suffix?(env["DSUFFIX"])}
|
elsif sources.find {|s| s.has_suffix?(env["DSUFFIX"])}
|
||||||
|
|||||||
@@ -50,7 +50,7 @@ module Rscons
|
|||||||
# is given, the Environment object is yielded to the block and when the
|
# is given, the Environment object is yielded to the block and when the
|
||||||
# block returns, the {#process} method is automatically called.
|
# block returns, the {#process} method is automatically called.
|
||||||
def clone(variables = {})
|
def clone(variables = {})
|
||||||
env = Environment.new()
|
env = self.class.new
|
||||||
@builders.each do |builder_name, builder|
|
@builders.each do |builder_name, builder|
|
||||||
env.add_builder(builder)
|
env.add_builder(builder)
|
||||||
end
|
end
|
||||||
|
|||||||
@@ -72,7 +72,7 @@ module Rscons
|
|||||||
elsif varval.is_a?(Array)
|
elsif varval.is_a?(Array)
|
||||||
varval.map {|vv| expand_varref("#{prefix}#{vv}#{suffix}")}.flatten
|
varval.map {|vv| expand_varref("#{prefix}#{vv}#{suffix}")}.flatten
|
||||||
else
|
else
|
||||||
raise "I do not know how to expand a variable reference to a #{varval.class.name}"
|
raise "I do not know how to expand a variable reference to a #{varval.class.name} (from #{varname.inspect} => #{@vars[varname].inspect})"
|
||||||
end
|
end
|
||||||
else
|
else
|
||||||
varref
|
varref
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
module Rscons
|
module Rscons
|
||||||
# gem version
|
# gem version
|
||||||
VERSION = "0.2.0"
|
VERSION = "0.2.2"
|
||||||
end
|
end
|
||||||
Reference in new issue
Block a user