allow phony targets in conjunction with a build root
This commit is contained in:
parent
bab4641b6e
commit
0442b876a5
@ -509,7 +509,11 @@ module Rscons
|
|||||||
#
|
#
|
||||||
# @return [String] The expanded path.
|
# @return [String] The expanded path.
|
||||||
def expand_path(path)
|
def expand_path(path)
|
||||||
path.sub(%r{^\^(?=[\\/])}, @build_root)
|
if Rscons.phony_target?(path)
|
||||||
|
path
|
||||||
|
else
|
||||||
|
path.sub(%r{^\^(?=[\\/])}, @build_root)
|
||||||
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
# Execute a command using the system shell.
|
# Execute a command using the system shell.
|
||||||
|
@ -933,33 +933,36 @@ EOF
|
|||||||
end
|
end
|
||||||
|
|
||||||
context "phony targets" do
|
context "phony targets" do
|
||||||
it "allows specifying a Symbol as a target name and reruns the builder if the sources or command have changed" do
|
[false, true].each do |with_build_root|
|
||||||
test_dir("simple")
|
it "allows specifying a Symbol as a target name and reruns the builder if the sources or command have changed" do
|
||||||
env = Rscons::Environment.new do |env|
|
test_dir("simple")
|
||||||
env.add_builder(:Checker) do |target, sources, cache, env, vars|
|
env = Rscons::Environment.new do |env|
|
||||||
unless cache.up_to_date?(target, :Checker, sources, env)
|
env.build_root = "bld" if with_build_root
|
||||||
puts "Checker #{sources.first}" if env.echo != :off
|
env.add_builder(:Checker) do |target, sources, cache, env, vars|
|
||||||
cache.register_build(target, :Checker, sources, env)
|
unless cache.up_to_date?(target, :Checker, sources, env)
|
||||||
|
puts "Checker #{sources.first}" if env.echo != :off
|
||||||
|
cache.register_build(target, :Checker, sources, env)
|
||||||
|
end
|
||||||
|
target
|
||||||
end
|
end
|
||||||
target
|
env.Program("simple.exe", "simple.c")
|
||||||
|
env.Checker(:checker, "simple.exe")
|
||||||
end
|
end
|
||||||
env.Program("simple.exe", "simple.c")
|
expect(lines).to eq(["CC #{with_build_root ? 'bld/' : ''}simple.o", "LD simple.exe", "Checker simple.exe"])
|
||||||
env.Checker(:checker, "simple.exe")
|
|
||||||
end
|
|
||||||
expect(lines).to eq(["CC simple.o", "LD simple.exe", "Checker simple.exe"])
|
|
||||||
|
|
||||||
env.clone do |env|
|
env.clone do |env|
|
||||||
env.Checker(:checker, "simple.exe")
|
env.Checker(:checker, "simple.exe")
|
||||||
end
|
end
|
||||||
expect(lines).to eq([])
|
expect(lines).to eq([])
|
||||||
|
|
||||||
File.open("simple.exe", "w") do |fh|
|
File.open("simple.exe", "w") do |fh|
|
||||||
fh.puts "Changed simple.exe"
|
fh.puts "Changed simple.exe"
|
||||||
|
end
|
||||||
|
env.clone do |env|
|
||||||
|
env.Checker(:checker, "simple.exe")
|
||||||
|
end
|
||||||
|
expect(lines).to eq(["Checker simple.exe"])
|
||||||
end
|
end
|
||||||
env.clone do |env|
|
|
||||||
env.Checker(:checker, "simple.exe")
|
|
||||||
end
|
|
||||||
expect(lines).to eq(["Checker simple.exe"])
|
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user