[Zope-Checkins] CVS: Zope/lib/python/OFS - Application.py:1.185 ObjectManager.py:1.155

[Matt Behrens]

Update of /cvs-repository/Zope/lib/python/OFS
In directory cvs.zope.org:/tmp/cvs-serv18358/lib/python/OFS

Modified Files:
	Application.py ObjectManager.py 
Log Message:
Add support for ZOPE_HOME and a setup.py that is capable of installing
all Zope software, based on the work in the installer branch.

All tests still pass when built with python2.1 setup.py build_ext -i :-)



=== Zope/lib/python/OFS/Application.py 1.184 => 1.185 ===
        hasattr(app, '_Zope25_examples_have_been_added'):
 
-        examples_path = os.path.join(Globals.SOFTWARE_HOME, \
-             '..','..','import', 'Examples.zexp')
+        examples_path = os.path.join(Globals.ZOPE_HOME, \
+             'import', 'Examples.zexp')
 
         if os.path.isfile(examples_path):
             app._importObjectFromFile(examples_path, verify=0)


=== Zope/lib/python/OFS/ObjectManager.py 1.154 => 1.155 ===
 
         instance_home = INSTANCE_HOME
-        software_home = os.path.join(SOFTWARE_HOME, '..%s..' % os.sep)
-        software_home = os.path.normpath(software_home)
+        zope_home = ZOPE_HOME
         
-        for impath in (instance_home, software_home):
+        for impath in (instance_home, zope_home):
             filepath = os.path.join(impath, 'import', file)
             if os.path.exists(filepath):
                 break