summaryrefslogtreecommitdiff
path: root/templates
diff options
context:
space:
mode:
authorChad Elliott <elliottc@objectcomputing.com>2019-05-17 09:45:55 -0500
committerChad Elliott <elliottc@objectcomputing.com>2019-05-17 09:45:55 -0500
commitd07b201048ef6556e64da7ff0c4d3e3e70f23359 (patch)
tree09aaca155c44795d301055707c278fe257fae5fe /templates
parent8c0ffa80ca129b431329b9d4a1ce7979dad9dfdc (diff)
downloadMPC-d07b201048ef6556e64da7ff0c4d3e3e70f23359.tar.gz
Fri May 17 14:42:45 UTC 2019 Chad Elliott <elliott_c@ociweb.com>
* modules/Creator.pm: * modules/IARProjectCreator.pm: * modules/IARWorkspaceCreator.pm: If a project type requires relative paths, locate a relative path when replacing $() variables if at all possible. * modules/ProjectCreator.pm: * modules/TemplateParser.pm: * templates/iar.mpd: A new template function, 'extension', can be used to get the extension of a file. Additionally, non-template files can now be obtained through the custom input file interface.
Diffstat (limited to 'templates')
-rw-r--r--templates/iar.mpd6
1 files changed, 3 insertions, 3 deletions
diff --git a/templates/iar.mpd b/templates/iar.mpd
index e5319332..568917dc 100644
--- a/templates/iar.mpd
+++ b/templates/iar.mpd
@@ -1135,13 +1135,13 @@
<settings>
<name>CUSTOM</name>
<data>
- <extensions><%foreach(custom_type->inputexts)%>.<%custom_type->inputext%><%fornotlast(",")%><%endfor%></extensions>
+ <extensions><%extension(custom_type->input_file)%><%foreach(custom_type->inputexts)%> .<%custom_type->inputext%><%endfor%></extensions>
<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>
<hasPrio>0</hasPrio>
<outputs>
-<%foreach(custom_type->input_file->output_files)%>
+<%foreach(custom_type->input_file->non_template_output_files)%>
<file>
- <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>
+ <name><%if(flag_overrides(custom_type->input_file, gendir))%><%flag_overrides(custom_type->input_file, gendir)%>\<%basename(custom_type->input_file->non_template_output_file)%><%else%><%custom_type->input_file->non_template_output_file%><%endif%></name>
</file>
<%endfor%>
</outputs>