[Zope3-checkins] SVN: Zope3/trunk/ support locating the software home on Windows as well

[Fred L. Drake, Jr.]

Log message for revision 24779:
support locating the software home on Windows as well


-=-
Modified: Zope3/trunk/bin/mkzopeinstance
===================================================================
--- Zope3/trunk/bin/mkzopeinstance	2004-05-17 17:32:20 UTC (rev 24778)
+++ Zope3/trunk/bin/mkzopeinstance	2004-05-17 17:46:34 UTC (rev 24779)
@@ -23,7 +23,7 @@
 here = os.path.dirname(os.path.realpath(__file__))
 swhome = os.path.dirname(here)
 
-for parts in [("src",), ("lib", "python")]:
+for parts in [("src",), ("lib", "python"), ("Lib",)]:
     d = os.path.join(swhome, *(parts + ("zope", "app", "process")))
     if os.path.isdir(d):
         d = os.path.join(swhome, *parts)

Modified: Zope3/trunk/src/zope/app/process/mkzopeinstance.py
===================================================================
--- Zope3/trunk/src/zope/app/process/mkzopeinstance.py	2004-05-17 17:32:20 UTC (rev 24778)
+++ Zope3/trunk/src/zope/app/process/mkzopeinstance.py	2004-05-17 17:46:34 UTC (rev 24779)
@@ -27,6 +27,8 @@
 import shutil
 import sys
 
+import zope
+
 from zope.app.applicationcontrol import zopeversion
 
 
@@ -107,7 +109,8 @@
         # XXX we should be able to compute the script
         script = os.path.abspath(sys.argv[0])
         zope_home = os.path.dirname(os.path.dirname(script))
-        software_home = os.path.join(zope_home, "lib", "python")
+        zope_init = os.path.abspath(zope.__file__)
+        software_home = os.path.dirname(os.path.dirname(zope_init))
         self.replacements = [
             ("<<USERNAME>>",      options.username),
             ("<<PASSWORD>>",      options.password),