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

ConfigureOp: refactor some logic into #store_common

Browse Source
This commit is contained in:
Josh Holtrop 2018-12-17 22:54:34 -05:00
parent a98c111cd2
commit 5915ac2b95
1 changed files with 21 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
lib/rscons/configure_op.rb
View File

@ -312,13 +312,10 @@ module Rscons
# @param options [Hash]
# Options.
def store_merge(vars, options = {})
usename = options[:use] || "_default_"
cache = Cache.instance
cache.configuration_data["vars"] ||= {}
cache.configuration_data["vars"][usename] ||= {}
cache.configuration_data["vars"][usename]["merge"] ||= {}
store_vars = store_common(options)
store_vars["merge"] ||= {}
vars.each_pair do |key, value|
cache.configuration_data["vars"][usename]["merge"][key] = value
store_vars["merge"][key] = value
end
end
@ -329,16 +326,13 @@ module Rscons
# @param options [Hash]
# Options.
def store_append(vars, options = {})
usename = options[:use] || "_default_"
cache = Cache.instance
cache.configuration_data["vars"] ||= {}
cache.configuration_data["vars"][usename] ||= {}
cache.configuration_data["vars"][usename]["append"] ||= {}
store_vars = store_common(options)
store_vars["append"] ||= {}
vars.each_pair do |key, value|
if cache.configuration_data["vars"][usename]["append"][key].is_a?(Array) and value.is_a?(Array)
cache.configuration_data["vars"][usename]["append"][key] += value
if store_vars["append"][key].is_a?(Array) and value.is_a?(Array)
store_vars["append"][key] += value
else
cache.configuration_data["vars"][usename]["append"][key] = value
store_vars["append"][key] = value
end
end
end
@ -350,12 +344,23 @@ module Rscons
# @param options [Hash]
# Options.
def store_parse(flags, options = {})
store_vars = store_common(options)
store_vars["parse"] ||= []
store_vars["parse"] << flags
end
# Common functionality for all store methods.
#
# @param options [Hash]
# Options.
#
# @return [Hash]
# Configuration Hash for storing vars.
def store_common(options)
usename = options[:use] || "_default_"
cache = Cache.instance
cache.configuration_data["vars"] ||= {}
cache.configuration_data["vars"][usename] ||= {}
cache.configuration_data["vars"][usename]["parse"] ||= []
cache.configuration_data["vars"][usename]["parse"] << flags
end
# Perform processing common to several configure checks.