# HG changeset patch
# User haftmann
# Date 1341346163 -7200
# Node ID 221a17a97faba2be67e2c92a38554d4deb79a4f1
# Parent  ea1a8a93ba493d338516f65f62dbe64a4f57c05a
prefer hook in Admin/ to initialize components

diff -r ea1a8a93ba49 -r 221a17a97fab Admin/mira.py
--- a/Admin/mira.py	Tue Jul 03 21:51:16 2012 +0200
+++ b/Admin/mira.py	Tue Jul 03 22:09:23 2012 +0200
@@ -32,18 +32,6 @@
         raise IOError('Bad file: %s' % loc_contrib)
     subprocess.check_call(['ln', '-s', loc_contrib, '%s/contrib' % loc_isabelle])
 
-    components_registry = path.join(loc_isabelle, 'Admin', 'components')
-    if path.exists(components_registry):
-        components = []
-        for component in util.readfile_lines(components_registry):
-            loc_component = path.join(loc_isabelle, component)
-            if path.exists(loc_component):
-                components.append(loc_component)
-        writer = open(path.join(loc_isabelle, 'etc', 'components'), 'a')
-        for component in components:
-            writer.write(component + '\n')
-        writer.close()
-
     # provide existing dependencies
     if loc_dependency_heaps:
         isabelle_path = loc_dependency_heaps + '/$ISABELLE_IDENTIFIER:$ISABELLE_OUTPUT'
@@ -61,6 +49,8 @@
 
 Z3_NON_COMMERCIAL="yes"
 
+source "${ISABELLE_HOME}/Admin/init_components"
+
 %s
 ''' % (isabelle_path, usedir_options, more_settings)