From f60ab920c918519f30c32403f494aca5fec5a489 Mon Sep 17 00:00:00 2001 From: Kyle Krueger Date: Mon, 10 Sep 2018 10:38:55 +0200 Subject: [PATCH 1/5] switch hardcoded string to reference existing value --- examples/example_3/target_gcc_32.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/example_3/target_gcc_32.yml b/examples/example_3/target_gcc_32.yml index f155508..8e772b0 100644 --- a/examples/example_3/target_gcc_32.yml +++ b/examples/example_3/target_gcc_32.yml @@ -15,7 +15,7 @@ compiler: includes: prefix: '-I' items: - - 'src/' + - *source_path - '../../src/' - *unit_tests_path defines: From c64cc7d4f41555b33cd47a9f478f6e92ea3189f2 Mon Sep 17 00:00:00 2001 From: Kyle Krueger Date: Mon, 10 Sep 2018 10:51:14 +0200 Subject: [PATCH 2/5] fix new references --- examples/example_3/target_gcc_32.yml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/examples/example_3/target_gcc_32.yml b/examples/example_3/target_gcc_32.yml index 8e772b0..124e674 100644 --- a/examples/example_3/target_gcc_32.yml +++ b/examples/example_3/target_gcc_32.yml @@ -1,8 +1,9 @@ # Copied from ~Unity/targets/gcc_32.yml unity_root: &unity_root '../..' +unity_source: &unity_source '../../src' compiler: path: gcc - source_path: 'src/' + source_path: &source_path 'src/' unit_tests_path: &unit_tests_path 'test/' build_path: &build_path 'build/' options: @@ -15,8 +16,8 @@ compiler: includes: prefix: '-I' items: - - *source_path - - '../../src/' + - *source_path + - *unity_source - *unit_tests_path defines: prefix: '-D' From 5d2ef07054c201776520b2c3ada19b819f56253c Mon Sep 17 00:00:00 2001 From: Kyle Krueger Date: Mon, 10 Sep 2018 11:21:41 +0200 Subject: [PATCH 3/5] remove change that slipped in from other project --- examples/example_3/target_gcc_32.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/example_3/target_gcc_32.yml b/examples/example_3/target_gcc_32.yml index 124e674..4acc294 100644 --- a/examples/example_3/target_gcc_32.yml +++ b/examples/example_3/target_gcc_32.yml @@ -1,6 +1,6 @@ # Copied from ~Unity/targets/gcc_32.yml unity_root: &unity_root '../..' -unity_source: &unity_source '../../src' +unity_source: &unity_source '../../' compiler: path: gcc source_path: &source_path 'src/' From 8ba35a0e523c0a8efbb6cd4e5eb9f2d2ce4fc0a6 Mon Sep 17 00:00:00 2001 From: Kyle Krueger Date: Mon, 10 Sep 2018 11:26:13 +0200 Subject: [PATCH 4/5] Revert "remove change that slipped in from other project" This reverts commit 5d2ef07054c201776520b2c3ada19b819f56253c. --- examples/example_3/target_gcc_32.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/example_3/target_gcc_32.yml b/examples/example_3/target_gcc_32.yml index 4acc294..124e674 100644 --- a/examples/example_3/target_gcc_32.yml +++ b/examples/example_3/target_gcc_32.yml @@ -1,6 +1,6 @@ # Copied from ~Unity/targets/gcc_32.yml unity_root: &unity_root '../..' -unity_source: &unity_source '../../' +unity_source: &unity_source '../../src' compiler: path: gcc source_path: &source_path 'src/' From 56f16460876b34c5b5708909c06957f7761db1c5 Mon Sep 17 00:00:00 2001 From: Kyle Krueger Date: Mon, 10 Sep 2018 15:19:15 +0200 Subject: [PATCH 5/5] add missing trailing slash --- examples/example_3/target_gcc_32.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/example_3/target_gcc_32.yml b/examples/example_3/target_gcc_32.yml index 124e674..d7568ab 100644 --- a/examples/example_3/target_gcc_32.yml +++ b/examples/example_3/target_gcc_32.yml @@ -1,6 +1,6 @@ # Copied from ~Unity/targets/gcc_32.yml unity_root: &unity_root '../..' -unity_source: &unity_source '../../src' +unity_source: &unity_source '../../src/' compiler: path: gcc source_path: &source_path 'src/'