Changeset 45b26114 in mainline


Ignore:
Timestamp:
2019-08-17T12:49:43Z (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:
2e2cefdb
Parents:
4b42382
git-author:
Jiří Zárevúcky <zarevucky.jiri@…> (2019-06-30 11:16:04)
git-committer:
Jiří Zárevúcky <zarevucky.jiri@…> (2019-08-17 12:49:43)
Message:

tools/config.py: Explicitly designate presets directory

This allows us to run config.py from any directory, as long as we
provide the correct source paths.

Files:
2 edited

Legend:

Unmodified
Added
Removed

  • Makefile

    r4b42382 r45b26114  
    132132config_default $(CONFIG_MAKEFILE) $(CONFIG_HEADER): $(CONFIG_RULES)
    133133ifeq ($(HANDS_OFF),y)
    134         $(CONFIG) $< hands-off $(PROFILE)
     134        $(CONFIG) $< defaults hands-off $(PROFILE)
    135135else
    136         $(CONFIG) $< default $(PROFILE)
     136        $(CONFIG) $< defaults default $(PROFILE)
    137137endif
    138138
    139139config: $(CONFIG_RULES)
    140         $(CONFIG) $<
     140        $(CONFIG) $< defaults
    141141
    142142random-config: $(CONFIG_RULES)
    143         $(CONFIG) $< random
     143        $(CONFIG) $< defaults random
    144144
    145145# Release files

  • tools/config.py

    r4b42382 r45b26114  
    4343
    4444ARGPOS_RULES = 1
    45 ARGPOS_CHOICE = 2
    46 ARGPOS_PRESET = 3
     45ARGPOS_PRESETS_DIR = 2
     46ARGPOS_CHOICE = 3
     47ARGPOS_PRESET = 4
    4748
    4849RULES_FILE = sys.argv[ARGPOS_RULES]
    4950MAKEFILE = 'Makefile.config'
    5051MACROS = 'config.h'
    51 PRESETS_DIR = 'defaults'
     52PRESETS_DIR = sys.argv[ARGPOS_PRESETS_DIR]
    5253
    5354class BinaryOp:
Note: See TracChangeset for help on using the changeset viewer.