Changeset e3c3172 in mainline

Timestamp:

2010-12-06T12:40:37Z (14 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

bea023b9

Parents:

d40ffbb

Message:

introduce a true hands-off configuration/build mode
(use "make PROFILE≤profile_name> HANDS_OFF=y")

Files:

• Makefile (modified) (1 diff)
• tools/config.py (modified) (1 diff)

Makefile

@@ -66 +66 @@
 
 config_default: $(CONFIG_RULES)
+ifeq ($(HANDS_OFF),y)
+        $(CONFIG) $< hands-off $(PROFILE)
+else
         $(CONFIG) $< default $(PROFILE)
+endif
 
 config: $(CONFIG_RULES)

tools/config.py

@@ -495 +495 @@
                 read_config(MAKEFILE, config)
         
-        # Default mode: only check values and regenerate configuration files
+        # Default mode: check values and regenerate configuration files
         if (len(sys.argv) >= 3) and (sys.argv[2] == 'default'):
                 if (infer_verify_choices(config, rules)):
                         create_output(MAKEFILE, MACROS, config, rules)
                         return 0
+        
+        # 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
+                # to read implicitly any possible previous run configuration
+                if len(sys.argv) < 4:
+                        sys.stderr.write("Configuration error: No presets specified\n")
+                        return 2
+                
+                if (infer_verify_choices(config, rules)):
+                        create_output(MAKEFILE, MACROS, config, rules)
+                        return 0
+                
+                sys.stderr.write("Configuration error: The presets are ambiguous\n")
+                return 1
         
         # Check mode: only check configuration