josh/rscons
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

env.build_after should expand paths - close #35

Browse Source
This commit is contained in:
Josh Holtrop 2017-06-13 18:37:41 -04:00
parent 74d19ea235
commit a49ebc486e
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
build_tests/custom_builder/build_after.rb
View File

@ -3,6 +3,8 @@ Rscons::Environment.new do |env|
[], [],
"CMD" => %w[ruby gen.rb ${_TARGET}], "CMD" => %w[ruby gen.rb ${_TARGET}],
"CMD_DESC" => "Generating") "CMD_DESC" => "Generating")
env.build_after("#{env.build_root}/program.o", "inc.c") env["build_root"] = env.build_root
env["inc_c"] = "inc.c"
env.build_after("${build_root}/program.o", "${inc_c}")
env.Program("program.exe", ["program.c", "inc.c"]) env.Program("program.exe", ["program.c", "inc.c"])
end end

2
lib/rscons/environment.rb
View File

@ -476,8 +476,10 @@ module Rscons
targets = Array(targets) targets = Array(targets)
prerequisites = Array(prerequisites) prerequisites = Array(prerequisites)
targets.each do |target| targets.each do |target|
target = expand_path(expand_varref(target))
@registered_build_dependencies[target] ||= Set.new @registered_build_dependencies[target] ||= Set.new
prerequisites.each do |prerequisite| prerequisites.each do |prerequisite|
prerequisite = expand_path(expand_varref(prerequisite))
@registered_build_dependencies[target] << prerequisite @registered_build_dependencies[target] << prerequisite
end end
end end