summaryrefslogtreecommitdiff
path: root/win32
diff options
context:
space:
mode:
Diffstat (limited to 'win32')
-rw-r--r--win32/ap22py26.mk44
-rw-r--r--win32/ap22py27.mk44
-rw-r--r--win32/ap22py31.mk42
-rw-r--r--win32/ap22py32.mk8
-rw-r--r--win32/ap22py33.mk8
-rw-r--r--win32/ap22py34.mk8
-rw-r--r--win32/ap24py26.mk8
-rw-r--r--win32/ap24py27.mk8
-rw-r--r--win32/ap24py32.mk8
-rw-r--r--win32/ap24py33.mk8
-rw-r--r--win32/ap24py34.mk8
-rw-r--r--win32/common.mk54
12 files changed, 128 insertions, 120 deletions
diff --git a/win32/ap22py26.mk b/win32/ap22py26.mk
index 99844f8..470881e 100644
--- a/win32/ap22py26.mk
+++ b/win32/ap22py26.mk
@@ -1,42 +1,8 @@
-CPPFLAGS = \
- /DWIN32 \
- /DNDEBUG \
- /I"c:\Program Files\Microsoft Visual Studio 9.0\VC\include" \
- /I"c:\Program Files\Microsoft SDKs\Windows\v6.0A\Include" \
- /I"c:\Program Files\Apache Software Foundation\Apache2.2\include" \
- /I"c:\Python26\include"
+APACHE_ROOTDIR = c:\Apache22
+APACHE_VERSION = 22
-CFLAGS = \
- /MD \
- /GF \
- /Gy \
- /O2 \
- /Wall \
- /Zc:wchar_t \
- /Zc:forScope
+PYTHON_ROOTDIR = c:\Python26
+PYTHON_VERSION = 26
-LDFLAGS = \
- /link \
- "/LIBPATH:c:\Program Files\Microsoft Visual Studio 9.0\VC\lib" \
- "/LIBPATH:c:\Program Files\Microsoft SDKs\Windows\v6.0A\Lib" \
- "/LIBPATH:c:\Program Files\Apache Software Foundation\Apache2.2\lib" \
- /LIBPATH:c:\Python26\libs \
- /OPT:REF \
- /OPT:ICF=2 \
- /RELEASE \
- /SUBSYSTEM:WINDOWS
+include common.mk
-LDLIBS = \
- python26.lib \
- libhttpd.lib \
- libapr-1.lib \
- libaprutil-1.lib
-
-SRCFILES = mod_wsgi.c wsgi_apache.c wsgi_convert.c wsgi_validate.c
-
-mod_wsgi.so : $(SRCFILES)
- cl $(CPPFLAGS) $(CFLAGS) $(SRCFILES) /LD $(LDFLAGS) $(LDLIBS) /OUT:$@
- mt -manifest $@.manifest -outputresource:$@;2
-
-clean :
- del *.obj *.so *.so.manifest *.lib *.exp
diff --git a/win32/ap22py27.mk b/win32/ap22py27.mk
index c85f4c6..9611d1b 100644
--- a/win32/ap22py27.mk
+++ b/win32/ap22py27.mk
@@ -1,42 +1,8 @@
-CPPFLAGS = \
- /DWIN32 \
- /DNDEBUG \
- /I"c:\Program Files\Microsoft Visual Studio 9.0\VC\include" \
- /I"c:\Program Files\Microsoft SDKs\Windows\v6.0A\Include" \
- /I"c:\Program Files\Apache Software Foundation\Apache2.2\include" \
- /I"c:\Python27\include"
+APACHE_ROOTDIR = c:\Apache22
+APACHE_VERSION = 22
-CFLAGS = \
- /MD \
- /GF \
- /Gy \
- /O2 \
- /Wall \
- /Zc:wchar_t \
- /Zc:forScope
+PYTHON_ROOTDIR = c:\Python27
+PYTHON_VERSION = 27
-LDFLAGS = \
- /link \
- "/LIBPATH:c:\Program Files\Microsoft Visual Studio 9.0\VC\lib" \
- "/LIBPATH:c:\Program Files\Microsoft SDKs\Windows\v6.0A\Lib" \
- "/LIBPATH:c:\Program Files\Apache Software Foundation\Apache2.2\lib" \
- /LIBPATH:c:\Python27\libs \
- /OPT:REF \
- /OPT:ICF=2 \
- /RELEASE \
- /SUBSYSTEM:WINDOWS
+include common.mk
-LDLIBS = \
- python27.lib \
- libhttpd.lib \
- libapr-1.lib \
- libaprutil-1.lib
-
-SRCFILES = mod_wsgi.c wsgi_apache.c wsgi_convert.c wsgi_validate.c
-
-mod_wsgi.so : $(SRCFILES)
- cl $(CPPFLAGS) $(CFLAGS) $(SRCFILES) /LD $(LDFLAGS) $(LDLIBS) /OUT:$@
- mt -manifest $@.manifest -outputresource:$@;2
-
-clean :
- del *.obj *.so *.so.manifest *.lib *.exp
diff --git a/win32/ap22py31.mk b/win32/ap22py31.mk
deleted file mode 100644
index 23e2ac6..0000000
--- a/win32/ap22py31.mk
+++ /dev/null
@@ -1,42 +0,0 @@
-CPPFLAGS = \
- /DWIN32 \
- /DNDEBUG \
- /I"c:\Program Files\Microsoft Visual Studio 9.0\VC\include" \
- /I"c:\Program Files\Microsoft SDKs\Windows\v6.0A\Include" \
- /I"c:\Program Files\Apache Software Foundation\Apache2.2\include" \
- /I"c:\Python31\include"
-
-CFLAGS = \
- /MD \
- /GF \
- /Gy \
- /O2 \
- /Wall \
- /Zc:wchar_t \
- /Zc:forScope
-
-LDFLAGS = \
- /link \
- "/LIBPATH:c:\Program Files\Microsoft Visual Studio 9.0\VC\lib" \
- "/LIBPATH:c:\Program Files\Microsoft SDKs\Windows\v6.0A\Lib" \
- "/LIBPATH:c:\Program Files\Apache Software Foundation\Apache2.2\lib" \
- /LIBPATH:c:\Python31\libs \
- /OPT:REF \
- /OPT:ICF=2 \
- /RELEASE \
- /SUBSYSTEM:WINDOWS
-
-LDLIBS = \
- python31.lib \
- libhttpd.lib \
- libapr-1.lib \
- libaprutil-1.lib
-
-SRCFILES = mod_wsgi.c wsgi_apache.c wsgi_convert.c wsgi_validate.c
-
-mod_wsgi.so : $(SRCFILES)
- cl $(CPPFLAGS) $(CFLAGS) $(SRCFILES) /LD $(LDFLAGS) $(LDLIBS) /OUT:$@
- mt -manifest $@.manifest -outputresource:$@;2
-
-clean :
- del *.obj *.so *.so.manifest *.lib *.exp
diff --git a/win32/ap22py32.mk b/win32/ap22py32.mk
new file mode 100644
index 0000000..80f13c8
--- /dev/null
+++ b/win32/ap22py32.mk
@@ -0,0 +1,8 @@
+APACHE_ROOTDIR = c:\Apache22
+APACHE_VERSION = 22
+
+PYTHON_ROOTDIR = c:\Python32
+PYTHON_VERSION = 32
+
+include common.mk
+
diff --git a/win32/ap22py33.mk b/win32/ap22py33.mk
new file mode 100644
index 0000000..d9ab722
--- /dev/null
+++ b/win32/ap22py33.mk
@@ -0,0 +1,8 @@
+APACHE_ROOTDIR = c:\Apache22
+APACHE_VERSION = 22
+
+PYTHON_ROOTDIR = c:\Python33
+PYTHON_VERSION = 33
+
+include common.mk
+
diff --git a/win32/ap22py34.mk b/win32/ap22py34.mk
new file mode 100644
index 0000000..bd4337e
--- /dev/null
+++ b/win32/ap22py34.mk
@@ -0,0 +1,8 @@
+APACHE_ROOTDIR = c:\Apache22
+APACHE_VERSION = 22
+
+PYTHON_ROOTDIR = c:\Python34
+PYTHON_VERSION = 34
+
+include common.mk
+
diff --git a/win32/ap24py26.mk b/win32/ap24py26.mk
new file mode 100644
index 0000000..e321fb1
--- /dev/null
+++ b/win32/ap24py26.mk
@@ -0,0 +1,8 @@
+APACHE_ROOTDIR = c:\Apache24
+APACHE_VERSION = 24
+
+PYTHON_ROOTDIR = c:\Python26
+PYTHON_VERSION = 26
+
+include common.mk
+
diff --git a/win32/ap24py27.mk b/win32/ap24py27.mk
new file mode 100644
index 0000000..389642c
--- /dev/null
+++ b/win32/ap24py27.mk
@@ -0,0 +1,8 @@
+APACHE_ROOTDIR = c:\Apache24
+APACHE_VERSION = 24
+
+PYTHON_ROOTDIR = c:\Python27
+PYTHON_VERSION = 27
+
+include common.mk
+
diff --git a/win32/ap24py32.mk b/win32/ap24py32.mk
new file mode 100644
index 0000000..549c2ca
--- /dev/null
+++ b/win32/ap24py32.mk
@@ -0,0 +1,8 @@
+APACHE_ROOTDIR = c:\Apache24
+APACHE_VERSION = 24
+
+PYTHON_ROOTDIR = c:\Python32
+PYTHON_VERSION = 32
+
+include common.mk
+
diff --git a/win32/ap24py33.mk b/win32/ap24py33.mk
new file mode 100644
index 0000000..e72a0be
--- /dev/null
+++ b/win32/ap24py33.mk
@@ -0,0 +1,8 @@
+APACHE_ROOTDIR = c:\Apache24
+APACHE_VERSION = 24
+
+PYTHON_ROOTDIR = c:\Python33
+PYTHON_VERSION = 33
+
+include common.mk
+
diff --git a/win32/ap24py34.mk b/win32/ap24py34.mk
new file mode 100644
index 0000000..2a2e8d2
--- /dev/null
+++ b/win32/ap24py34.mk
@@ -0,0 +1,8 @@
+APACHE_ROOTDIR = c:\Apache24
+APACHE_VERSION = 24
+
+PYTHON_ROOTDIR = c:\Python34
+PYTHON_VERSION = 34
+
+include common.mk
+
diff --git a/win32/common.mk b/win32/common.mk
new file mode 100644
index 0000000..42d0776
--- /dev/null
+++ b/win32/common.mk
@@ -0,0 +1,54 @@
+CPPFLAGS = \
+ /DWIN32 \
+ /DNDEBUG \
+ /I"$(APACHE_ROOTDIR)\include" \
+ /I"$(PYTHON_ROOTDIR)\include"
+
+CFLAGS = \
+ /MD \
+ /GF \
+ /Gy \
+ /O2 \
+ /Wall \
+ /Zc:wchar_t \
+ /Zc:forScope
+
+LDFLAGS = \
+ /link \
+ /LIBPATH:$(APACHE_ROOTDIR)\lib \
+ /LIBPATH:$(PYTHON_ROOTDIR)\libs \
+ /OPT:REF \
+ /OPT:ICF=2 \
+ /RELEASE \
+ /SUBSYSTEM:WINDOWS
+
+LDLIBS = \
+ python$(PYTHON_VERSION).lib \
+ libhttpd.lib \
+ libapr-1.lib \
+ libaprutil-1.lib
+
+SRCFILES = ../src/server/*.c
+
+mod_wsgi.so : $(SRCFILES)
+ cl $(CPPFLAGS) $(CFLAGS) $(SRCFILES) /LD $(LDFLAGS) $(LDLIBS) /OUT:$@
+ mt -manifest $@.manifest -outputresource:$@;2
+
+VARIANT = ap$(APACHE_VERSION)py$(PYTHON_VERSION)
+
+install : mod_wsgi.so
+ copy $? $(APACHE_ROOTDIR)\modules\mod_wsgi-$(VARIANT).so
+ :
+ :
+ :
+ :
+ : You now need to edit $(APACHE_ROOTDIR)/conf/httpd.conf and add:
+ :
+ : LoadModule wsgi_module modules/mod_wsgi-$(VARIANT).so
+ :
+ :
+ :
+ :
+
+clean :
+ del *.obj *.so *.so.manifest *.lib *.exp