Skip to content

Change default uvision exporter to uvision5 #2614

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Sep 22, 2016
Merged

Change default uvision exporter to uvision5 #2614

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ca35755
Change default uvision exporter to uvision5
Sep 3, 2016
1192744
Minor fix to match with master
Sep 12, 2016
64d3381
Minor tweak on spaces
Sep 16, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions tools/export/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@
from project_generator_definitions.definitions import ProGenDef

EXPORTERS = {
'uvision': uvision4.Uvision4,
'uvision4': uvision4.Uvision4,
'uvision': uvision5.Uvision5,
'uvision4': uvision4.Uvision4, # deprecated - to be removed in future version
'uvision5': uvision5.Uvision5,
'lpcxpresso': codered.CodeRed,
'gcc_arm': gccarm.GccArm,
Expand Down
3 changes: 3 additions & 0 deletions tools/export/uvision4.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,9 @@ def get_toolchain(self):

def generate(self):
""" Generates the project files """

print "WARNING: exporting to uVision4 is deprecated and will be removed in a future version"

project_data = self.progen_get_project_data()
tool_specific = {}
# Expand tool specific settings by uvision specific settings which are required
Expand Down
4 changes: 2 additions & 2 deletions tools/test/export/build_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ def handle_log_files(project_dir, tool, name):
created project files
"""
log = ''
if tool == 'uvision' or tool == 'uvision5':
if tool == 'uvision' or tool == 'uvision4':
log = path.join(project_dir, "build", "build_log.txt")
elif tool == 'iar':
log = path.join(project_dir, 'build_log.txt')
Expand Down Expand Up @@ -129,7 +129,7 @@ def generate_and_build(self, clean=False):

def main():
"""Entry point"""
toolchainlist = ["iar", "uvision", "uvision5"]
toolchainlist = ["iar", "uvision", "uvision4"]
default_tests = [test_name_known("MBED_BLINKY")]
targetnames = TARGET_NAMES
targetnames.sort()
Expand Down