Changeset 095ed4a in mainline

Timestamp:

2019-08-18T11:51:53Z (5 years ago)

Author:

Jiří Zárevúcky <zarevucky.jiri@…>

Branches:

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

Children:

3f1a481

Parents:

45fdc55

Message:

Mask options that can't be changed via ninja config

Files:

• meson/part/extra_targets/meson.build (modified) (2 diffs)
• tools/config.py (modified) (5 diffs)

meson/part/extra_targets/meson.build

@@ -31 +31 @@
         command: [
                 sh,
-                '-c', 'cd $1 && $2 $3 $4',
+                '-c', 'cd $1 && $2 $3 $4 $5',
                 '--',
                 meson.build_root(),
@@ -37 +37 @@
                 meson.source_root() / 'HelenOS.config',
                 meson.source_root() / 'defaults',
+                '--mask-platform',
         ]
 )

tools/config.py

@@ -46 +46 @@
 ARGPOS_CHOICE = 3
 ARGPOS_PRESET = 4
+ARGPOS_MASK_PLATFORM = 3
 
 RULES_FILE = sys.argv[ARGPOS_RULES]
@@ -691 +692 @@
                 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.
@@ -756 +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 +769 @@
 
                                 if cond and not cond.evaluate(config):
+                                        continue
+
+                                if mask_platform and (varname == "PLATFORM" or varname == "MACHINE" or varname == "COMPILER"):
                                         continue
 
@@ -812 +820 @@
                                         continue
 
-                        if value == 0:
+                        if value == 0 and not mask_platform:
                                 profile = choose_profile(PRESETS_DIR, MAKEFILE, screen, config)
                                 if profile != None: