[minion-cvs] Win32 fixes: Unit tests pass again, and py2exe and bdis...

[nickm@seul.org (Nick Mathewson)]

Update of /home/minion/cvsroot/src/minion
In directory moria.mit.edu:/tmp/cvs-serv6637

Modified Files:
	setup.py 
Log Message:
Win32 fixes: Unit tests pass again, and py2exe and bdist_wininst both
seem to work. The client looks happy: I have not a clue about the server.



Index: setup.py
===================================================================
RCS file: /home/minion/cvsroot/src/minion/setup.py,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -d -r1.82 -r1.83
--- setup.py	3 Dec 2003 23:10:08 -0000	1.82
+++ setup.py	4 Dec 2003 05:02:49 -0000	1.83
@@ -132,14 +132,19 @@
     STATIC_LIBS = []
     LIBRARY_DIRS = []
 
-    if (not os.path.exists(".\\contrib\\openssl\\include") or
-        not os.path.exists(".\\contrib\\openssl\\lib\\vc")):
+    incd = ".\\contrib\\OpenSSL\\include"
+    libd = ".\\contrib\\OpenSSL\\lib\\VC"
+
+    if os.path.exists(incd): INCLUDE_DIRS.append(incd)
+    if os.path.exists(incd.lower()): INCLUDE_DIRS.append(incd.lower())
+    if os.path.exists(libd): LIBRARY_DIRS.append(libd)
+    if os.path.exists(libd.lower()): LIBRARY_DIRS.append(libd.lower())
+
+    if not (INCLUDE_DIRS and LIBRARY_DIRS):
         print ("Can't find openssl: make sure that a compiled openssl "
-               "distribution is stored \nat .\\contrib\\openssl")
+               "distribution is stored \nat .\\contrib\\OpenSSL")
         sys.exit(1)
 
-    INCLUDE_DIRS.append(".\\contrib\\openssl\\include")
-    LIBRARY_DIRS.append(".\\contrib\\openssl\\lib\\vc")
     LIBRARIES = [ "ssleay32", "libeay32", "advapi32" ]
 
 elif USE_OPENSSL:
@@ -318,6 +323,8 @@
     pathextra = ""
 
 SCRIPT_PATH = os.path.join("build", "mixminion")
+if sys.platform == 'win32':
+    SCRIPT_PATH += ".py"
 if not os.path.exists("build"):
     os.mkdir("build")