Skip to content

Commit c904b96

Browse files
committed
Mon Apr 29 17:23:19 UTC 2019 Chad Elliott <elliott_c@ociweb.com>
1 parent ad9d830 commit c904b96

2 files changed

Lines changed: 64 additions & 4 deletions

File tree

ChangeLog

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
1+
Mon Apr 29 17:23:19 UTC 2019 Chad Elliott <elliott_c@ociweb.com>
2+
3+
* templates/iar.mpd:
4+
5+
Added optimization options and custom build rules.
6+
17
Mon Apr 22 13:57:40 UTC 2019 Chad Elliott <elliott_c@ociweb.com>
28

39
* modules/CDT6WorkspaceCreator.pm:

templates/iar.mpd

Lines changed: 58 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,16 @@
2121
</option>
2222
<option>
2323
<name>ObjPath</name>
24+
<%if(custom_only)%>
25+
<%comment(IAR requires a project to build a library or an executable. Since)%>
26+
<%comment(this is a custom only project, we do not have the required options)%>
27+
<%comment(to correctly build the source. We must change the output directory)%>
28+
<%comment(so that when it does build the source, it does not interfere with)%>
29+
<%comment(the actual building of the source files.)%>
30+
<state>$PROJ_DIR$/<%configuration%>/custom/obj</state>
31+
<%else%>
2432
<state>$PROJ_DIR$/<%configuration%>/obj</state>
33+
<%endif%>
2534
</option>
2635
<option>
2736
<name>ListPath</name>
@@ -209,7 +218,11 @@
209218
<data>
210219
<version>35</version>
211220
<wantNonLocal>1</wantNonLocal>
212-
<debug><%debug%></debug>
221+
<debug><%debug%></debug>
222+
<option>
223+
<name>OICompilerExtraOption</name>
224+
<state>1</state>
225+
</option>
213226
<option>
214227
<name>CCOptimizationNoSizeConstraints</name>
215228
<state>0</state>
@@ -279,7 +292,7 @@
279292
<option>
280293
<name>CCAllowList</name>
281294
<version>1</version>
282-
<state>00000000</state>
295+
<state>11111110</state>
283296
</option>
284297
<option>
285298
<name>CCDebugInfo</name>
@@ -361,7 +374,7 @@
361374
</option>
362375
<option>
363376
<name>CCOptLevel</name>
364-
<state>0</state>
377+
<state>3</state>
365378
</option>
366379
<option>
367380
<name>CCOptStrategy</name>
@@ -370,7 +383,7 @@
370383
</option>
371384
<option>
372385
<name>CCOptLevelSlave</name>
373-
<state>0</state>
386+
<state>3</state>
374387
</option>
375388
<option>
376389
<name>CompilerMisraRules98</name>
@@ -1077,6 +1090,7 @@
10771090
<%endfor%>
10781091
</group>
10791092
<%endif%>
1093+
<%if(source_files)%>
10801094
<group>
10811095
<name>Source Files</name>
10821096
<%foreach(source_files)%>
@@ -1085,6 +1099,7 @@
10851099
</file>
10861100
<%endfor%>
10871101
</group>
1102+
<%endif%>
10881103
<%if(template_files)%>
10891104
<group>
10901105
<name>Template Files</name>
@@ -1095,4 +1110,43 @@
10951110
<%endfor%>
10961111
</group>
10971112
<%endif%>
1113+
<%foreach(custom_types)%>
1114+
<%if(custom_type->input_files)%>
1115+
<group>
1116+
<name><%ucw(custom_type)%></name>
1117+
<%foreach(custom_type->input_files)%>
1118+
<file>
1119+
<name>$PROJ_DIR$\<%custom_type->input_file%></name>
1120+
<%if(custom_type->input_file->output_files)%>
1121+
<%foreach(configurations)%>
1122+
<configuration>
1123+
<name><%configuration%></name>
1124+
<settings>
1125+
<name>CUSTOM</name>
1126+
<data>
1127+
<extensions><%foreach(custom_type->inputexts)%>.<%custom_type->inputext%><%fornotlast(",")%><%endfor%></extensions>
1128+
<cmdline><%if(flag_overrides(custom_type->input_file, command))%><%flag_overrides(custom_type->input_file, command)%><%else%><%custom_type->command%><%endif%> <%if(flag_overrides(custom_type->input_file, commandflags))%><%flag_overrides(custom_type->input_file, commandflags)%><%else%><%custom_type->commandflags%><%endif%> <%custom_type->input_file%><%if(custom_type->output_option)%> <%custom_type->output_option%> <%foreach(custom_type->input_file->output_files)%><%if(flag_overrides(custom_type->input_file, gendir))%><%flag_overrides(custom_type->input_file, gendir)%>\<%basename(custom_type->input_file->output_file)%><%else%><%custom_type->input_file->output_file%><%endif%><%endfor%><%endif%></cmdline>
1129+
<hasPrio>0</hasPrio>
1130+
<outputs>
1131+
<%foreach(custom_type->input_file->output_files)%>
1132+
<file>
1133+
<name><%if(flag_overrides(custom_type->input_file, gendir))%><%flag_overrides(custom_type->input_file, gendir)%>\<%basename(custom_type->input_file->output_file)%><%else%><%custom_type->input_file->output_file%><%endif%></name>
1134+
</file>
1135+
<%endfor%>
1136+
</outputs>
1137+
<inputs>
1138+
<file>
1139+
<name><%custom_type->input_file%></name>
1140+
</file>
1141+
</inputs>
1142+
</data>
1143+
</settings>
1144+
</configuration>
1145+
<%endfor%>
1146+
<%endif%>
1147+
</file>
1148+
<%endfor%>
1149+
</group>
1150+
<%endif%>
1151+
<%endfor%>
10981152
</project>

0 commit comments

Comments
 (0)