--- a/Admin/mira.py Thu Mar 24 23:14:49 2011 +0100
+++ b/Admin/mira.py Thu Mar 24 23:28:07 2011 +0100
@@ -97,8 +97,8 @@
def isabelle_dependency_only(env, case, paths, dep_paths, playground):
- p = paths[0]
- result = path.join(p, 'heaps')
+ isabelle_home = paths[0]
+ result = path.join(isabelle_home, 'heaps')
os.makedirs(result)
for dep_path in dep_paths:
subprocess.check_call(['cp', '-R'] + glob(dep_path + '/*') + [result])
@@ -108,26 +108,26 @@
def build_isabelle_image(subdir, base, img, env, case, paths, dep_paths, playground, more_settings=''):
- p = paths[0]
+ isabelle_home = paths[0]
dep_path = dep_paths[0]
prepare_isabelle_repository(p, env.settings.contrib, dep_path, more_settings=more_settings)
- os.chdir(path.join(p, 'src', subdir))
+ os.chdir(path.join(isabelle_home, 'src', subdir))
- (return_code, log) = isabelle_usedir(env, p, '-b', base, img)
+ (return_code, log) = isabelle_usedir(env, isabelle_home, '-b', base, img)
- result = path.join(p, 'heaps')
+ result = path.join(isabelle_home, 'heaps')
return (return_code == 0, extract_isabelle_run_summary(log),
{'timing': extract_isabelle_run_timing(log)}, {'log': log}, result)
def isabelle_makeall(env, case, paths, dep_paths, playground, more_settings='', target='all'):
- p = paths[0]
+ isabelle_home = paths[0]
dep_path = dep_paths[0]
- prepare_isabelle_repository(p, env.settings.contrib, dep_path, more_settings=more_settings)
- os.chdir(p)
+ prepare_isabelle_repository(isabelle_home, env.settings.contrib, dep_path, more_settings=more_settings)
+ os.chdir(isabelle_home)
- (return_code, log) = env.run_process('%s/bin/isabelle' % p, 'makeall', '-k', target)
+ (return_code, log) = env.run_process('%s/bin/isabelle' % isabelle_home, 'makeall', '-k', target)
return (return_code == 0, extract_isabelle_run_summary(log),
{'timing': extract_isabelle_run_timing(log)}, {'log': log}, None)
@@ -139,13 +139,13 @@
def Pure(env, case, paths, dep_paths, playground):
"""Pure image"""
- p = paths[0]
- prepare_isabelle_repository(p, env.settings.contrib, '')
- os.chdir(path.join(p, 'src', 'Pure'))
+ isabelle_home = paths[0]
+ prepare_isabelle_repository(isabelle_home, env.settings.contrib, '')
+ os.chdir(path.join(isabelle_home, 'src', 'Pure'))
- (return_code, log) = env.run_process('%s/bin/isabelle' % p, 'make', 'Pure')
+ (return_code, log) = env.run_process('%s/bin/isabelle' % isabelle_home, 'make', 'Pure')
- result = path.join(p, 'heaps')
+ result = path.join(isabelle_home, 'heaps')
return (return_code == 0, extract_isabelle_run_summary(log),
{'timing': extract_isabelle_run_timing(log)}, {'log': log}, result)