removed obsolete parameter for contrib dir; hard-coding is not a problem
authorkrauss
Wed Dec 19 10:51:46 2012 +0100 (2012-12-19)
changeset 505943f794789df0e
parent 50593 8372c8b59cea
child 50595 8bf60e7a6b6c
removed obsolete parameter for contrib dir; hard-coding is not a problem
Admin/mira.py
     1.1 --- a/Admin/mira.py	Wed Dec 19 10:45:56 2012 +0100
     1.2 +++ b/Admin/mira.py	Wed Dec 19 10:51:46 2012 +0100
     1.3 @@ -17,11 +17,11 @@
     1.4  
     1.5  # build and evaluation tools
     1.6  
     1.7 -def prepare_isabelle_repository(loc_isabelle, loc_contrib, loc_dependency_heaps,
     1.8 +def prepare_isabelle_repository(loc_isabelle, loc_dependency_heaps,
     1.9    usedir_options='', more_settings=''):
    1.10  
    1.11      # prepare components
    1.12 -    loc_contrib = path.expanduser(loc_contrib)
    1.13 +    loc_contrib = "/home/isabelle/contrib"
    1.14      if not path.exists(loc_contrib):
    1.15          raise IOError('Bad file: %s' % loc_contrib)
    1.16      subprocess.check_call(['ln', '-s', loc_contrib, '%s/contrib' % loc_isabelle])
    1.17 @@ -122,7 +122,7 @@
    1.18  ISABELLE_GHC="/usr/bin/ghc"
    1.19  '''
    1.20  
    1.21 -    prepare_isabelle_repository(isabelle_home, env.settings.contrib, None,
    1.22 +    prepare_isabelle_repository(isabelle_home, None,
    1.23        usedir_options="", more_settings=more_settings)
    1.24      os.chdir(isabelle_home)
    1.25  
    1.26 @@ -186,7 +186,7 @@
    1.27      more_settings = '''
    1.28  ISABELLE_GHC="/usr/bin/ghc"
    1.29  '''
    1.30 -    prepare_isabelle_repository(loc_isabelle, env.settings.contrib, dep_isabelle,
    1.31 +    prepare_isabelle_repository(loc_isabelle, dep_isabelle,
    1.32        more_settings = more_settings)
    1.33      os.chdir(loc_isabelle)
    1.34      
    1.35 @@ -260,7 +260,7 @@
    1.36      dep_path = dep_paths[0]
    1.37  
    1.38      os.chdir(path.join(playground, '..', base_path)) # Mirabelle requires specific cwd
    1.39 -    prepare_isabelle_repository(isa, env.settings.contrib, dep_path)
    1.40 +    prepare_isabelle_repository(isa, dep_path)
    1.41  
    1.42      output = {}
    1.43      success_rates = {}