ThrowTheSwitch/CMock
1
0
Fork 0
mirror of https://github.com/ThrowTheSwitch/CMock.git synced 2026-06-05 21:15:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

- avoid naming collision with latest versions of Rake

Browse Source 
git-svn-id: http://cmock.svn.sourceforge.net/svnroot/cmock/trunk@215 bf332499-1b4d-0410-844d-d2d48d5cc64c
This commit is contained in:
mvandervoord
2011-10-11 02:42:02 +00:00
parent d5b1812e2f
commit 5f1521a8af
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
examples/rakefile_helper.rb
+3 -3
View File
@@ -114,7 +114,7 @@ module RakefileHelpers
return {:command => command, :options => options, :includes => includes}
end
def link(exe_name, obj_list)
def link_it(exe_name, obj_list)
linker = build_linker_fields
cmd_str = "#{linker[:command]}#{linker[:options]}#{linker[:includes]} " +
(obj_list.map{|obj|"#{$cfg['linker']['object_files']['path']}#{obj} "}).join +
@@ -223,7 +223,7 @@ module RakefileHelpers
obj_list << test_base.ext($cfg['compiler']['object_files']['extension'])
# Link the test executable
link(test_base, obj_list)
link_it(test_base, obj_list)
# Execute unit test and generate results file
simulator = build_simulator_fields
@@ -268,7 +268,7 @@ module RakefileHelpers
obj_list << main_base.ext($cfg['compiler']['object_files']['extension'])
# Create the executable
link(main_base, obj_list)
link_it(main_base, obj_list)
end
end
rakefile_helper.rb
+3 -3
View File
@@ -106,7 +106,7 @@ module RakefileHelpers
return {:command => command, :options => options, :includes => includes}
end
def link(exe_name, obj_list)
def link_it(exe_name, obj_list)
linker = build_linker_fields
cmd_str = "#{linker[:command]}#{linker[:options]}#{linker[:includes]} " +
(obj_list.map{|obj|"#{$cfg['linker']['object_files']['path']}#{obj} "}).uniq.join +
@@ -220,7 +220,7 @@ module RakefileHelpers
obj_list << test_base.ext($cfg['compiler']['object_files']['extension'])
# Link the test executable
link(test_base, obj_list)
link_it(test_base, obj_list)
# Execute unit test and generate results file
simulator = build_simulator_fields
@@ -361,7 +361,7 @@ module RakefileHelpers
report "(#{test[:options].join(', ')})"
test[:files].each { |f| compile(f, test[:options]) }
obj_files = test[:files].map { |f| f.gsub!(/.*\//,'').gsub!(C_EXTENSION, $cfg['compiler']['object_files']['extension']) }
link('TestCMockC', obj_files)
link_it('TestCMockC', obj_files)
if $cfg['simulator'].nil?
execute($cfg['linker']['bin_files']['destination'] + 'TestCMockC' + $cfg['linker']['bin_files']['extension'])
else