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

homogenize slashes in Environment#expand_path()

Browse Source
This commit is contained in:
Josh Holtrop 2017-06-07 09:14:30 -04:00
parent 3436dc3a64
commit ed5d6e9e49
1 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
lib/rscons/environment.rb
View File

@ -422,11 +422,9 @@ module Rscons
raise "Unexpected construction variable set: #{vars.inspect}" raise "Unexpected construction variable set: #{vars.inspect}"
end end
builder = @builders[method.to_s] builder = @builders[method.to_s]
target = expand_path(target) target = expand_path(expand_varref(target))
target = expand_varref(target)
sources = Array(sources).map do |source| sources = Array(sources).map do |source|
source = expand_path(source) expand_path(expand_varref(source))
expand_varref(source)
end.flatten end.flatten
build_target = builder.create_build_target(env: self, target: target, sources: sources, vars: vars) build_target = builder.create_build_target(env: self, target: target, sources: sources, vars: vars)
add_target(build_target.to_s, builder, sources, vars, rest) add_target(build_target.to_s, builder, sources, vars, rest)
@ -659,14 +657,20 @@ module Rscons
# Paths beginning with "^/" are expanded by replacing "^" with the # Paths beginning with "^/" are expanded by replacing "^" with the
# Environment's build root. # Environment's build root.
# #
# @param path [String] The path to expand. # @param path [String, Array<String>]
# The path(s) to expand.
# #
# @return [String] The expanded path. # @return [String, Array<String>]
# The expanded path(s).
def expand_path(path) def expand_path(path)
if Rscons.phony_target?(path) if Rscons.phony_target?(path)
path path
elsif path.is_a?(Array)
path.map do |path|
expand_path(path)
end
else else
path.sub(%r{^\^(?=[\\/])}, @build_root) path.sub(%r{^\^(?=[\\/])}, @build_root).gsub("\\", "/")
end end
end end