shortcut Environment#process if @targets is empty
This commit is contained in:
parent
160434b903
commit
a2653a77d1
@ -175,29 +175,31 @@ module Rscons
|
|||||||
cache = Cache.instance
|
cache = Cache.instance
|
||||||
cache.clear_checksum_cache!
|
cache.clear_checksum_cache!
|
||||||
targets_processed = {}
|
targets_processed = {}
|
||||||
process_target = proc do |target|
|
unless @targets.empty?
|
||||||
targets_processed[target] ||= begin
|
process_target = proc do |target|
|
||||||
@targets[target][:sources].each do |src|
|
targets_processed[target] ||= begin
|
||||||
if @targets.include?(src) and not targets_processed.include?(src)
|
@targets[target][:sources].each do |src|
|
||||||
process_target.call(src)
|
if @targets.include?(src) and not targets_processed.include?(src)
|
||||||
|
process_target.call(src)
|
||||||
|
end
|
||||||
end
|
end
|
||||||
|
result = run_builder(@targets[target][:builder],
|
||||||
|
target,
|
||||||
|
@targets[target][:sources],
|
||||||
|
cache,
|
||||||
|
@targets[target][:vars] || {})
|
||||||
|
unless result
|
||||||
|
cache.write
|
||||||
|
raise BuildError.new("Failed to build #{target}")
|
||||||
|
end
|
||||||
|
result
|
||||||
end
|
end
|
||||||
result = run_builder(@targets[target][:builder],
|
|
||||||
target,
|
|
||||||
@targets[target][:sources],
|
|
||||||
cache,
|
|
||||||
@targets[target][:vars] || {})
|
|
||||||
unless result
|
|
||||||
cache.write
|
|
||||||
raise BuildError.new("Failed to build #{target}")
|
|
||||||
end
|
|
||||||
result
|
|
||||||
end
|
end
|
||||||
|
@targets.each do |target, target_params|
|
||||||
|
process_target.call(target)
|
||||||
|
end
|
||||||
|
cache.write
|
||||||
end
|
end
|
||||||
@targets.each do |target, target_params|
|
|
||||||
process_target.call(target)
|
|
||||||
end
|
|
||||||
cache.write
|
|
||||||
end
|
end
|
||||||
|
|
||||||
# Clear all targets registered for the Environment.
|
# Clear all targets registered for the Environment.
|
||||||
|
Loading…
x
Reference in New Issue
Block a user