Changeset 32b4302 in mainline for tools/config.py

Timestamp:

2019-08-18T19:06:02Z (6 years ago)

Author:

GitHub <noreply@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

1c39d33b

Parents:

fa70134 (diff), 6c2fac18 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

git-author:

Jiří Zárevúcky <zarevucky.jiri@…> (2019-08-18 19:06:02)

git-committer:

GitHub <noreply@…> (2019-08-18 19:06:02)

Message:

Merge pull request #174 from le-jzr/meson3

Convert HelenOS build system to Meson

File:

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

tools/config.py

@@ -43 +43 @@
 
 ARGPOS_RULES = 1
-ARGPOS_CHOICE = 2
-ARGPOS_PRESET = 3
+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:
@@ -536 +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:
@@ -689 +691 @@
         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
@@ -755 +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:
@@ -764 +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:
@@ -811 +820 @@
                                         continue
 
-                        if value == 0:
+                        if value == 0 and not mask_platform:
                                 profile = choose_profile(PRESETS_DIR, MAKEFILE, screen, config)
                                 if profile != None:
@@ -828 +837 @@
                         else:
                                 value = config[selname]
+
+                        if mask_platform and (selname == "PLATFORM" or selname == "MACHINE" or selname == "COMPILER"):
+                                        continue
 
                         if seltype == 'choice':