allow trailing slashes to be passed to env.build_dir()
This commit is contained in:
parent
a6a79b8ef1
commit
20f3da3b04
@ -187,7 +187,9 @@ module Rscons
|
|||||||
#
|
#
|
||||||
# @return [void]
|
# @return [void]
|
||||||
def build_dir(src_dir, obj_dir)
|
def build_dir(src_dir, obj_dir)
|
||||||
src_dir = src_dir.gsub('\\', '/') if src_dir.is_a?(String)
|
if src_dir.is_a?(String)
|
||||||
|
src_dir = src_dir.gsub("\\", "/").sub(%r{/*$}, "")
|
||||||
|
end
|
||||||
@build_dirs << [src_dir, obj_dir]
|
@build_dirs << [src_dir, obj_dir]
|
||||||
end
|
end
|
||||||
|
|
||||||
|
@ -197,6 +197,19 @@ describe Rscons do
|
|||||||
expect(File.exists?('build_two/two.o')).to be_truthy
|
expect(File.exists?('build_two/two.o')).to be_truthy
|
||||||
end
|
end
|
||||||
|
|
||||||
|
it "supports trailing slashes at the end of build_dir sources and destinations" do
|
||||||
|
test_dir("build_dir")
|
||||||
|
Rscons::Environment.new do |env|
|
||||||
|
env.append("CPPPATH" => Dir["src/**/*/"])
|
||||||
|
env.build_dir("src/one/", "build_one/")
|
||||||
|
env.build_dir("src/two", "build_two")
|
||||||
|
env.Program("build_dir", Dir["src/**/*.c"])
|
||||||
|
end
|
||||||
|
expect(`./build_dir`).to eq "Hello from two()\n"
|
||||||
|
expect(File.exists?("build_one/one.o")).to be_truthy
|
||||||
|
expect(File.exists?("build_two/two.o")).to be_truthy
|
||||||
|
end
|
||||||
|
|
||||||
it 'uses build directories before build root' do
|
it 'uses build directories before build root' do
|
||||||
test_dir('build_dir')
|
test_dir('build_dir')
|
||||||
env = Rscons::Environment.new do |env|
|
env = Rscons::Environment.new do |env|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user