# HG changeset patch # User krauss # Date 1355910706 -3600 # Node ID 3f794789df0e841bf9927ae09aca31723ca20879 # Parent 8372c8b59cea2904c8d880c8fc52cda3ffbb6cab removed obsolete parameter for contrib dir; hard-coding is not a problem diff -r 8372c8b59cea -r 3f794789df0e Admin/mira.py --- a/Admin/mira.py Wed Dec 19 10:45:56 2012 +0100 +++ b/Admin/mira.py Wed Dec 19 10:51:46 2012 +0100 @@ -17,11 +17,11 @@ # build and evaluation tools -def prepare_isabelle_repository(loc_isabelle, loc_contrib, loc_dependency_heaps, +def prepare_isabelle_repository(loc_isabelle, loc_dependency_heaps, usedir_options='', more_settings=''): # prepare components - loc_contrib = path.expanduser(loc_contrib) + loc_contrib = "/home/isabelle/contrib" if not path.exists(loc_contrib): raise IOError('Bad file: %s' % loc_contrib) subprocess.check_call(['ln', '-s', loc_contrib, '%s/contrib' % loc_isabelle]) @@ -122,7 +122,7 @@ ISABELLE_GHC="/usr/bin/ghc" ''' - prepare_isabelle_repository(isabelle_home, env.settings.contrib, None, + prepare_isabelle_repository(isabelle_home, None, usedir_options="", more_settings=more_settings) os.chdir(isabelle_home) @@ -186,7 +186,7 @@ more_settings = ''' ISABELLE_GHC="/usr/bin/ghc" ''' - prepare_isabelle_repository(loc_isabelle, env.settings.contrib, dep_isabelle, + prepare_isabelle_repository(loc_isabelle, dep_isabelle, more_settings = more_settings) os.chdir(loc_isabelle) @@ -260,7 +260,7 @@ dep_path = dep_paths[0] os.chdir(path.join(playground, '..', base_path)) # Mirabelle requires specific cwd - prepare_isabelle_repository(isa, env.settings.contrib, dep_path) + prepare_isabelle_repository(isa, dep_path) output = {} success_rates = {}