From b7564ce8a0d7d37c68a91cc2d63add881fd8f4d3 Mon Sep 17 00:00:00 2001 From: mvandervoord Date: Sun, 19 Sep 2010 01:07:58 +0000 Subject: [PATCH] - reduced target file redundancies in Unity - fixed broken gcc makefile git-svn-id: http://unity.svn.sourceforge.net/svnroot/unity/trunk@95 e7d17a6e-8845-0410-bbbc-c8efb4fdad7e --- examples/gcc.yml | 33 --------------- examples/iar_v4.yml | 83 ------------------------------------- examples/iar_v5.yml | 72 -------------------------------- examples/rakefile_helper.rb | 2 +- makefile | 2 +- targets/gcc.yml | 1 + targets/gcc_64.yml | 1 + targets/iar_arm_v4.yml | 1 + targets/iar_arm_v5.yml | 1 + targets/iar_cortexm3_v5.yml | 1 + targets/iar_msp430.yml | 1 + 11 files changed, 8 insertions(+), 190 deletions(-) delete mode 100644 examples/gcc.yml delete mode 100644 examples/iar_v4.yml delete mode 100644 examples/iar_v5.yml diff --git a/examples/gcc.yml b/examples/gcc.yml deleted file mode 100644 index 2a14dcc..0000000 --- a/examples/gcc.yml +++ /dev/null @@ -1,33 +0,0 @@ -compiler: - path: gcc - source_path: 'src/' - unit_tests_path: &unit_tests_path 'test/' - build_path: &build_path 'build/' - options: - - -c - includes: - prefix: '-I' - items: - - 'src/' - - '../src/' - - *unit_tests_path - defines: - prefix: '-D' - items: - object_files: - prefix: '-o' - extension: '.o' - destination: *build_path -linker: - path: gcc - options: - - -lm - includes: - prefix: '-I' - object_files: - path: *build_path - extension: '.o' - bin_files: - prefix: '-o' - extension: '.exe' - destination: *build_path \ No newline at end of file diff --git a/examples/iar_v4.yml b/examples/iar_v4.yml deleted file mode 100644 index 2b28bd0..0000000 --- a/examples/iar_v4.yml +++ /dev/null @@ -1,83 +0,0 @@ -tools_root: &tools_root 'C:\Program Files\IAR Systems\Embedded Workbench 4.0 Kickstart\' -compiler: - path: [*tools_root, 'arm\bin\iccarm.exe'] - source_path: 'src\' - unit_tests_path: &unit_tests_path 'test\' - build_path: &build_path 'build\' - options: - - --dlib_config - - [*tools_root, 'arm\lib\dl4tptinl8n.h'] - - -z3 - - --no_cse - - --no_unroll - - --no_inline - - --no_code_motion - - --no_tbaa - - --no_clustering - - --no_scheduling - - --debug - - --cpu_mode thumb - - --endian little - - --cpu ARM7TDMI - - --stack_align 4 - - --interwork - - -e - - --silent - - --warnings_are_errors - - --fpu None - - --diag_suppress Pa050 - includes: - prefix: '-I' - items: - - [*tools_root, 'arm\inc\'] - - 'src\' - - '../src/' - - *unit_tests_path - defines: - prefix: '-D' - items: - object_files: - prefix: '-o' - extension: '.r79' - destination: *build_path -linker: - path: [*tools_root, 'common\bin\xlink.exe'] - options: - - -rt - - [*tools_root, 'arm\lib\dl4tptinl8n.r79'] - - -D_L_EXTMEM_START=0 - - -D_L_EXTMEM_SIZE=0 - - -D_L_HEAP_SIZE=120 - - -D_L_STACK_SIZE=32 - - -e_small_write=_formatted_write - - -s - - __program_start - - -f - - [*tools_root, '\arm\config\lnkarm.xcl'] - includes: - prefix: '-I' - items: - - [*tools_root, 'arm\config\'] - - [*tools_root, 'arm\lib\'] - object_files: - path: *build_path - extension: '.r79' - bin_files: - prefix: '-o' - extension: '.d79' - destination: *build_path -simulator: - path: [*tools_root, 'common\bin\CSpyBat.exe'] - pre_support: - - --silent - - [*tools_root, 'arm\bin\armproc.dll'] - - [*tools_root, 'arm\bin\armsim.dll'] - post_support: - - --plugin - - [*tools_root, 'arm\bin\armbat.dll'] - - --backend - - -B - - -p - - [*tools_root, 'arm\config\ioat91sam7X256.ddf'] - - -d - - sim \ No newline at end of file diff --git a/examples/iar_v5.yml b/examples/iar_v5.yml deleted file mode 100644 index b7cd3ff..0000000 --- a/examples/iar_v5.yml +++ /dev/null @@ -1,72 +0,0 @@ -tools_root: &tools_root 'C:\Program Files\IAR Systems\Embedded Workbench 5.0 Kickstart\' -compiler: - path: [*tools_root, 'arm\bin\iccarm.exe'] - source_path: 'src\' - unit_tests_path: &unit_tests_path 'test\' - build_path: &build_path 'build\' - options: - - --dlib_config - - [*tools_root, 'arm\inc\DLib_Config_Normal.h'] - - --no_cse - - --no_unroll - - --no_inline - - --no_code_motion - - --no_tbaa - - --no_clustering - - --no_scheduling - - --debug - - --cpu_mode thumb - - --endian=little - - --cpu=ARM7TDMI - - --interwork - - --warnings_are_errors - - --fpu=None - - --diag_suppress=Pa050 - - --diag_suppress=Pe111 - - -e - - -On - includes: - prefix: '-I' - items: - - [*tools_root, 'arm\inc\'] - - 'src\' - - '../src/' - - *unit_tests_path - defines: - prefix: '-D' - items: - object_files: - prefix: '-o' - extension: '.r79' - destination: *build_path -linker: - path: [*tools_root, 'arm\bin\ilinkarm.exe'] - options: - - --redirect _Printf=_PrintfLarge - - --redirect _Scanf=_ScanfSmall - - --semihosting - - --entry __iar_program_start - - --config - - [*tools_root, 'arm\config\generic.icf'] - object_files: - path: *build_path - extension: '.o' - bin_files: - prefix: '-o' - extension: '.out' - destination: *build_path -simulator: - path: [*tools_root, 'common\bin\CSpyBat.exe'] - pre_support: - - --silent - - [*tools_root, 'arm\bin\armproc.dll'] - - [*tools_root, 'arm\bin\armsim.dll'] - post_support: - - --plugin - - [*tools_root, 'arm\bin\armbat.dll'] - - --backend - - -B - - -p - - [*tools_root, 'arm\config\debugger\atmel\ioat91sam7X256.ddf'] - - -d - - sim \ No newline at end of file diff --git a/examples/rakefile_helper.rb b/examples/rakefile_helper.rb index 4d2fb29..cbf11c8 100644 --- a/examples/rakefile_helper.rb +++ b/examples/rakefile_helper.rb @@ -19,7 +19,7 @@ module RakefileHelpers def configure_toolchain(config_file=DEFAULT_CONFIG_FILE) config_file += '.yml' unless config_file =~ /\.yml$/ - load_configuration(config_file) + load_configuration('../targets/'+config_file) configure_clean end diff --git a/makefile b/makefile index 20d4c36..58ead54 100644 --- a/makefile +++ b/makefile @@ -15,7 +15,7 @@ TARGET = $(TARGET_BASE)$(TARGET_EXTENSION) OUT_FILE=-o $(TARGET) SRC_FILES=src/unity.c test/testunity.c build/testunity_Runner.c INC_DIRS=-Isrc -SYMBOLS=-DTEST +SYMBOLS=-DTEST -DUNITY_SUPPORT_64 ifeq ($(OS),Windows_NT) CLEANUP = del /F /Q build\* && del /F /Q $(TARGET) diff --git a/targets/gcc.yml b/targets/gcc.yml index 9c42012..c75f60e 100644 --- a/targets/gcc.yml +++ b/targets/gcc.yml @@ -12,6 +12,7 @@ compiler: prefix: '-I' items: - 'src/' + - '../src/' - *unit_tests_path defines: prefix: '-D' diff --git a/targets/gcc_64.yml b/targets/gcc_64.yml index 6250e7f..cbf25f4 100644 --- a/targets/gcc_64.yml +++ b/targets/gcc_64.yml @@ -12,6 +12,7 @@ compiler: prefix: '-I' items: - 'src/' + - '../src/' - *unit_tests_path defines: prefix: '-D' diff --git a/targets/iar_arm_v4.yml b/targets/iar_arm_v4.yml index 081d598..1f22ce2 100644 --- a/targets/iar_arm_v4.yml +++ b/targets/iar_arm_v4.yml @@ -31,6 +31,7 @@ compiler: items: - [*tools_root, 'arm\inc\'] - 'src\' + - '../src/' - *unit_tests_path - 'vendor\unity\src\' defines: diff --git a/targets/iar_arm_v5.yml b/targets/iar_arm_v5.yml index b2ef40c..54a1dea 100644 --- a/targets/iar_arm_v5.yml +++ b/targets/iar_arm_v5.yml @@ -30,6 +30,7 @@ compiler: items: - [*tools_root, 'arm\inc\'] - 'src\' + - '../src/' - *unit_tests_path - 'vendor\unity\src\' - 'iar\iar_v5\incIAR\' diff --git a/targets/iar_cortexm3_v5.yml b/targets/iar_cortexm3_v5.yml index 8af024d..240c3ab 100644 --- a/targets/iar_cortexm3_v5.yml +++ b/targets/iar_cortexm3_v5.yml @@ -32,6 +32,7 @@ compiler: items: - [*tools_root, 'arm\inc\'] - 'src\' + - '../src/' - *unit_tests_path - 'vendor\unity\src\' - 'iar\iar_v5\incIAR\' diff --git a/targets/iar_msp430.yml b/targets/iar_msp430.yml index 1912f3d..f41064d 100644 --- a/targets/iar_msp430.yml +++ b/targets/iar_msp430.yml @@ -33,6 +33,7 @@ compiler: - [*core_inc, 'dlib'] - [*core_lib, 'dlib'] - 'src\' + - '../src/' - *unit_tests_path - 'vendor\unity\src' defines: