Skip to content

Commit 6fce892

Browse files
authored
Merge pull request #2614 from MarceloSalazar/uvision_default
Change default uvision exporter to uvision5
2 parents 4fa65a6 + 64d3381 commit 6fce892

File tree

3 files changed

+7
-4
lines changed

3 files changed

+7
-4
lines changed

tools/export/__init__.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@
2828
from project_generator_definitions.definitions import ProGenDef
2929

3030
EXPORTERS = {
31-
'uvision': uvision4.Uvision4,
32-
'uvision4': uvision4.Uvision4,
31+
'uvision': uvision5.Uvision5,
32+
'uvision4': uvision4.Uvision4, # deprecated - to be removed in future version
3333
'uvision5': uvision5.Uvision5,
3434
'lpcxpresso': codered.CodeRed,
3535
'gcc_arm': makefile.GccArm,

tools/export/uvision4.py

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,9 @@ def get_toolchain(self):
5555

5656
def generate(self):
5757
""" Generates the project files """
58+
59+
print "WARNING: exporting to uVision4 is deprecated and will be removed in a future version"
60+
5861
project_data = self.progen_get_project_data()
5962
tool_specific = {}
6063
# Expand tool specific settings by uvision specific settings which are required

tools/test/export/build_test.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ def handle_log_files(project_dir, tool, name):
6969
created project files
7070
"""
7171
log = ''
72-
if tool == 'uvision' or tool == 'uvision5':
72+
if tool == 'uvision' or tool == 'uvision4':
7373
log = path.join(project_dir, "build", "build_log.txt")
7474
elif tool == 'iar':
7575
log = path.join(project_dir, 'build_log.txt')
@@ -129,7 +129,7 @@ def generate_and_build(self, clean=False):
129129

130130
def main():
131131
"""Entry point"""
132-
toolchainlist = ["iar", "uvision", "uvision5"]
132+
toolchainlist = ["iar", "uvision", "uvision4"]
133133
default_tests = [test_name_known("MBED_BLINKY")]
134134
targetnames = TARGET_NAMES
135135
targetnames.sort()

0 commit comments

Comments
 (0)