Skip to content

Commit f8bd7a3

Browse files
0xc01700xc0170
committed
Merge pull request #951 from GustavWi/iar_mbed
IAR folder structure in project when exporting.
2 parents 9ffb355 + 2e97c1e commit f8bd7a3

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

45 files changed

+115
-221
lines changed

‎workspace_tools/export/iar.py

Lines changed: 72 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
limitations under the License.
1616
"""
1717
from exporters import Exporter
18-
18+
import re
1919

2020
class IAREmbeddedWorkbench(Exporter):
2121
NAME = 'IAR'
@@ -69,24 +69,90 @@ class IAREmbeddedWorkbench(Exporter):
6969
]
7070

7171
def generate(self):
72-
7372
sources = []
7473
sources += self.resources.c_sources
7574
sources += self.resources.cpp_sources
7675
sources += self.resources.s_sources
77-
# binaries = ""
78-
# if resources.bin_files is not None:
79-
# binaries = resources.bin_files
76+
77+
iar_files = IAR_FOLDER("","",[])
78+
for source in sources:
79+
iar_files.insert_file(source)
80+
8081
ctx = {
8182
'name': self.program_name,
8283
'include_paths': self.resources.inc_dirs,
8384
'linker_script': self.resources.linker_script,
8485
'object_files': self.resources.objects,
8586
'libraries': self.resources.libraries,
8687
'symbols': self.get_symbols(),
87-
'source_files': sources,
88+
'source_files': iar_files.__str__(),
8889
'binary_files': self.resources.bin_files,
8990
}
9091
self.gen_file('iar_%s.ewp.tmpl' % self.target.lower(), ctx, '%s.ewp' % self.program_name)
9192
self.gen_file('iar.eww.tmpl', ctx, '%s.eww' % self.program_name)
9293
self.gen_file('iar_%s.ewd.tmpl' % self.target.lower(), ctx, '%s.ewd' % self.program_name)
94+
95+
class IAR_FOLDER:
96+
#input:
97+
#folder_level : folder path to current folder
98+
#folder_name : name of current folder
99+
#source_files : list of source_files (all must be in same directory)
100+
def __init__(self, folder_level, folder_name, source_files):
101+
self.folder_level = folder_level
102+
self.folder_name = folder_name
103+
self.source_files = source_files
104+
self.sub_folders = {};
105+
106+
def __str__(self):
107+
group_start = ""
108+
group_end = ""
109+
if self.folder_name != "":
110+
group_start = "<group>\n<name>%s</name>\n" %(self.folder_name)
111+
group_end = "</group>\n"
112+
113+
str_content = group_start
114+
#Add files in current folder
115+
if self.source_files:
116+
for src in self.source_files:
117+
str_content += "<file>\n<name>$PROJ_DIR$\\%s</name>\n</file>\n" % src
118+
##Add sub folders
119+
if self.sub_folders:
120+
for folder_name in self.sub_folders.iterkeys():
121+
str_content += self.sub_folders[folder_name].__str__()
122+
123+
str_content += group_end
124+
return str_content
125+
126+
127+
def insert_file(self, source_input):
128+
if self.source_files:
129+
dir_sources = IAR_FOLDER.get_directory(self.source_files[0]) ##All source_files in a IAR_FOLDER must be in same directory.
130+
if not self.folder_level == dir_sources: ## Check if sources are already at their deepest level.
131+
_reg_exp = r"^" + re.escape(self.folder_level) + r"[/\\]?([^/\\]+)"
132+
folder_name = re.match( _reg_exp, dir_sources).group(1)
133+
self.sub_folders[folder_name] = IAR_FOLDER(self.folder_level + "\\" + folder_name, folder_name, self.source_files)
134+
self.source_files = []
135+
136+
dir_input = IAR_FOLDER.get_directory(source_input)
137+
if dir_input == self.folder_level:
138+
self.source_files.append(source_input)
139+
else:
140+
_reg_exp = r"^" + re.escape(self.folder_level) + r"[/\\]?([^/\\]+)"
141+
folder_name = re.match( _reg_exp, dir_input).group(1)
142+
if self.sub_folders.has_key(folder_name):
143+
self.sub_folders[folder_name].insert_file(source_input)
144+
else:
145+
if self.folder_level == "": #Top level exception
146+
self.sub_folders[folder_name] = IAR_FOLDER(folder_name, folder_name, [source_input])
147+
else:
148+
self.sub_folders[folder_name] = IAR_FOLDER(self.folder_level + "\\" + folder_name, folder_name, [source_input])
149+
150+
@staticmethod
151+
def get_directory(file_path):
152+
dir_Match = re.match( r'(.*)[/\\][^/\\]+', file_path)
153+
if dir_Match is not None:
154+
return dir_Match.group(1)
155+
else:
156+
return ""
157+
158+

‎workspace_tools/export/iar_arch_ble.ewp.tmpl

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -950,11 +950,7 @@
950950
<data/>
951951
</settings>
952952
</configuration>
953-
{% for files in source_files %}
954-
<file>
955-
<name>$PROJ_DIR$\{{files}}</name>
956-
</file>
957-
{% endfor %}
953+
{{source_files}}
958954
</project>
959955

960956

‎workspace_tools/export/iar_arch_pro.ewp.tmpl

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1823,11 +1823,7 @@
18231823
<data/>
18241824
</settings>
18251825
</configuration>
1826-
{% for files in source_files %}
1827-
<file>
1828-
<name>$PROJ_DIR$\{{files}}</name>
1829-
</file>
1830-
{% endfor %}
1826+
{{source_files}}
18311827
</project>
18321828

18331829

‎workspace_tools/export/iar_delta_dfcm_nnn40.ewp.tmpl

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -950,11 +950,7 @@
950950
<data/>
951951
</settings>
952952
</configuration>
953-
{% for files in source_files %}
954-
<file>
955-
<name>$PROJ_DIR$\{{files}}</name>
956-
</file>
957-
{% endfor %}
953+
{{source_files}}
958954
</project>
959955

960956

‎workspace_tools/export/iar_hrm1017.ewp.tmpl

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -950,11 +950,7 @@
950950
<data/>
951951
</settings>
952952
</configuration>
953-
{% for files in source_files %}
954-
<file>
955-
<name>$PROJ_DIR$\{{files}}</name>
956-
</file>
957-
{% endfor %}
953+
{{source_files}}
958954
</project>
959955

960956

‎workspace_tools/export/iar_k20d50m.ewp.tmpl

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -948,11 +948,7 @@
948948
<data/>
949949
</settings>
950950
</configuration>
951-
{% for files in source_files %}
952-
<file>
953-
<name>$PROJ_DIR$\{{files}}</name>
954-
</file>
955-
{% endfor %}
951+
{{source_files}}
956952
</project>
957953

958954

‎workspace_tools/export/iar_k22f.ewp.tmpl

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -948,11 +948,7 @@
948948
<data/>
949949
</settings>
950950
</configuration>
951-
{% for files in source_files %}
952-
<file>
953-
<name>$PROJ_DIR$\{{files}}</name>
954-
</file>
955-
{% endfor %}
951+
{{source_files}}
956952
</project>
957953

958954

‎workspace_tools/export/iar_k64f.ewp.tmpl

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -948,11 +948,7 @@
948948
<data/>
949949
</settings>
950950
</configuration>
951-
{% for files in source_files %}
952-
<file>
953-
<name>$PROJ_DIR$\{{files}}</name>
954-
</file>
955-
{% endfor %}
951+
{{source_files}}
956952
</project>
957953

958954

‎workspace_tools/export/iar_kl05z.ewp.tmpl

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -948,11 +948,7 @@
948948
<data/>
949949
</settings>
950950
</configuration>
951-
{% for files in source_files %}
952-
<file>
953-
<name>$PROJ_DIR$\{{files}}</name>
954-
</file>
955-
{% endfor %}
951+
{{source_files}}
956952
</project>
957953

958954

‎workspace_tools/export/iar_kl25z.ewp.tmpl

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -948,11 +948,7 @@
948948
<data/>
949949
</settings>
950950
</configuration>
951-
{% for files in source_files %}
952-
<file>
953-
<name>$PROJ_DIR$\{{files}}</name>
954-
</file>
955-
{% endfor %}
951+
{{source_files}}
956952
</project>
957953

958954

‎workspace_tools/export/iar_kl46z.ewp.tmpl

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -948,11 +948,7 @@
948948
<data/>
949949
</settings>
950950
</configuration>
951-
{% for files in source_files %}
952-
<file>
953-
<name>$PROJ_DIR$\{{files}}</name>
954-
</file>
955-
{% endfor %}
951+
{{source_files}}
956952
</project>
957953

958954

‎workspace_tools/export/iar_lpc1114.ewp.tmpl

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -948,11 +948,7 @@
948948
<data/>
949949
</settings>
950950
</configuration>
951-
{% for files in source_files %}
952-
<file>
953-
<name>$PROJ_DIR$\{{files}}</name>
954-
</file>
955-
{% endfor %}
951+
{{source_files}}
956952
</project>
957953

958954

‎workspace_tools/export/iar_lpc11u24.ewp.tmpl

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -948,11 +948,7 @@
948948
<data/>
949949
</settings>
950950
</configuration>
951-
{% for files in source_files %}
952-
<file>
953-
<name>$PROJ_DIR$\{{files}}</name>
954-
</file>
955-
{% endfor %}
951+
{{source_files}}
956952
</project>
957953

958954

‎workspace_tools/export/iar_lpc11u35_401.ewp.tmpl

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -948,11 +948,7 @@
948948
<data/>
949949
</settings>
950950
</configuration>
951-
{% for files in source_files %}
952-
<file>
953-
<name>$PROJ_DIR$\{{files}}</name>
954-
</file>
955-
{% endfor %}
951+
{{source_files}}
956952
</project>
957953

958954

‎workspace_tools/export/iar_lpc11u35_501.ewp.tmpl

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -948,11 +948,7 @@
948948
<data/>
949949
</settings>
950950
</configuration>
951-
{% for files in source_files %}
952-
<file>
953-
<name>$PROJ_DIR$\{{files}}</name>
954-
</file>
955-
{% endfor %}
951+
{{source_files}}
956952
</project>
957953

958954

‎workspace_tools/export/iar_lpc1347.ewp.tmpl

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -953,11 +953,7 @@
953953
<data/>
954954
</settings>
955955
</configuration>
956-
{% for files in source_files %}
957-
<file>
958-
<name>$PROJ_DIR$\{{files}}</name>
959-
</file>
960-
{% endfor %}
956+
{{source_files}}
961957
</project>
962958

963959

‎workspace_tools/export/iar_lpc1549.ewp.tmpl

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -948,11 +948,7 @@
948948
<data/>
949949
</settings>
950950
</configuration>
951-
{% for files in source_files %}
952-
<file>
953-
<name>$PROJ_DIR$\{{files}}</name>
954-
</file>
955-
{% endfor %}
951+
{{source_files}}
956952
</project>
957953

958954

‎workspace_tools/export/iar_lpc1768.ewp.tmpl

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1823,11 +1823,7 @@
18231823
<data/>
18241824
</settings>
18251825
</configuration>
1826-
{% for files in source_files %}
1827-
<file>
1828-
<name>$PROJ_DIR$\{{files}}</name>
1829-
</file>
1830-
{% endfor %}
1826+
{{source_files}}
18311827
</project>
18321828

18331829

‎workspace_tools/export/iar_lpc4088.ewp.tmpl

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -948,11 +948,7 @@
948948
<data/>
949949
</settings>
950950
</configuration>
951-
{% for files in source_files %}
952-
<file>
953-
<name>$PROJ_DIR$\{{files}}</name>
954-
</file>
955-
{% endfor %}
951+
{{source_files}}
956952
</project>
957953

958954

‎workspace_tools/export/iar_lpc4088_dm.ewp.tmpl

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -948,11 +948,7 @@
948948
<data/>
949949
</settings>
950950
</configuration>
951-
{% for files in source_files %}
952-
<file>
953-
<name>$PROJ_DIR$\{{files}}</name>
954-
</file>
955-
{% endfor %}
951+
{{source_files}}
956952
</project>
957953

958954

‎workspace_tools/export/iar_lpc812.ewp.tmpl

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -948,11 +948,7 @@
948948
<data/>
949949
</settings>
950950
</configuration>
951-
{% for files in source_files %}
952-
<file>
953-
<name>$PROJ_DIR$\{{files}}</name>
954-
</file>
955-
{% endfor %}
951+
{{source_files}}
956952
</project>
957953

958954

‎workspace_tools/export/iar_lpc824.ewp.tmpl

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -948,11 +948,7 @@
948948
<data/>
949949
</settings>
950950
</configuration>
951-
{% for files in source_files %}
952-
<file>
953-
<name>$PROJ_DIR$\{{files}}</name>
954-
</file>
955-
{% endfor %}
951+
{{source_files}}
956952
</project>
957953

958954

‎workspace_tools/export/iar_lpccappuccino.ewp.tmpl

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -948,11 +948,7 @@
948948
<data/>
949949
</settings>
950950
</configuration>
951-
{% for files in source_files %}
952-
<file>
953-
<name>$PROJ_DIR$\{{files}}</name>
954-
</file>
955-
{% endfor %}
951+
{{source_files}}
956952
</project>
957953

958954

0 commit comments

Comments
 (0)