Merge pull request #2614 from MarceloSalazar/uvision_default

Change default uvision exporter to uvision5
pull/2705/merge
Sam Grove 2016-09-22 00:46:18 -05:00 committed by GitHub
commit 6fce892f05
3 changed files with 7 additions and 4 deletions

View File

@ -28,8 +28,8 @@ from tools.targets import TARGET_NAMES, EXPORT_MAP, TARGET_MAP
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': makefile.GccArm,

View File

@ -55,6 +55,9 @@ class Uvision4(Exporter):
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

View File

@ -69,7 +69,7 @@ class ProgenBuildTest(object):
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')
@ -129,7 +129,7 @@ class ProgenBuildTest(object):
def main():
"""Entry point"""
toolchainlist = ["iar", "uvision", "uvision5"]
toolchainlist = ["iar", "uvision", "uvision4"]
default_tests = [test_name_known("MBED_BLINKY")]
targetnames = TARGET_NAMES
targetnames.sort()