فهرست منبع

tools: add SDK_VERB_BUILDMSG env var to control verbose build message

If SDK_VERB_BUILDMSG set to false or 0, will show less build message

Signed-off-by: Huaqi Fang <578567190@qq.com>
Huaqi Fang 3 سال پیش
والد
کامیت
b82be434a9
2فایلهای تغییر یافته به همراه17 افزوده شده و 9 حذف شده
  1. 10 7
      tools/scripts/nsdk_cli/nsdk_builder.py
  2. 7 2
      tools/scripts/nsdk_cli/nsdk_utils.py

+ 10 - 7
tools/scripts/nsdk_cli/nsdk_builder.py

@@ -116,7 +116,8 @@ class nsdk_builder(object):
             parallel = ""
         if parallel != "": # need to split targets
             build_targets = target.strip().split()
-            print("Target \"%s\" are split to seperated targets %s in parallel mode." %(target, build_targets))
+            if get_sdk_verb_buildmsg():
+                print("Target \"%s\" are split to seperated targets %s in parallel mode." %(target, build_targets))
         else:
             build_targets = [target]
         if os.path.isfile(logfile):
@@ -125,11 +126,11 @@ class nsdk_builder(object):
         ignore_targets = ["info", "showtoolver", "showflags", "clean", "bin", "size"]
         for btg in build_targets:
             build_cmd = "make %s -C %s %s %s" % (parallel, appdir, make_options, btg)
-            if not ((show_output == False) and (btg in ignore_targets)):
+            if get_sdk_verb_buildmsg() and (not ((show_output == False) and (btg in ignore_targets))):
                 print("Build application %s, with target: %s" % (appdir, btg))
                 print("Build command: %s" % (build_cmd))
             ret, ticks = run_command(build_cmd, show_output, logfile=logfile, append=True)
-            if not ((show_output == False) and (btg in ignore_targets)):
+            if get_sdk_verb_buildmsg() and (not ((show_output == False) and (btg in ignore_targets))):
                 print("Build command return value: %s" % (ret))
             total_ticks += ticks
             if ret != 0: # if one target failed, then stop
@@ -335,10 +336,11 @@ class MonitorThread(Thread):
                         return True
             return False
 
-        print("Read serial log from %s, baudrate %s" %(self.port, self.baudrate))
         NSDK_CHECK_TAG = get_sdk_checktag()
-        print("Checker used: ", self.checks)
-        print("SDK Checker Tag \"%s\", checker enable %s" % (NSDK_CHECK_TAG, self.sdk_check))
+        if get_sdk_verb_buildmsg:
+            print("Read serial log from %s, baudrate %s" %(self.port, self.baudrate))
+            print("Checker used: ", self.checks)
+            print("SDK Checker Tag \"%s\", checker enable %s" % (NSDK_CHECK_TAG, self.sdk_check))
         check_finished = False
         try:
             ser = None
@@ -513,6 +515,7 @@ class nsdk_runner(nsdk_builder):
                 if retry_cnt > max_retrycnt: # do retry
                     break
                 retry_cnt += 1
+                print("Hardware configuration: serial port %s, baudrate %s, timeout %ds, retry counter %d" % (serport, baudrate, timeout, retry_cnt))
                 if serport: # only monitor serial port when port found
                     ser_thread = MonitorThread(serport, baudrate, timeout, app_runchecks, checktime, \
                         sdk_check, logfile, show_output)
@@ -771,7 +774,7 @@ class nsdk_runner(nsdk_builder):
         if copy_objects_required:
             nsdk_builder.copy_objects(appsts, objs_copydir)
         buildtime = appsts["time"]["build"]
-        print("Build application %s with target %s, time cost %s seconds, passed: %s" %(appdir, target, buildtime, appcmdsts))
+        print("Build application %s with target %s, make options %s, time cost %s seconds, passed: %s" %(appdir, target, make_options, buildtime, appcmdsts))
         sys.stdout.flush()
 
         appsts["config"] = appconfig

+ 7 - 2
tools/scripts/nsdk_cli/nsdk_utils.py

@@ -41,7 +41,8 @@ SDK_GLOBAL_VARIABLES = {
     "sdk_ttyerr_maxcnt": 3,
     "sdk_fpgaprog_maxcnt": 3,
     "sdk_gdberr_maxcnt": 10,
-    "sdk_uploaderr_maxcnt": 10
+    "sdk_uploaderr_maxcnt": 10,
+    "sdk_verb_buildmsg": True
     }
 
 class NThread(Thread):
@@ -151,7 +152,6 @@ def find_serport_by_no(serno):
     # serport founded
     return serport
 
-
 def find_most_possible_serport():
     serports = find_possible_serports()
     if len(serports) > 0:
@@ -662,6 +662,11 @@ def get_sdk_check():
         check = SDK_GLOBAL_VARIABLES.get("sdk_check")
     return check
 
+def get_sdk_verb_buildmsg():
+    check = get_env_flag("SDK_VERB_BUILDMSG")
+    if check is None:
+        check = SDK_GLOBAL_VARIABLES.get("sdk_verb_buildmsg")
+    return check
 
 def get_sdk_copyobjects_flag():
     cpflag = get_env_flag("SDK_COPY_OBJECTS_FLAG")