Changeset 01e7043 in mainline
- Timestamp:
- 2010-12-05T12:59:48Z (14 years ago)
- Branches:
- lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
- Children:
- 8fe3f832
- Parents:
- f5211ee (diff), 6ec0acd (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. - Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
Makefile
rf5211ee r01e7043 41 41 CONFIG_HEADER = config.h 42 42 43 ifeq ($(PROFILE),)44 PRESETS_FILE =45 else46 PRESETS_FILE = defaults/$(PROFILE)/Makefile.config47 endif48 49 43 .PHONY: all precheck cscope autotool config_auto config_default config distclean clean 50 44 … … 72 66 73 67 config_default: $(CONFIG_RULES) 74 $(CONFIG) $< default $(PR ESETS_FILE)68 $(CONFIG) $< default $(PROFILE) 75 69 76 70 config: $(CONFIG_RULES) -
tools/config.py
rf5211ee r01e7043 413 413 return list 414 414 415 ## Choose a profile and load configuration presets.416 # 417 def load_presets(root, fname, screen, config):415 ## Ask user to choose a configuration profile. 416 # 417 def profile_choose(root, fname, screen, config): 418 418 options = [] 419 419 opt2path = {} … … 436 436 subprofile = True 437 437 options.append("%s (%s)" % (name, subname)) 438 opt2path[cnt] = (canon, subcanon)438 opt2path[cnt] = [name, subname] 439 439 cnt += 1 440 440 441 441 if not subprofile: 442 442 options.append(name) 443 opt2path[cnt] = (canon, None)443 opt2path[cnt] = [name] 444 444 cnt += 1 445 445 … … 449 449 return None 450 450 451 read_config(opt2path[value][0], config) 452 if opt2path[value][1] != None: 453 read_config(opt2path[value][1], config) 451 return opt2path[value] 452 453 ## Read presets from a configuration profile. 454 # 455 # @param profile Profile to load from (a list of string components) 456 # @param config Output configuration 457 # 458 def presets_read(profile, config): 459 path = os.path.join(PRESETS_DIR, profile[0], MAKEFILE) 460 read_config(path, config) 461 462 if len(profile) > 1: 463 path = os.path.join(PRESETS_DIR, profile[0], profile[1], MAKEFILE) 464 read_config(path, config) 465 466 ## Parse profile name (relative OS path) into a list of components. 467 # 468 # @param profile_name Relative path (using OS separator) 469 # @return List of components 470 # 471 def parse_profile_name(profile_name): 472 profile = [] 473 474 head, tail = os.path.split(profile_name) 475 if head != '': 476 profile.append(head) 477 478 profile.append(tail) 479 return profile 454 480 455 481 def main(): 456 cfgfile_in= None482 profile = None 457 483 config = {} 458 484 rules = [] … … 464 490 # otherwise configuration from previous run is used. 465 491 if len(sys.argv) >= 4: 466 cfgfile_in = sys.argv[3] 467 else: 468 cfgfile_in = MAKEFILE 469 470 # Read configuration file 471 if os.path.exists(cfgfile_in): 472 read_config(cfgfile_in, config) 492 profile = parse_profile_name(sys.argv[3]) 493 presets_read(profile, config) 494 elif os.path.exists(MAKEFILE): 495 read_config(MAKEFILE, config) 473 496 474 497 # Default mode: only check values and regenerate configuration files … … 547 570 548 571 if value == 0: 549 load_presets(PRESETS_DIR, MAKEFILE, screen, config) 572 profile = profile_choose(PRESETS_DIR, MAKEFILE, screen, config) 573 if profile != None: 574 presets_read(profile, config) 550 575 position = 1 551 576 continue
Note:
See TracChangeset
for help on using the changeset viewer.