1
0
mirror of https://github.com/ThrowTheSwitch/Unity.git synced 2026-01-23 08:25:58 +01:00

Added break out of system vs local includes for enhanced include-based dependency extraction to aid new cmock Make task/build generation.

Bumber build and version info since new external capability added for querying includes.
This commit is contained in:
Greg Williams
2015-04-06 10:43:28 -04:00
parent 5053f2ca90
commit b922d622a6
3 changed files with 8 additions and 6 deletions

View File

@@ -54,7 +54,8 @@ class UnityTestRunnerGenerator
source = File.read(input_file)
source = source.force_encoding("ISO-8859-1").encode("utf-8", :replace => nil) if ($QUICK_RUBY_VERSION > 10900)
tests = find_tests(source)
testfile_includes = find_includes(source)
headers = find_includes(source)
testfile_includes = headers[:local] + headers[:system]
used_mocks = find_mocks(testfile_includes)
#build runner file
@@ -128,9 +129,10 @@ class UnityTestRunnerGenerator
source.gsub!(/\/\/.*$/, '') # remove line comments (all that remain)
#parse out includes
includes = source.scan(/^\s*#include\s+\"\s*(.+)\.[hH]\s*\"/).flatten
brackets_includes = source.scan(/^\s*#include\s+<\s*(.+)\s*>/).flatten
brackets_includes.each { |inc| includes << '<' + inc +'>' }
includes = {
local: source.scan(/^\s*#include\s+\"\s*(.+)\.[hH]\s*\"/).flatten,
system: source.scan(/^\s*#include\s+<\s*(.+)\s*>/).flatten.map { |inc| "<#{inc}>" }
}
return includes
end

View File

@@ -1,2 +1,2 @@
118
119

View File

@@ -1,2 +1,2 @@
2.2.0
2.3.0