diff options
| -rw-r--r-- | conf.py | 4 | ||||
| -rw-r--r-- | scripts/initialize.py | 10 | ||||
| -rwxr-xr-x | scripts/main_loop.py | 2 | ||||
| -rw-r--r-- | scripts/solution.py | 2 | ||||
| -rw-r--r-- | scripts/utils.py | 2 |
5 files changed, 10 insertions, 10 deletions
@@ -33,9 +33,9 @@ solution_file = build_folder + '/solution' iteration_file = build_folder + '/iteration' # Programs paths -kconfig_parser = checkXf(pf('scripts/kconfig_parser/parser'), 'You must build programs first.') +parse_kconfig = checkXf(pf('scripts/parse_kconfig/parse'), 'You must build programs first.') # Programs output hide -kconfig_parser_output = False +parse_kconfig_output = False minisat_output = False kernel_config_output = False diff --git a/scripts/initialize.py b/scripts/initialize.py index f39f6a3..191d8d1 100644 --- a/scripts/initialize.py +++ b/scripts/initialize.py @@ -7,18 +7,18 @@ import utils from conf import conf from exceptions import MissingFile -def kconfig_parser(): - "Execute kconfig_parser in linux_sources directory and parsed output is placed to build_folder." +def parse_kconfig(): + "Execute parse_kconfig in linux_sources directory and parsed output is placed to build_folder." env = dict(os.environ) env['SRCARCH'] = conf.SRCARCH env['ARCH'] = conf.ARCH env['KERNELVERSION'] = 'KERNELVERSION' # hides error wd = os.getcwd() os.chdir(conf.linux_sources) - if conf.kconfig_parser_output: - subprocess.call([conf.kconfig_parser, conf.linux_kconfig_head, conf.build_folder, "-v", "-v"], env=env) + if conf.parse_kconfig_output: + subprocess.call([conf.parse_kconfig, conf.linux_kconfig_head, conf.build_folder, "-v", "-v"], env=env) else: - subprocess.call([conf.kconfig_parser, conf.linux_kconfig_head, conf.build_folder], env=env) + subprocess.call([conf.parse_kconfig, conf.linux_kconfig_head, conf.build_folder], env=env) os.chdir(wd) diff --git a/scripts/main_loop.py b/scripts/main_loop.py index 84f73d1..264ea31 100755 --- a/scripts/main_loop.py +++ b/scripts/main_loop.py @@ -23,7 +23,7 @@ def step(): phase.set(1) elif phs == 1: phase.message(1) - initialize.kconfig_parser() + initialize.parse_kconfig() initialize.gen_requred() iteration.reset() phase.set(2) diff --git a/scripts/solution.py b/scripts/solution.py index 99e8418..880b988 100644 --- a/scripts/solution.py +++ b/scripts/solution.py @@ -19,7 +19,7 @@ def generate(): """ # Check if rules_file exist. If it was generated. if not os.path.isfile(conf.rules_file): - raise Exception("Rules file missing. Run kconfig_parse and check ecistence of " + rules_file) + raise Exception("Rules file missing. Run parse_kconfig and check ecistence of " + rules_file) w_file = tempfile.NamedTemporaryFile(delete=False) # Join files to one single temporary file diff --git a/scripts/utils.py b/scripts/utils.py index 55ccb50..161ed8a 100644 --- a/scripts/utils.py +++ b/scripts/utils.py @@ -13,7 +13,7 @@ def build_symbol_map(): except NameError: # Check if symbol_map_file exist if not os.path.isfile(conf.symbol_map_file): - raise MissingFile(conf.symbol_map_file, "Run kconfig_parser to generate it.") + raise MissingFile(conf.symbol_map_file, "Run parse_kconfig to generate it.") smap = dict() with open(conf.symbol_map_file) as f: |