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

File:

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

tools/config.py

@@ -42 +42 @@
 import random
 
-RULES_FILE = sys.argv[1]
+ARGPOS_RULES = 1
+ARGPOS_PRESETS_DIR = 2
+ARGPOS_CHOICE = 3
+ARGPOS_PRESET = 4
+ARGPOS_MASK_PLATFORM = 3
+
+RULES_FILE = sys.argv[ARGPOS_RULES]
 MAKEFILE = 'Makefile.config'
 MACROS = 'config.h'
-PRESETS_DIR = 'defaults'
+PRESETS_DIR = sys.argv[ARGPOS_PRESETS_DIR]
 
 class BinaryOp:
@@ -532 +538 @@
 
         try:
-                version = subprocess.Popen(['git', 'log', '-1', '--pretty=%h'], stdout = subprocess.PIPE).communicate()[0].decode().strip()
+                version = subprocess.Popen(['git', '-C', os.path.dirname(RULES_FILE), 'log', '-1', '--pretty=%h'], stdout = subprocess.PIPE).communicate()[0].decode().strip()
                 sys.stderr.write("ok\n")
         except:
@@ -586 +592 @@
         outmk.write('TIMESTAMP_UNIX = %d\n' % timestamp_unix)
         outmc.write('#define TIMESTAMP_UNIX %d\n' % timestamp_unix)
-        defs += ' "-DTIMESTAMP_UNIX=%d"\n' % timestamp_unix
+        defs += ' "-DTIMESTAMP_UNIX=%d"' % timestamp_unix
 
         outmk.write('TIMESTAMP = %s\n' % timestamp)
         outmc.write('#define TIMESTAMP %s\n' % timestamp)
-        defs += ' "-DTIMESTAMP=%s"\n' % timestamp
-
-        outmk.write(defs)
+        defs += ' "-DTIMESTAMP=%s"' % timestamp
+
+        outmk.write('%s\n' % defs)
 
         outmk.close()
@@ -676 +682 @@
         parse_rules(RULES_FILE, rules)
 
+        if len(sys.argv) > ARGPOS_CHOICE:
+                choice = sys.argv[ARGPOS_CHOICE]
+        else:
+                choice = None
+
+        if len(sys.argv) > ARGPOS_PRESET:
+                preset = sys.argv[ARGPOS_PRESET]
+        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
         # otherwise configuration from previous run is used.
-        if len(sys.argv) >= 4:
-                profile = parse_profile_name(sys.argv[3])
+        if preset is not None:
+                profile = parse_profile_name(preset)
                 read_presets(profile, config)
         elif os.path.exists(MAKEFILE):
@@ -685 +703 @@
 
         # Default mode: check values and regenerate configuration files
-        if (len(sys.argv) >= 3) and (sys.argv[2] == 'default'):
+        if choice == 'default':
                 if (infer_verify_choices(config, rules)):
                         preprocess_config(config, rules)
@@ -693 +711 @@
         # Hands-off mode: check values and regenerate configuration files,
         # but no interactive fallback
-        if (len(sys.argv) >= 3) and (sys.argv[2] == 'hands-off'):
-                # We deliberately test sys.argv >= 4 because we do not want
+        if choice == 'hands-off':
+                # We deliberately test this because we do not want
                 # to read implicitly any possible previous run configuration
-                if len(sys.argv) < 4:
+                if preset is None:
                         sys.stderr.write("Configuration error: No presets specified\n")
                         return 2
@@ -709 +727 @@
 
         # Check mode: only check configuration
-        if (len(sys.argv) >= 3) and (sys.argv[2] == 'check'):
+        if choice == 'check':
                 if infer_verify_choices(config, rules):
                         return 0
@@ -715 +733 @@
 
         # Random mode
-        if (len(sys.argv) == 3) and (sys.argv[2] == 'random'):
+        if choice == 'random':
                 ok = random_choices(config, rules, 0)
                 if not ok:
@@ -741 +759 @@
                         options = []
                         opt2row = {}
-                        cnt = 1
-
-                        options.append("  --- Load preconfigured defaults ... ")
+                        cnt = 0
+
+                        if not mask_platform:
+                                cnt += 1
+                                options.append("  --- Load preconfigured defaults ... ")
 
                         for rule in rules:
@@ -750 +770 @@
                                 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:
@@ -797 +820 @@
                                         continue
 
-                        if value == 0:
+                        if value == 0 and not mask_platform:
                                 profile = choose_profile(PRESETS_DIR, MAKEFILE, screen, config)
                                 if profile != None:
@@ -814 +837 @@
                         else:
                                 value = config[selname]
+
+                        if mask_platform and (selname == "PLATFORM" or selname == "MACHINE" or selname == "COMPILER"):
+                                        continue
 
                         if seltype == 'choice':