lib/ceedling/configurator.rb in ceedling-0.30.0 vs lib/ceedling/configurator.rb in ceedling-0.31.0
- old
+ new
@@ -52,10 +52,11 @@
[:test_compiler,
:test_linker,
:test_fixture,
:test_includes_preprocessor,
:test_file_preprocessor,
+ :test_file_preprocessor_directives,
:test_dependencies_generator,
:release_compiler,
:release_assembler,
:release_linker,
:release_dependencies_generator].each do |tool|
@@ -229,10 +230,14 @@
items = []
interstitial = ((key == :path) ? File::PATH_SEPARATOR : '')
items = ((value.class == Array) ? hash[key] : [value])
- items.each { |item| item.replace( @system_wrapper.module_eval( item ) ) if (item =~ RUBY_STRING_REPLACEMENT_PATTERN) }
+ items.each do |item|
+ if item.is_a? String and item =~ RUBY_STRING_REPLACEMENT_PATTERN
+ item.replace( @system_wrapper.module_eval( item ) )
+ end
+ end
hash[key] = items.join( interstitial )
@system_wrapper.env_set( key.to_s.upcase, hash[key] )
end
end