continuing

This commit is contained in:
Mark VanderVoord
2026-05-15 23:53:09 -04:00
parent 7d99f0f51d
commit feda84f23b
11 changed files with 6 additions and 496 deletions
+3 -3
View File
@@ -41,9 +41,9 @@ module RakefileHelpers
$cfg['linker']['object_files']['path'] = $proj[:project][:build_root]
$cfg['linker']['bin_files']['destination'] = $proj[:project][:build_root]
# Merge includes: keep Array items from target (e.g., IAR tool paths), use project.yml for strings
tool_includes = $cfg['compiler']['includes']['items'].select { |i| i.is_a?(Array) }
$cfg['compiler']['includes']['items'] = tool_includes + $proj[:paths][:include]
# Merge includes: preserve any target-specific items (tool paths, local headers),
# then add project.yml paths (| deduplicates)
$cfg['compiler']['includes']['items'] = ($cfg['compiler']['includes']['items'] || []) | $proj[:paths][:include]
# Merge defines: target-specific first, then project common defines
$cfg['compiler']['defines']['items'] ||= []
-20
View File
@@ -8,10 +8,6 @@
---
compiler:
path: clang
source_path: &systest_generated_path './system/generated/'
unit_tests_path: &unit_tests_path '../examples/test/'
mocks_path: &systest_mocks_path './system/generated/'
build_path: &systest_build_path './system/build/'
options:
- '-c'
- '-Wall'
@@ -56,15 +52,6 @@ compiler:
- '-O0'
includes:
prefix: '-I'
items:
- *systest_generated_path
- *unit_tests_path
- *systest_mocks_path
- '../src/'
- '../vendor/unity/src/'
- '../vendor/c_exception/lib/'
- './system/test_compilation/'
- './'
defines:
prefix: '-D'
items:
@@ -74,24 +61,17 @@ compiler:
object_files:
prefix: '-o'
extension: '.o'
destination: *systest_build_path
linker:
path: gcc
options:
- -lm
includes:
prefix: '-I'
object_files:
path: *systest_build_path
extension: '.o'
bin_files:
prefix: '-o'
extension: '.exe'
destination: *systest_build_path
unsupported:
- out_of_memory
- callingconv
colour: true
-20
View File
@@ -8,10 +8,6 @@
---
compiler:
path: gcc
source_path: &systest_generated_path './system/generated/'
unit_tests_path: &unit_tests_path '../examples/test/'
mocks_path: &systest_mocks_path './system/generated/'
build_path: &systest_build_path './system/build/'
options:
- '-c'
- '-Wall'
@@ -24,15 +20,6 @@ compiler:
- '-O0'
includes:
prefix: '-I'
items:
- *systest_generated_path
- *unit_tests_path
- *systest_mocks_path
- '../src/'
- '../vendor/unity/src/'
- '../vendor/c_exception/lib/'
- './system/test_compilation/'
- './'
defines:
prefix: '-D'
items:
@@ -41,25 +28,18 @@ compiler:
object_files:
prefix: '-o'
extension: '.o'
destination: *systest_build_path
linker:
path: gcc
options:
- -lm
includes:
prefix: '-I'
object_files:
path: *systest_build_path
extension: '.o'
bin_files:
prefix: '-o'
extension: '.exe'
destination: *systest_build_path
unsupported:
- out_of_memory
- unity_64bit_support
- callingconv
colour: true
-20
View File
@@ -8,10 +8,6 @@
---
compiler:
path: gcc
source_path: &systest_generated_path './system/generated/'
unit_tests_path: &unit_tests_path '../examples/test/'
mocks_path: &systest_mocks_path './system/generated/'
build_path: &systest_build_path './system/build/'
options:
- '-c'
- '-m64'
@@ -23,15 +19,6 @@ compiler:
- '-pedantic'
includes:
prefix: '-I'
items:
- *systest_generated_path
- *unit_tests_path
- *systest_mocks_path
- '../src/'
- '../vendor/unity/src/'
- '../vendor/c_exception/lib/'
- './system/test_compilation/'
- './'
defines:
prefix: '-D'
items:
@@ -41,25 +28,18 @@ compiler:
object_files:
prefix: '-o'
extension: '.o'
destination: *systest_build_path
linker:
path: gcc
options:
- -lm
- '-m64'
includes:
prefix: '-I'
object_files:
path: *systest_build_path
extension: '.o'
bin_files:
prefix: '-o'
extension: '.exe'
destination: *systest_build_path
unsupported:
- out_of_memory
- callingconv
colour: true
-20
View File
@@ -8,10 +8,6 @@
---
compiler:
path: gcc
source_path: &systest_generated_path './system/generated/'
unit_tests_path: &unit_tests_path '../examples/test/'
mocks_path: &systest_mocks_path './system/generated/'
build_path: &systest_build_path './system/build/'
options:
- '-c'
- '-Wall'
@@ -24,15 +20,6 @@ compiler:
- '-O0'
includes:
prefix: '-I'
items:
- *systest_generated_path
- *unit_tests_path
- *systest_mocks_path
- '../src/'
- '../vendor/unity/src/'
- '../vendor/c_exception/lib/'
- './system/test_compilation/'
- './'
defines:
prefix: '-D'
items:
@@ -42,21 +29,16 @@ compiler:
object_files:
prefix: '-o'
extension: '.o'
destination: *systest_build_path
linker:
path: gcc
options:
- -lm
includes:
prefix: '-I'
object_files:
path: *systest_build_path
extension: '.o'
bin_files:
prefix: '-o'
extension: '.exe'
destination: *systest_build_path
unsupported:
- all_plugins_but_other_limits
@@ -83,5 +65,3 @@ unsupported:
- unity_ignores
- callingconv
- C
colour: true
-21
View File
@@ -8,10 +8,6 @@
tools_root: &tools_root 'C:\Program Files\IAR Systems\Embedded Workbench 4.0\'
compiler:
path: [*tools_root, 'arm\bin\iccarm.exe']
source_path: &systest_generated_path './system/generated/'
unit_tests_path: &unit_tests_path '../examples/test/'
mocks_path: &systest_mocks_path './system/generated/'
build_path: &systest_build_path './system/build/'
options:
- --dlib_config
- [*tools_root, 'arm\lib\dl4tptinl8n.h']
@@ -42,14 +38,6 @@ compiler:
prefix: '-I'
items:
- [*tools_root, 'arm\inc\']
- *systest_generated_path
- *unit_tests_path
- *systest_mocks_path
- '../src/'
- '../vendor/unity/src/'
- '../vendor/c_exception/lib/'
- './system/test_compilation/'
- './'
defines:
prefix: '-D'
items:
@@ -57,7 +45,6 @@ compiler:
object_files:
prefix: '-o'
extension: '.r79'
destination: *systest_build_path
linker:
path: [*tools_root, 'common\bin\xlink.exe']
@@ -75,19 +62,13 @@ linker:
includes:
prefix: '-I'
items:
- *systest_generated_path
- *unit_tests_path
- *systest_mocks_path
- 'vendor/unity/src/'
- [*tools_root, 'arm\config\']
- [*tools_root, 'arm\lib\']
object_files:
path: *systest_build_path
extension: '.r79'
bin_files:
prefix: '-o'
extension: '.d79'
destination: *systest_build_path
simulator:
path: [*tools_root, 'common\bin\CSpyBat.exe']
@@ -113,5 +94,3 @@ unsupported:
- const
- callingconv
- unity_64bit_support
colour: true
-17
View File
@@ -8,10 +8,6 @@
tools_root: &tools_root 'C:\Program Files\IAR Systems\Embedded Workbench 5.3\'
compiler:
path: [*tools_root, 'arm\bin\iccarm.exe']
source_path: &systest_generated_path './system/generated/'
unit_tests_path: &unit_tests_path '../examples/test/'
mocks_path: &systest_mocks_path './system/generated/'
build_path: &systest_build_path './system/build/'
options:
- --dlib_config
- [*tools_root, 'arm\inc\DLib_Config_Normal.h']
@@ -40,14 +36,6 @@ compiler:
prefix: '-I'
items:
- [*tools_root, 'arm\inc\']
- *systest_generated_path
- *unit_tests_path
- *systest_mocks_path
- '../src/'
- '../vendor/unity/src/'
- '../vendor/c_exception/lib/'
- './system/test_compilation/'
- './'
- '.\iar\iar_v5\incIAR\'
defines:
prefix: '-D'
@@ -56,7 +44,6 @@ compiler:
object_files:
prefix: '-o'
extension: '.r79'
destination: *systest_build_path
linker:
path: [*tools_root, 'arm\bin\ilinkarm.exe']
@@ -67,12 +54,10 @@ linker:
- --entry __iar_program_start
- --config iar\iar_v5\Resource\at91SAM7X256_RAM.icf
object_files:
path: *systest_build_path
extension: '.o'
bin_files:
prefix: '-o'
extension: '.out'
destination: *systest_build_path
simulator:
path: [*tools_root, 'common\bin\CSpyBat.exe']
@@ -98,5 +83,3 @@ unsupported:
- const
- callingconv
- unity_64bit_support
colour: true