瀏覽代碼

Merge pull request #2999 from murphyzhao/tools-iar-fix

[tools][fix] 修改 iar.py 中 iar 版本查找失败后的处理
Bernard Xiong 5 年之前
父節點
當前提交
40bb254ccd
共有 1 個文件被更改,包括 7 次插入2 次删除
  1. 7 2
      tools/iar.py

+ 7 - 2
tools/iar.py

@@ -27,6 +27,8 @@ import sys
 import string
 import utils
 
+from SCons.Script import *
+
 import xml.etree.ElementTree as etree
 from xml.etree.ElementTree import SubElement
 from utils import _make_path_relative
@@ -194,10 +196,13 @@ def IARVersion():
         cmd = os.path.join(path, 'iccarm.exe')
     else:
         print('Error: get IAR version failed. Please update the IAR installation path in rtconfig.py!')
-        return "0.0"
+        exit(-1)
 
     child = subprocess.Popen([cmd, '--version'], stdout=subprocess.PIPE, stderr=subprocess.PIPE, shell=True)
     stdout, stderr = child.communicate()
 
     # example stdout: IAR ANSI C/C++ Compiler V8.20.1.14183/W32 for ARM
-    return re.search('[\d\.]+', stdout).group(0)
+    iar_version = re.search('[\d\.]+', stdout).group(0)
+    if GetOption('verbose'):
+        print("IAR version: %s" % iar_version)
+    return iar_version