pass env to Cache#up_to_date?() and #register_build() instead of user_deps

This commit is contained in:
josh committed 2013-12-31 12:46:30 -05:00
1 parent 1868193b54
commit f8af0630b0
8 files changed
+65 -46

No files matched your search

+9 -5
View File
@@ -151,7 +151,6 @@ module Rscons
result = run_builder(@targets[target][:builder],
target,
@targets[target][:source],
@user_deps[target] || [],
cache,
@targets[target][:vars] || {})
unless result
@@ -232,6 +231,12 @@ module Rscons
@user_deps[target] = (@user_deps[target] + user_deps).uniq
end
# Return the list of user dependencies for a given target, or +nil+ for
# none.
def get_user_deps(target)
@user_deps[target]
end
# Build a list of source files into files containing one of the suffixes
# given by suffixes.
# This method is used internally by RScons builders.
@@ -250,7 +255,7 @@ module Rscons
converted_fname = get_build_fname(source, suffix)
builder = @builders.values.find { |b| b.produces?(converted_fname, source, self) }
if builder
converted = run_builder(builder, converted_fname, [source], [], cache, vars)
converted = run_builder(builder, converted_fname, [source], cache, vars)
return nil unless converted
break
end
@@ -267,19 +272,18 @@ module Rscons
# @param cache [Cache] The Cache.
# @param vars [Hash] Extra variables to pass to the builder.
# Return the result of the builder's run() method.
def run_builder(builder, target, sources, user_deps, cache, vars)
def run_builder(builder, target, sources, cache, vars)
vars = @varset.merge(vars)
@build_hooks.each do |build_hook_block|
build_operation = {
builder: builder,
target: target,
sources: sources,
user_deps: user_deps,
vars: vars,
}
build_hook_block.call(build_operation)
end
builder.run(target, sources, user_deps, cache, self, vars)
builder.run(target, sources, cache, self, vars)
end
# Parse dependencies for a given target from a Makefile.