Merge pull request #49 from SummerGGift/20180807

【添加】：最新功能到 develop 分支

Author: armink

cmds/cmd_menuconfig.py

@@ -105,7 +105,7 @@ def mk_rtconfig(filename):
     rtconfig.close()
 
 
-def find_macro_in_condfig(filename, macro_name):
+def find_macro_in_config(filename, macro_name):
     try:
         config = file(filename)
     except:
@@ -134,7 +134,7 @@ def find_macro_in_condfig(filename, macro_name):
             else:
                 line = line[1:]
 
-            #print line
+            # print line
 
             empty_line = 0
         else:
@@ -156,7 +156,7 @@ def cmd(args):
     dirname = os.path.split(os.path.split(currentdir)[0])[0]
     get_rtt_name = os.path.basename(dirname)
     os_version = platform.platform(True)[10:13]
-    #print os.path.split(currentdir)[1]
+    # print os.path.split(currentdir)[1]
     kconfig_win7_path = os.path.join(
         env_root, 'tools', 'bin', 'kconfig-mconf_win7.exe')
 
@@ -175,7 +175,7 @@ def cmd(args):
             print (
                 "using command 'set RTT_ROOT=your_rtthread_root_path' to set RTT_ROOT is ok too.\n")
             print ("you can ignore debug messages below.")
-            #if not args.menuconfig_easy:
+            # if not args.menuconfig_easy:
             #    return
 
     fn = '.config'
@@ -189,6 +189,8 @@ def cmd(args):
         print 'use', args.menuconfig_fn
         import shutil
         shutil.copy(args.menuconfig_fn, fn)
+    elif args.menuconfig_g:
+        mk_rtconfig(fn)
     elif args.menuconfig_silent:
         if float(os_version) >= 6.2:
             os.system('kconfig-mconf Kconfig -n')
@@ -237,24 +239,19 @@ def cmd(args):
         if not os.path.isfile(fn):
             return
 
-        print("\nTry the command <menuconfig -s/--setting> ")
-        print(
-            "\nEnable the auto update option,env will auto update the packages you select.")
 
-        if find_macro_in_condfig(fn, 'SYS_AUTO_UPDATE_PKGS'):
+        if find_macro_in_config(fn, 'SYS_AUTO_UPDATE_PKGS'):
             os.system('pkgs --update')
-            print "Auto update packages done"
-
-        print("Select the project type your bsp support and then env will create a new mdk/iar project.")
+            print "==============================>The packages have been updated completely."
 
-        if find_macro_in_condfig(fn, 'SYS_CREATE_MDK_IAR_PROJECT'):
-            if find_macro_in_condfig(fn, 'SYS_CREATE_MDK4'):
+        if find_macro_in_config(fn, 'SYS_CREATE_MDK_IAR_PROJECT'):
+            if find_macro_in_config(fn, 'SYS_CREATE_MDK4'):
                 os.system('scons --target=mdk4 -s')
                 print "Create mdk4 project done"
-            elif find_macro_in_condfig(fn, 'SYS_CREATE_MDK5'):
+            elif find_macro_in_config(fn, 'SYS_CREATE_MDK5'):
                 os.system('scons --target=mdk5 -s')
                 print "Create mdk5 project done"
-            elif find_macro_in_condfig(fn, 'SYS_CREATE_IAR'):
+            elif find_macro_in_config(fn, 'SYS_CREATE_IAR'):
                 os.system('scons --target=iar -s')
                 print "Create iar project done"
 
@@ -266,6 +263,12 @@ def add_parser(sub):
                         help='Using the user specified configuration file.',
                         dest='menuconfig_fn')
 
+    parser.add_argument('--generate',
+                        help='generate rtconfig.h by .config.',
+                        action='store_true',
+                        default=False,
+                        dest='menuconfig_g')
+
     parser.add_argument('--silent',
                         help='Silent mode,don\'t display menuconfig window.',
                         action='store_true',