[Zope-Checkins] CVS: Zope/lib/python/App - ApplicationManager.py:1.78.52.1 FindHomes.py:1.9.20.1

[Matt Behrens]

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

Modified Files:
      Tag: zigg_unix-install-control-config-branch
	ApplicationManager.py FindHomes.py 
Log Message:
More progress:

- Rewrite the control script to not have any special knowledge of
  'create', to help maintain the divorce from what the software home's
  control package does.

- Add ZOPE_HOME, now that it's needed (to look at the default imports).

- A few more portability fixes (now working on Linux).

- Start to option-enable z2.py, though there is no code yet.



=== Zope/lib/python/App/ApplicationManager.py 1.78 => 1.78.52.1 ===
         return SOFTWARE_HOME
 
+    def getZOPE_HOME(self):
+        return ZOPE_HOME
+
     def getINSTANCE_HOME(self):
         return INSTANCE_HOME
 


=== Zope/lib/python/App/FindHomes.py 1.9 => 1.9.20.1 ===
 sys.modules['__builtin__'].SOFTWARE_HOME=SOFTWARE_HOME=home
 
+try: zhome=os.environ['ZOPE_HOME']
+except:
+    zhome=os.path.join(home, '..', '..')
+
+zhome=realpath(zhome)
+sys.modules['__builtin__'].ZOPE_HOME=ZOPE_HOME=zhome
+
 try:
     chome=os.environ['INSTANCE_HOME']
     chome = realpath(chome)