Skip to content

Commit 08f7495

Browse files
omdathetkanomdathetkan
committed
Add missing --c99 flag to uVision LPC11U24 and LPC1347 projects
Fix indentation in other templates
1 parent c164d0b commit 08f7495

7 files changed

+129
-121
lines changed

‎workspace_tools/export/uvision4_kl25z.uvproj.tmpl

Lines changed: 19 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -382,7 +382,7 @@
382382
<IncludeLibsPath></IncludeLibsPath>
383383
<Misc>
384384
{% for file in object_files %}
385-
{{file}}
385+
{{file}}
386386
{% endfor %}
387387
</Misc>
388388
<LinkerInputFile></LinkerInputFile>
@@ -394,25 +394,24 @@
394394
<Group>
395395
<GroupName>src</GroupName>
396396
<Files>
397-
{% for file in source_files %}
398-
<File>
399-
<FileName>{{file.name}}</FileName>
400-
<FileType>{{file.type}}</FileType>
401-
<FilePath>{{file.path}}</FilePath>
402-
{%if file.type == "1" %}
403-
<FileOption>
404-
<FileArmAds>
405-
<Cads>
406-
<VariousControls>
407-
<MiscControls>--c99</MiscControls>
408-
</VariousControls>
409-
</Cads>
410-
</FileArmAds>
411-
</FileOption>
412-
{% endif %}
413-
</File>
414-
{% endfor %}
415-
397+
{% for file in source_files %}
398+
<File>
399+
<FileName>{{file.name}}</FileName>
400+
<FileType>{{file.type}}</FileType>
401+
<FilePath>{{file.path}}</FilePath>
402+
{%if file.type == "1" %}
403+
<FileOption>
404+
<FileArmAds>
405+
<Cads>
406+
<VariousControls>
407+
<MiscControls>--c99</MiscControls>
408+
</VariousControls>
409+
</Cads>
410+
</FileArmAds>
411+
</FileOption>
412+
{% endif %}
413+
</File>
414+
{% endfor %}
416415
</Files>
417416
</Group>
418417
</Groups>

‎workspace_tools/export/uvision4_lpc1114.uvproj.tmpl

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -383,9 +383,9 @@
383383
<IncludeLibs></IncludeLibs>
384384
<IncludeLibsPath></IncludeLibsPath>
385385
<Misc>
386-
{% for file in object_files %}
386+
{% for file in object_files %}
387387
{{file}}
388-
{% endfor %}
388+
{% endfor %}
389389
</Misc>
390390
<LinkerInputFile></LinkerInputFile>
391391
<DisabledWarnings></DisabledWarnings>
@@ -396,24 +396,24 @@
396396
<Group>
397397
<GroupName>src</GroupName>
398398
<Files>
399-
{% for file in source_files %}
399+
{% for file in source_files %}
400400
<File>
401401
<FileName>{{file.name}}</FileName>
402402
<FileType>{{file.type}}</FileType>
403403
<FilePath>{{file.path}}</FilePath>
404404
{%if file.type == "1" %}
405405
<FileOption>
406-
<FileArmAds>
407-
<Cads>
408-
<VariousControls>
409-
<MiscControls>--c99</MiscControls>
410-
</VariousControls>
411-
</Cads>
412-
</FileArmAds>
406+
<FileArmAds>
407+
<Cads>
408+
<VariousControls>
409+
<MiscControls>--c99</MiscControls>
410+
</VariousControls>
411+
</Cads>
412+
</FileArmAds>
413413
</FileOption>
414414
{% endif %}
415415
</File>
416-
{% endfor %}
416+
{% endfor %}
417417
</Files>
418418
</Group>
419419
</Groups>

‎workspace_tools/export/uvision4_lpc11u24.uvproj.tmpl

Lines changed: 19 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -378,7 +378,7 @@
378378
<IncludeLibsPath></IncludeLibsPath>
379379
<Misc>
380380
{% for file in object_files %}
381-
{{file}}
381+
{{file}}
382382
{% endfor %}
383383
</Misc>
384384
<LinkerInputFile></LinkerInputFile>
@@ -390,20 +390,28 @@
390390
<Group>
391391
<GroupName>src</GroupName>
392392
<Files>
393-
{% for file in source_files %}
394-
<File>
395-
<FileName>{{file.name}}</FileName>
396-
<FileType>{{file.type}}</FileType>
397-
<FilePath>{{file.path}}</FilePath>
398-
</File>
399-
{% endfor %}
400-
393+
{% for file in source_files %}
394+
<File>
395+
<FileName>{{file.name}}</FileName>
396+
<FileType>{{file.type}}</FileType>
397+
<FilePath>{{file.path}}</FilePath>
398+
{%if file.type == "1" %}
399+
<FileOption>
400+
<FileArmAds>
401+
<Cads>
402+
<VariousControls>
403+
<MiscControls>--c99</MiscControls>
404+
</VariousControls>
405+
</Cads>
406+
</FileArmAds>
407+
</FileOption>
408+
{% endif %}
409+
</File>
410+
{% endfor %}
401411
</Files>
402412
</Group>
403413
</Groups>
404414
</Target>
405415
</Targets>
406416

407417
</Project>
408-
409-

‎workspace_tools/export/uvision4_lpc1347.uvproj.tmpl

Lines changed: 19 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -379,7 +379,7 @@
379379
<IncludeLibsPath></IncludeLibsPath>
380380
<Misc>
381381
{% for file in object_files %}
382-
{{file}}
382+
{{file}}
383383
{% endfor %}
384384
</Misc>
385385
<LinkerInputFile></LinkerInputFile>
@@ -391,20 +391,28 @@
391391
<Group>
392392
<GroupName>src</GroupName>
393393
<Files>
394-
{% for file in source_files %}
395-
<File>
396-
<FileName>{{file.name}}</FileName>
397-
<FileType>{{file.type}}</FileType>
398-
<FilePath>{{file.path}}</FilePath>
399-
</File>
400-
{% endfor %}
401-
394+
{% for file in source_files %}
395+
<File>
396+
<FileName>{{file.name}}</FileName>
397+
<FileType>{{file.type}}</FileType>
398+
<FilePath>{{file.path}}</FilePath>
399+
{%if file.type == "1" %}
400+
<FileOption>
401+
<FileArmAds>
402+
<Cads>
403+
<VariousControls>
404+
<MiscControls>--c99</MiscControls>
405+
</VariousControls>
406+
</Cads>
407+
</FileArmAds>
408+
</FileOption>
409+
{% endif %}
410+
</File>
411+
{% endfor %}
402412
</Files>
403413
</Group>
404414
</Groups>
405415
</Target>
406416
</Targets>
407417

408418
</Project>
409-
410-

‎workspace_tools/export/uvision4_lpc1768.uvproj.tmpl

Lines changed: 21 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -380,11 +380,9 @@
380380
<IncludeLibs></IncludeLibs>
381381
<IncludeLibsPath></IncludeLibsPath>
382382
<Misc>
383-
384-
{% for file in object_files %}
385-
{{file}}
386-
{% endfor %}
387-
383+
{% for file in object_files %}
384+
{{file}}
385+
{% endfor %}
388386
</Misc>
389387
<LinkerInputFile></LinkerInputFile>
390388
<DisabledWarnings></DisabledWarnings>
@@ -395,29 +393,28 @@
395393
<Group>
396394
<GroupName>src</GroupName>
397395
<Files>
398-
{% for file in source_files %}
399-
<File>
400-
<FileName>{{file.name}}</FileName>
401-
<FileType>{{file.type}}</FileType>
402-
<FilePath>{{file.path}}</FilePath>
403-
{%if file.type == "1" %}
404-
<FileOption>
405-
<FileArmAds>
406-
<Cads>
407-
<VariousControls>
408-
<MiscControls>--c99</MiscControls>
409-
</VariousControls>
410-
</Cads>
411-
</FileArmAds>
412-
</FileOption>
413-
{% endif %}
414-
</File>
415-
{% endfor %}
396+
{% for file in source_files %}
397+
<File>
398+
<FileName>{{file.name}}</FileName>
399+
<FileType>{{file.type}}</FileType>
400+
<FilePath>{{file.path}}</FilePath>
401+
{%if file.type == "1" %}
402+
<FileOption>
403+
<FileArmAds>
404+
<Cads>
405+
<VariousControls>
406+
<MiscControls>--c99</MiscControls>
407+
</VariousControls>
408+
</Cads>
409+
</FileArmAds>
410+
</FileOption>
411+
{% endif %}
412+
</File>
413+
{% endfor %}
416414
</Files>
417415
</Group>
418416
</Groups>
419417
</Target>
420418
</Targets>
421419

422420
</Project>
423-

‎workspace_tools/export/uvision4_lpc4088.uvproj.tmpl

Lines changed: 21 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -382,11 +382,9 @@
382382
<IncludeLibs></IncludeLibs>
383383
<IncludeLibsPath></IncludeLibsPath>
384384
<Misc>
385-
386-
{% for file in object_files %}
387-
{{file}}
388-
{% endfor %}
389-
385+
{% for file in object_files %}
386+
{{file}}
387+
{% endfor %}
390388
</Misc>
391389
<LinkerInputFile></LinkerInputFile>
392390
<DisabledWarnings></DisabledWarnings>
@@ -397,29 +395,28 @@
397395
<Group>
398396
<GroupName>src</GroupName>
399397
<Files>
400-
{% for file in source_files %}
401-
<File>
402-
<FileName>{{file.name}}</FileName>
403-
<FileType>{{file.type}}</FileType>
404-
<FilePath>{{file.path}}</FilePath>
405-
{%if file.type == "1" %}
406-
<FileOption>
407-
<FileArmAds>
408-
<Cads>
409-
<VariousControls>
410-
<MiscControls>--c99</MiscControls>
411-
</VariousControls>
412-
</Cads>
413-
</FileArmAds>
414-
</FileOption>
415-
{% endif %}
416-
</File>
417-
{% endfor %}
398+
{% for file in source_files %}
399+
<File>
400+
<FileName>{{file.name}}</FileName>
401+
<FileType>{{file.type}}</FileType>
402+
<FilePath>{{file.path}}</FilePath>
403+
{%if file.type == "1" %}
404+
<FileOption>
405+
<FileArmAds>
406+
<Cads>
407+
<VariousControls>
408+
<MiscControls>--c99</MiscControls>
409+
</VariousControls>
410+
</Cads>
411+
</FileArmAds>
412+
</FileOption>
413+
{% endif %}
414+
</File>
415+
{% endfor %}
418416
</Files>
419417
</Group>
420418
</Groups>
421419
</Target>
422420
</Targets>
423421

424422
</Project>
425-

‎workspace_tools/export/uvision4_lpc812.uvproj.tmpl

Lines changed: 19 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -384,7 +384,7 @@
384384
<IncludeLibsPath></IncludeLibsPath>
385385
<Misc>
386386
{% for file in object_files %}
387-
{{file}}
387+
{{file}}
388388
{% endfor %}
389389
</Misc>
390390
<LinkerInputFile></LinkerInputFile>
@@ -396,25 +396,24 @@
396396
<Group>
397397
<GroupName>src</GroupName>
398398
<Files>
399-
{% for file in source_files %}
400-
<File>
401-
<FileName>{{file.name}}</FileName>
402-
<FileType>{{file.type}}</FileType>
403-
<FilePath>{{file.path}}</FilePath>
404-
{%if file.type == "1" %}
405-
<FileOption>
406-
<FileArmAds>
407-
<Cads>
408-
<VariousControls>
409-
<MiscControls>--c99</MiscControls>
410-
</VariousControls>
411-
</Cads>
412-
</FileArmAds>
413-
</FileOption>
414-
{% endif %}
415-
</File>
416-
{% endfor %}
417-
399+
{% for file in source_files %}
400+
<File>
401+
<FileName>{{file.name}}</FileName>
402+
<FileType>{{file.type}}</FileType>
403+
<FilePath>{{file.path}}</FilePath>
404+
{%if file.type == "1" %}
405+
<FileOption>
406+
<FileArmAds>
407+
<Cads>
408+
<VariousControls>
409+
<MiscControls>--c99</MiscControls>
410+
</VariousControls>
411+
</Cads>
412+
</FileArmAds>
413+
</FileOption>
414+
{% endif %}
415+
</File>
416+
{% endfor %}
418417
</Files>
419418
</Group>
420419
</Groups>

0 commit comments

Comments
 (0)