Changeset f5211ee in mainline

Timestamp:

2010-12-05T11:09:50Z (14 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

01e7043

Parents:

8c2b3ef (diff), 421250e (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.

Message:

Merge more of hands-off configuration support.

Files:

• Makefile (modified) (2 diffs)
• tools/config.py (modified) (2 diffs)

Makefile

@@ -41 +41 @@
 CONFIG_HEADER = config.h
 
-.PHONY: all precheck cscope autotool config_default config distclean clean
+ifeq ($(PROFILE),)
+        PRESETS_FILE =
+else
+        PRESETS_FILE = defaults/$(PROFILE)/Makefile.config
+endif
+
+.PHONY: all precheck cscope autotool config_auto config_default config distclean clean
 
 all: $(COMMON_MAKEFILE) $(COMMON_HEADER) $(CONFIG_MAKEFILE) $(CONFIG_HEADER)
@@ -66 +72 @@
 
 config_default: $(CONFIG_RULES)
-        $(CONFIG) $< default
+        $(CONFIG) $< default $(PRESETS_FILE)
 
 config: $(CONFIG_RULES)

tools/config.py

@@ -454 +454 @@
 
 def main():
+        cfgfile_in = None
         config = {}
         rules = []
@@ -460 +461 @@
         parse_rules(RULES_FILE, rules)
         
-        # Read configuration from previous run
-        if os.path.exists(MAKEFILE):
-                read_config(MAKEFILE, config)
+        # Input configuration file can be specified on command line
+        # otherwise configuration from previous run is used.
+        if len(sys.argv) >= 4:
+                cfgfile_in = sys.argv[3]
+        else:
+                cfgfile_in = MAKEFILE
+        
+        # Read configuration file
+        if os.path.exists(cfgfile_in):
+                read_config(cfgfile_in, config)
         
         # Default mode: only check values and regenerate configuration files