Changes in tools/config.py [3f1a481:aca97582] in mainline

File:

• tools/config.py (modified) (7 diffs)

tools/config.py

@@ -43 +43 @@
 
 ARGPOS_RULES = 1
-ARGPOS_PRESETS_DIR = 2
-ARGPOS_CHOICE = 3
-ARGPOS_PRESET = 4
-ARGPOS_MASK_PLATFORM = 3
+ARGPOS_CHOICE = 2
+ARGPOS_PRESET = 3
 
 RULES_FILE = sys.argv[ARGPOS_RULES]
 MAKEFILE = 'Makefile.config'
 MACROS = 'config.h'
-PRESETS_DIR = sys.argv[ARGPOS_PRESETS_DIR]
+PRESETS_DIR = 'defaults'
 
 class BinaryOp:
@@ -538 +536 @@
 
         try:
-                version = subprocess.Popen(['git', '-C', os.path.dirname(RULES_FILE), 'log', '-1', '--pretty=%h'], stdout = subprocess.PIPE).communicate()[0].decode().strip()
+                version = subprocess.Popen(['git', 'log', '-1', '--pretty=%h'], stdout = subprocess.PIPE).communicate()[0].decode().strip()
                 sys.stderr.write("ok\n")
         except:
@@ -691 +689 @@
         else:
                 preset = None
-
-        mask_platform = (len(sys.argv) > ARGPOS_MASK_PLATFORM and sys.argv[ARGPOS_MASK_PLATFORM] == "--mask-platform")
 
         # Input configuration file can be specified on command line
@@ -759 +755 @@
                         options = []
                         opt2row = {}
-                        cnt = 0
-
-                        if not mask_platform:
-                                cnt += 1
-                                options.append("  --- Load preconfigured defaults ... ")
+                        cnt = 1
+
+                        options.append("  --- Load preconfigured defaults ... ")
 
                         for rule in rules:
@@ -770 +764 @@
                                 if cond and not cond.evaluate(config):
                                         continue
-
-                                if mask_platform and (varname == "PLATFORM" or varname == "MACHINE" or varname == "COMPILER"):
-                                        rule = varname, vartype, "(locked) " + name, choices, cond
 
                                 if varname == selname:
@@ -820 +811 @@
                                         continue
 
-                        if value == 0 and not mask_platform:
+                        if value == 0:
                                 profile = choose_profile(PRESETS_DIR, MAKEFILE, screen, config)
                                 if profile != None:
@@ -837 +828 @@
                         else:
                                 value = config[selname]
-
-                        if mask_platform and (selname == "PLATFORM" or selname == "MACHINE" or selname == "COMPILER"):
-                                        continue
 
                         if seltype == 'choice':