Skip to content

Commit e5de39e

Browse files
committed
Fix renaming issues in non-CI ides
Affects these ides: - Atmel Studio - Code Red (I don't think we support this) - Coide - DS-5 - E2Studio - EMblocks - KDS - Simplicity v3 - SW 4 STM32 also corrects flags usage in EMBlocks
1 parent 36c750b commit e5de39e

File tree

9 files changed

+12
-13
lines changed

9 files changed

+12
-13
lines changed

tools/export/atmelstudio.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ def generate(self):
6969
'library_paths': self.resources.lib_dirs,
7070
'linker_script': self.resources.linker_script,
7171
'libraries': libraries,
72-
'symbols': self.get_symbols(),
72+
'symbols': self.toolchain.get_symbols(),
7373
'solution_uuid': solution_uuid.upper(),
7474
'project_uuid': project_uuid.upper()
7575
}

tools/export/codered.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ def generate(self):
5353
'linker_script': self.resources.linker_script,
5454
'object_files': self.resources.objects,
5555
'libraries': libraries,
56-
'symbols': self.get_symbols()
56+
'symbols': self.toolchain.get_symbols()
5757
}
5858
ctx.update(self.flags)
5959
self.gen_file('codered_%s_project.tmpl' % self.target.lower(), ctx, '.project')

tools/export/coide.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ def generate(self):
106106
'library_paths': self.resources.lib_dirs,
107107
'object_files': self.resources.objects,
108108
'libraries': libraries,
109-
'symbols': self.get_symbols()
109+
'symbols': self.toolchain.get_symbols()
110110
}
111111
target = self.target.lower()
112112

tools/export/ds5_5.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ def generate(self):
5959
'scatter_file': self.resources.linker_script,
6060
'object_files': self.resources.objects + self.resources.libraries,
6161
'source_files': source_files,
62-
'symbols': self.get_symbols()
62+
'symbols': self.toolchain.get_symbols()
6363
}
6464
target = self.target.lower()
6565

tools/export/e2studio.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ def generate(self):
3939

4040
'object_files': self.resources.objects,
4141
'libraries': libraries,
42-
'symbols': self.get_symbols()
42+
'symbols': self.toolchain.get_symbols()
4343
}
4444
self.gen_file('e2studio_%s_project.tmpl' % self.target.lower(), ctx, '.project')
4545
self.gen_file('e2studio_%s_cproject.tmpl' % self.target.lower(), ctx, '.cproject')

tools/export/emblocks.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -68,12 +68,12 @@ def generate(self):
6868
'script_file': self.resources.linker_script,
6969
'library_paths': self.resources.lib_dirs,
7070
'libraries': libraries,
71-
'symbols': self.get_symbols(),
71+
'symbols': self.toolchain.get_symbols(),
7272
'object_files': self.resources.objects,
7373
'sys_libs': self.toolchain.sys_libs,
74-
'cc_org': self.flags['common'] + self.flags['c'],
75-
'ld_org': self.flags['common'] + self.flags['ld'],
76-
'cppc_org': self.flags['common'] + self.flags['cxx']
74+
'cc_org': self.flags['common_flags'] + self.flags['c_flags'],
75+
'ld_org': self.flags['common_flags'] + self.flags['ld_flags'],
76+
'cppc_org': self.flags['common_flags'] + self.flags['cxx_flags']
7777
}
7878

7979
# EmBlocks intermediate file template

tools/export/kds.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ def generate(self):
4040
'linker_script': self.resources.linker_script,
4141
'object_files': self.resources.objects,
4242
'libraries': libraries,
43-
'symbols': self.get_symbols()
43+
'symbols': self.toolchain.get_symbols()
4444
}
4545
self.gen_file('kds_%s_project.tmpl' % self.target.lower(), ctx, '.project')
4646
self.gen_file('kds_%s_cproject.tmpl' % self.target.lower(), ctx, '.cproject')

tools/export/simplicityv3.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,7 @@ def generate(self):
147147
libraries.append(l[3:])
148148

149149
defines = []
150-
for define in self.get_symbols():
150+
for define in self.toolchain.get_symbols():
151151
if '=' in define:
152152
keyval = define.split('=')
153153
defines.append( (keyval[0], keyval[1]) )
@@ -165,7 +165,6 @@ def generate(self):
165165
'library_paths': self.resources.lib_dirs,
166166
'linker_script': self.resources.linker_script,
167167
'libraries': libraries,
168-
'symbols': self.get_symbols(),
169168
'defines': defines,
170169
'part': self.PARTS[self.target],
171170
'kit': self.KITS[self.target],

tools/export/sw4stm32.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ def generate(self):
8484
'library_paths': self.resources.lib_dirs,
8585
'object_files': self.resources.objects,
8686
'libraries': libraries,
87-
'symbols': self.get_symbols(),
87+
'symbols': self.toolchain.get_symbols(),
8888
'board_name': self.BOARDS[self.target.upper()]['name'],
8989
'mcu_name': self.BOARDS[self.target.upper()]['mcuId'],
9090
'debug_config_uid': self.__generate_uid(),

0 commit comments

Comments
 (0)