Skip to content

Commit 540ec00

Browse files
0xc01700xc0170
committed
uvision exporter - precompiled headers, flags addition
 - all current templates updated with misc flags option - K64F - precompiled headers flag for uvision
1 parent f41d1e8 commit 540ec00

22 files changed

+37
-28
lines changed

‎workspace_tools/export/uvision4.py

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,18 +61,26 @@ class Uvision4(Exporter):
6161
'LPC11U35_501',
6262
'KL05Z',
6363
]
64-
64+
6565
FILE_TYPES = {
6666
'c_sources':'1',
6767
'cpp_sources':'8',
6868
's_sources':'2'
6969
}
70+
71+
FLAGS = [
72+
"--gnu",
73+
]
74+
7075
# By convention uVision projects do not show header files in the editor:
7176
# 'headers':'5',
7277

7378
def get_toolchain(self):
7479
return 'uARM' if (self.target in self.USING_MICROLIB) else 'ARM'
7580

81+
def get_flags(self):
82+
return self.FLAGS
83+
7684
def generate(self):
7785
source_files = {
7886
'mbed': [],
@@ -97,6 +105,7 @@ def generate(self):
97105
'source_files': source_files.items(),
98106
'symbols': self.toolchain.get_symbols(),
99107
'hex_files' : self.resources.hex_files,
108+
'flags' : self.get_flags(),
100109
}
101110
target = self.target.lower()
102111
# Project file

‎workspace_tools/export/uvision4_k20d5m.uvproj.tmpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -346,7 +346,7 @@
346346
<uThumb>0</uThumb>
347347
<uSurpInc>0</uSurpInc>
348348
<VariousControls>
349-
<MiscControls>--gnu</MiscControls>
349+
<MiscControls>{% for flag in flags %}{{flag}} {% endfor %}</MiscControls>
350350
<Define>{% for s in symbols %} {{s}}, {% endfor %}</Define>
351351
<Undefine></Undefine>
352352
<IncludePath> {% for path in include_paths %} {{path}}; {% endfor %} </IncludePath>

‎workspace_tools/export/uvision4_k64f.uvproj.tmpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -348,7 +348,7 @@
348348
<uThumb>0</uThumb>
349349
<uSurpInc>0</uSurpInc>
350350
<VariousControls>
351-
<MiscControls>--gnu</MiscControls>
351+
<MiscControls>{% for flag in flags %}{{flag}} {% endfor %} --pch --pch_dir=build</MiscControls>
352352
<Define>{% for s in symbols %} {{s}}, {% endfor %}</Define>
353353
<Undefine></Undefine>
354354
<IncludePath> {% for path in include_paths %} {{path}}; {% endfor %} </IncludePath>

‎workspace_tools/export/uvision4_kl05z.uvproj.tmpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -346,7 +346,7 @@
346346
<uThumb>0</uThumb>
347347
<uSurpInc>0</uSurpInc>
348348
<VariousControls>
349-
<MiscControls>--gnu</MiscControls>
349+
<MiscControls>{% for flag in flags %}{{flag}} {% endfor %}</MiscControls>
350350
<Define>{% for s in symbols %} {{s}}, {% endfor %}</Define>
351351
<Undefine></Undefine>
352352
<IncludePath> {% for path in include_paths %} {{path}}; {% endfor %} </IncludePath>

‎workspace_tools/export/uvision4_kl25z.uvproj.tmpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -346,7 +346,7 @@
346346
<uThumb>0</uThumb>
347347
<uSurpInc>0</uSurpInc>
348348
<VariousControls>
349-
<MiscControls>--gnu</MiscControls>
349+
<MiscControls>{% for flag in flags %}{{flag}} {% endfor %}</MiscControls>
350350
<Define>{% for s in symbols %} {{s}}, {% endfor %}</Define>
351351
<Undefine></Undefine>
352352
<IncludePath> {% for path in include_paths %} {{path}}; {% endfor %} </IncludePath>

‎workspace_tools/export/uvision4_kl46z.uvproj.tmpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -346,7 +346,7 @@
346346
<uThumb>0</uThumb>
347347
<uSurpInc>0</uSurpInc>
348348
<VariousControls>
349-
<MiscControls>--gnu</MiscControls>
349+
<MiscControls>{% for flag in flags %}{{flag}} {% endfor %}</MiscControls>
350350
<Define>{% for s in symbols %} {{s}}, {% endfor %}</Define>
351351
<Undefine></Undefine>
352352
<IncludePath> {% for path in include_paths %} {{path}}; {% endfor %} </IncludePath>

‎workspace_tools/export/uvision4_lpc1114.uvproj.tmpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -348,7 +348,7 @@
348348
<uThumb>0</uThumb>
349349
<uSurpInc>0</uSurpInc>
350350
<VariousControls>
351-
<MiscControls></MiscControls>
351+
<MiscControls>{% for flag in flags %}{{flag}} {% endfor %}</MiscControls>
352352
<Define>{% for s in symbols %} {{s}}, {% endfor %}</Define>
353353
<Undefine></Undefine>
354354
<IncludePath> {% for path in include_paths %} {{path}}; {% endfor %} </IncludePath>

‎workspace_tools/export/uvision4_lpc11c24.uvproj.tmpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -348,7 +348,7 @@
348348
<uThumb>0</uThumb>
349349
<uSurpInc>0</uSurpInc>
350350
<VariousControls>
351-
<MiscControls></MiscControls>
351+
<MiscControls>{% for flag in flags %}{{flag}} {% endfor %}</MiscControls>
352352
<Define>{% for s in symbols %} {{s}}, {% endfor %}</Define>
353353
<Undefine></Undefine>
354354
<IncludePath> {% for path in include_paths %} {{path}}; {% endfor %} </IncludePath>

‎workspace_tools/export/uvision4_lpc11u24.uvproj.tmpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -343,7 +343,7 @@
343343
<wLevel>0</wLevel>
344344
<uThumb>0</uThumb>
345345
<VariousControls>
346-
<MiscControls>--gnu</MiscControls>
346+
<MiscControls>{% for flag in flags %}{{flag}} {% endfor %}</MiscControls>
347347
<Define>{% for s in symbols %} {{s}}, {% endfor %}</Define>
348348
<Undefine></Undefine>
349349
<IncludePath> {% for path in include_paths %} {{path}}; {% endfor %} </IncludePath>

‎workspace_tools/export/uvision4_lpc1347.uvproj.tmpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -344,7 +344,7 @@
344344
<wLevel>0</wLevel>
345345
<uThumb>0</uThumb>
346346
<VariousControls>
347-
<MiscControls>--gnu</MiscControls>
347+
<MiscControls>{% for flag in flags %}{{flag}} {% endfor %}</MiscControls>
348348
<Define>{% for s in symbols %} {{s}}, {% endfor %}</Define>
349349
<Undefine></Undefine>
350350
<IncludePath> {% for path in include_paths %} {{path}}; {% endfor %} </IncludePath>

‎workspace_tools/export/uvision4_lpc1549.uvproj.tmpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -354,7 +354,7 @@
354354
<uThumb>0</uThumb>
355355
<uSurpInc>0</uSurpInc>
356356
<VariousControls>
357-
<MiscControls></MiscControls>
357+
<MiscControls>{% for flag in flags %}{{flag}} {% endfor %}</MiscControls>
358358
<Define>{% for s in symbols %} {{s}}, {% endfor %}</Define>
359359
<Undefine></Undefine>
360360
<IncludePath> {% for path in include_paths %} {{path}}; {% endfor %} </IncludePath>

‎workspace_tools/export/uvision4_lpc1768.uvproj.tmpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -345,7 +345,7 @@
345345
<uThumb>0</uThumb>
346346
<uSurpInc>0</uSurpInc>
347347
<VariousControls>
348-
<MiscControls>--gnu</MiscControls>
348+
<MiscControls>{% for flag in flags %}{{flag}} {% endfor %}</MiscControls>
349349
<Define>{% for s in symbols %} {{s}}, {% endfor %}</Define>
350350
<Undefine></Undefine>
351351
<IncludePath> {% for path in include_paths %} {{path}}; {% endfor %} </IncludePath>

‎workspace_tools/export/uvision4_lpc4088.uvproj.tmpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -347,7 +347,7 @@
347347
<uThumb>0</uThumb>
348348
<uSurpInc>0</uSurpInc>
349349
<VariousControls>
350-
<MiscControls>--gnu</MiscControls>
350+
<MiscControls>{% for flag in flags %}{{flag}} {% endfor %}</MiscControls>
351351
<Define>{% for s in symbols %} {{s}}, {% endfor %}</Define>
352352
<Undefine></Undefine>
353353
<IncludePath> {% for path in include_paths %} {{path}}; {% endfor %} </IncludePath>

‎workspace_tools/export/uvision4_lpc812.uvproj.tmpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -348,7 +348,7 @@
348348
<uThumb>0</uThumb>
349349
<uSurpInc>0</uSurpInc>
350350
<VariousControls>
351-
<MiscControls>--gnu</MiscControls>
351+
<MiscControls>{% for flag in flags %}{{flag}} {% endfor %}</MiscControls>
352352
<Define>{% for s in symbols %} {{s}}, {% endfor %}</Define>
353353
<Undefine></Undefine>
354354
<IncludePath> {% for path in include_paths %} {{path}}; {% endfor %} </IncludePath>

‎workspace_tools/export/uvision4_nrf51822.uvproj.tmpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -353,7 +353,7 @@
353353
<uThumb>0</uThumb>
354354
<uSurpInc>0</uSurpInc>
355355
<VariousControls>
356-
<MiscControls>--gnu</MiscControls>
356+
<MiscControls>{% for flag in flags %}{{flag}} {% endfor %}</MiscControls>
357357
<Define>{% for s in symbols %} {{s}}, {% endfor %}</Define>
358358
<Undefine></Undefine>
359359
<IncludePath> {% for path in include_paths %} {{path}}; {% endfor %} </IncludePath>

‎workspace_tools/export/uvision4_nucleo_f030r8.uvproj.tmpl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -354,7 +354,7 @@
354354
<uThumb>0</uThumb>
355355
<uSurpInc>0</uSurpInc>
356356
<VariousControls>
357-
<MiscControls>--gnu</MiscControls>
357+
<MiscControls>{% for flag in flags %}{{flag}} {% endfor %}</MiscControls>
358358
<Define>{% for s in symbols %} {{s}}, {% endfor %}</Define>
359359
<Undefine></Undefine>
360360
<IncludePath> {% for path in include_paths %} {{path}}; {% endfor %} </IncludePath>
@@ -399,7 +399,7 @@
399399
</TargetArmAds>
400400
</TargetOption>
401401
<Groups>
402-
{% for group,files in source_files %}
402+
{% for group,files in source_files %}
403403
<Group>
404404
<GroupName>{{group}}</GroupName>
405405
<Files>

‎workspace_tools/export/uvision4_nucleo_f103rb.uvproj.tmpl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -354,7 +354,7 @@
354354
<uThumb>0</uThumb>
355355
<uSurpInc>0</uSurpInc>
356356
<VariousControls>
357-
<MiscControls>--gnu</MiscControls>
357+
<MiscControls>{% for flag in flags %}{{flag}} {% endfor %}</MiscControls>
358358
<Define>{% for s in symbols %} {{s}}, {% endfor %}</Define>
359359
<Undefine></Undefine>
360360
<IncludePath> {% for path in include_paths %} {{path}}; {% endfor %} </IncludePath>
@@ -399,7 +399,7 @@
399399
</TargetArmAds>
400400
</TargetOption>
401401
<Groups>
402-
{% for group,files in source_files %}
402+
{% for group,files in source_files %}
403403
<Group>
404404
<GroupName>{{group}}</GroupName>
405405
<Files>

‎workspace_tools/export/uvision4_nucleo_f302r8.uvproj.tmpl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -354,7 +354,7 @@
354354
<uThumb>0</uThumb>
355355
<uSurpInc>0</uSurpInc>
356356
<VariousControls>
357-
<MiscControls>--gnu</MiscControls>
357+
<MiscControls>{% for flag in flags %}{{flag}} {% endfor %}</MiscControls>
358358
<Define>{% for s in symbols %} {{s}}, {% endfor %}</Define>
359359
<Undefine></Undefine>
360360
<IncludePath> {% for path in include_paths %} {{path}}; {% endfor %} </IncludePath>
@@ -399,7 +399,7 @@
399399
</TargetArmAds>
400400
</TargetOption>
401401
<Groups>
402-
{% for group,files in source_files %}
402+
{% for group,files in source_files %}
403403
<Group>
404404
<GroupName>{{group}}</GroupName>
405405
<Files>

‎workspace_tools/export/uvision4_nucleo_f401re.uvproj.tmpl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -354,7 +354,7 @@
354354
<uThumb>0</uThumb>
355355
<uSurpInc>0</uSurpInc>
356356
<VariousControls>
357-
<MiscControls>--gnu</MiscControls>
357+
<MiscControls>{% for flag in flags %}{{flag}} {% endfor %}</MiscControls>
358358
<Define>{% for s in symbols %} {{s}}, {% endfor %}</Define>
359359
<Undefine></Undefine>
360360
<IncludePath> {% for path in include_paths %} {{path}}; {% endfor %} </IncludePath>
@@ -399,7 +399,7 @@
399399
</TargetArmAds>
400400
</TargetOption>
401401
<Groups>
402-
{% for group,files in source_files %}
402+
{% for group,files in source_files %}
403403
<Group>
404404
<GroupName>{{group}}</GroupName>
405405
<Files>

‎workspace_tools/export/uvision4_nucleo_l053r8.uvproj.tmpl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -354,7 +354,7 @@
354354
<uThumb>0</uThumb>
355355
<uSurpInc>0</uSurpInc>
356356
<VariousControls>
357-
<MiscControls>--gnu</MiscControls>
357+
<MiscControls>{% for flag in flags %}{{flag}} {% endfor %}</MiscControls>
358358
<Define>{% for s in symbols %} {{s}}, {% endfor %}</Define>
359359
<Undefine></Undefine>
360360
<IncludePath> {% for path in include_paths %} {{path}}; {% endfor %} </IncludePath>
@@ -399,7 +399,7 @@
399399
</TargetArmAds>
400400
</TargetOption>
401401
<Groups>
402-
{% for group,files in source_files %}
402+
{% for group,files in source_files %}
403403
<Group>
404404
<GroupName>{{group}}</GroupName>
405405
<Files>

‎workspace_tools/export/uvision4_nucleo_l152re.uvproj.tmpl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -354,7 +354,7 @@
354354
<uThumb>0</uThumb>
355355
<uSurpInc>0</uSurpInc>
356356
<VariousControls>
357-
<MiscControls>--gnu</MiscControls>
357+
<MiscControls>{% for flag in flags %}{{flag}} {% endfor %}</MiscControls>
358358
<Define>{% for s in symbols %} {{s}}, {% endfor %}</Define>
359359
<Undefine></Undefine>
360360
<IncludePath> {% for path in include_paths %} {{path}}; {% endfor %} </IncludePath>
@@ -399,7 +399,7 @@
399399
</TargetArmAds>
400400
</TargetOption>
401401
<Groups>
402-
{% for group,files in source_files %}
402+
{% for group,files in source_files %}
403403
<Group>
404404
<GroupName>{{group}}</GroupName>
405405
<Files>

‎workspace_tools/export/uvision4_ublox_c027.uvproj.tmpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -345,7 +345,7 @@
345345
<uThumb>0</uThumb>
346346
<uSurpInc>0</uSurpInc>
347347
<VariousControls>
348-
<MiscControls>--gnu</MiscControls>
348+
<MiscControls>{% for flag in flags %}{{flag}} {% endfor %}</MiscControls>
349349
<Define>{% for s in symbols %} {{s}}, {% endfor %}</Define>
350350
<Undefine></Undefine>
351351
<IncludePath> {% for path in include_paths %} {{path}}; {% endfor %} </IncludePath>

0 commit comments

Comments
 (0)