[minion-cvs] Start making stuff work on win32 -- much more work need...

[nickm@seul.org (Nick Mathewson)]

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

Modified Files:
	TODO setup.py 
Log Message:
Start making stuff work on win32 -- much more work needed, but at least it builds and passes all but 5 tests

Index: TODO
===================================================================
RCS file: /home/minion/cvsroot/src/minion/TODO,v
retrieving revision 1.130
retrieving revision 1.131
diff -u -d -r1.130 -r1.131
--- TODO	7 Jul 2003 19:27:15 -0000	1.130
+++ TODO	10 Jul 2003 20:01:30 -0000	1.131
@@ -25,7 +25,7 @@
                 o Shutdown faster on SIGTERM.
         . Background projects:
                 o Port to cygwin
-                - Start win32 port
+                . Start win32 port
                 o Twisted port decision
                 - Website, FAQ
         o Initial support for email headers (server side)

Index: setup.py
===================================================================
RCS file: /home/minion/cvsroot/src/minion/setup.py,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -d -r1.67 -r1.68
--- setup.py	8 Jul 2003 19:33:44 -0000	1.67
+++ setup.py	10 Jul 2003 20:01:30 -0000	1.68
@@ -124,7 +124,18 @@
       )
 ======================================================================"""
 
-if USE_OPENSSL:
+if USE_OPENSSL and sys.platform == 'win32':
+    INCLUDE_DIRS = []
+    STATIC_LIBS = []
+    LIBRARY_DIRS = []
+    
+    # WWWW Right now, this is hardwired to my openssl installation.
+    INCLUDE_DIRS.append("d:\\openssl\\include")
+    LIBRARY_DIRS.append("D:\\openssl\\lib\\vc")
+
+    LIBRARIES = [ "ssleay32", "libeay32" ]
+
+elif USE_OPENSSL:
     # For now, we assume that openssl-0.9.7 isn't generally deployed, so we
     # need to look carefully.
 
@@ -403,12 +414,16 @@
 
 INCLUDE_DIRS.append("src")
 
+EXTRA_CFLAGS = []
+if sys.platform != 'win32':
+    EXTRA_CFLAGS += [ '-Wno-strict-prototypes' ]
+
 extmodule = Extension(
     "mixminion._minionlib",
     ["src/crypt.c", "src/aes_ctr.c", "src/main.c", "src/tls.c", "src/fec.c" ],
     include_dirs=INCLUDE_DIRS,
     extra_objects=STATIC_LIBS,
-    extra_compile_args=["-Wno-strict-prototypes"]+OPENSSL_CFLAGS,
+    extra_compile_args=EXTRA_CFLAGS + OPENSSL_CFLAGS,
     extra_link_args=OPENSSL_LDFLAGS,
     library_dirs=LIBRARY_DIRS,
     libraries=LIBRARIES,