Author: mturk
Date: Fri Oct 22 06:35:25 2010
New Revision: 1026222
URL: http://svn.apache.org/viewvc?rev=1026222&view=rev
Log:
Use version suffix so that RM doesn't need to manually rename files for
distribution
Modified:
tomcat/jk/trunk/native/apache-2.0/Makefile.vc
tomcat/jk/trunk/native/iis/Makefile.x86
tomcat/jk/trunk/native/iis/jk_isapi_plugin.c
Modified: tomcat/jk/trunk/native/apache-2.0/Makefile.vc
URL:
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/apache-2.0/Makefile.vc?rev=1026222&r1=1026221&r2=1026222&view=diff
==============================================================================
--- tomcat/jk/trunk/native/apache-2.0/Makefile.vc (original)
+++ tomcat/jk/trunk/native/apache-2.0/Makefile.vc Fri Oct 22 06:35:25 2010
@@ -19,14 +19,17 @@ APU_LIB=libaprutil.lib
OUTDIR=.\Release20
INTDIR=.\Release20
APACHE2_HOME=$(APACHE20_HOME)
+HTTPD_VERSION=2.0.52
!ELSE
!IFDEF APACHE23_HOME
APACHE2_HOME=$(APACHE23_HOME)
OUTDIR=.\Release23
INTDIR=.\Release23
+HTTPD_VERSION=2.3.1
!ELSE
OUTDIR=.\Release22
INTDIR=.\Release22
+HTTPD_VERSION=2.2.3
!ENDIF
APR_LIB=libapr-1.lib
APU_LIB=libaprutil-1.lib
@@ -36,11 +39,13 @@ APU_LIB=libaprutil-1.lib
!ERROR Missing APACHE2_HOME environment variable.
!ENDIF
+JK_VERSION=1.2.31
+TARGET=mod_jk-$(JK_VERSION)-httpd-$(HTTPD_VERSION)
CPP=cl.exe
MTL=midl.exe
RSC=rc.exe
-ALL : "$(OUTDIR)\mod_jk.so"
+ALL : "$(OUTDIR)\$(TARGET).so"
CLEAN :
@@ -71,18 +76,18 @@ CLEAN :
-...@erase "$(INTDIR)\mod_jk_src.pdb"
-...@erase "$(OUTDIR)\mod_jk.exp"
-...@erase "$(OUTDIR)\mod_jk.lib"
- -...@erase "$(OUTDIR)\mod_jk.pdb"
- -...@erase "$(OUTDIR)\mod_jk.so"
+ -...@erase "$(OUTDIR)\$(TARGET).pdb"
+ -...@erase "$(OUTDIR)\$(TARGET).so"
"$(OUTDIR)" :
if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
BSC32=bscmake.exe
-BSC32_FLAGS=/nologo /o"$(OUTDIR)\mod_jk.bsc"
+BSC32_FLAGS=/nologo /o"$(OUTDIR)\$(TARGET).bsc"
BSC32_SBRS= \
LINK32=link.exe
-LINK32_FLAGS=libhttpd.lib $(APR_LIB) $(APU_LIB) kernel32.lib user32.lib
advapi32.lib mswsock.lib ws2_32.lib $(EXTRA_LIBS) /nologo /base:"0x6A6B0000"
/subsystem:windows /dll /incremental:no /pdb:"$(OUTDIR)\mod_jk.pdb" /debug
/machine:I386 /out:"$(OUTDIR)\mod_jk.so" /implib:"$(OUTDIR)\mod_jk.lib"
/libpath:"$(APACHE2_HOME)\lib" /opt:ref
+LINK32_FLAGS=libhttpd.lib $(APR_LIB) $(APU_LIB) kernel32.lib user32.lib
advapi32.lib mswsock.lib ws2_32.lib $(EXTRA_LIBS) /nologo /base:"0x6A6B0000"
/subsystem:windows /dll /incremental:no /pdb:"$(OUTDIR)\$(TARGET).pdb" /debug
/machine:I386 /out:"$(OUTDIR)\$(TARGET).so" /implib:"$(OUTDIR)\mod_jk.lib"
/libpath:"$(APACHE2_HOME)\lib" /opt:ref
LINK32_OBJS= \
"$(INTDIR)\jk_ajp12_worker.obj" \
"$(INTDIR)\jk_ajp13.obj" \
@@ -108,12 +113,12 @@ LINK32_OBJS= \
"$(INTDIR)\jk.res" \
"$(INTDIR)\mod_jk.obj"
-"$(OUTDIR)\mod_jk.so" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
+"$(OUTDIR)\$(TARGET).so" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
$(LINK32) @<<
$(LINK32_FLAGS) $(LINK32_OBJS)
<<
- @IF EXIST $(OUTDIR)\mod_jk.manifest \
- mt -nologo -manifest $(OUTDIR)\mod_jk.manifest
-outputresource:$(OUTDIR)\mod_jk.so;2
+ @IF EXIST $(OUTDIR)\$(TARGET).manifest \
+ mt -nologo -manifest $(OUTDIR)\$(TARGET).manifest
-outputresource:$(OUTDIR)\$(TARGET).so;2
CPP_PROJ=-nologo -MD -W3 -O2 -Ob2 -Oy- -Zi -EHsc /I "..\common" /I
"$(JAVA_HOME)\include" /I "$(JAVA_HOME)\include\win32" /I
"$(APACHE2_HOME)\include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /Fo"$(INTDIR)\\"
/Fd"$(INTDIR)\mod_jk_src" /FD /c
Modified: tomcat/jk/trunk/native/iis/Makefile.x86
URL:
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/iis/Makefile.x86?rev=1026222&r1=1026221&r2=1026222&view=diff
==============================================================================
--- tomcat/jk/trunk/native/iis/Makefile.x86 (original)
+++ tomcat/jk/trunk/native/iis/Makefile.x86 Fri Oct 22 06:35:25 2010
@@ -13,6 +13,9 @@
# See the License for the specific language governing permissions and
# limitations under the License.
+JK_VERSION=1.2.31
+TARGET=isapi_redirect-$(JK_VERSION)
+
CPP=cl.exe
MTL=midl.exe
RSC=rc.exe
@@ -24,11 +27,11 @@ OutDir=.\Release_x86
!IF "$(RECURSE)" == "0"
-ALL : "$(OUTDIR)\isapi_redirect.dll"
+ALL : "$(OUTDIR)\$(TARGET).dll"
!ELSE
-ALL : "pcre_x86" "$(OUTDIR)\isapi_redirect.dll"
+ALL : "pcre_x86" "$(OUTDIR)\$(TARGET).dll"
!ENDIF
@@ -63,10 +66,10 @@ CLEAN :
-...@erase "$(INTDIR)\jk_url.obj"
-...@erase "$(INTDIR)\jk_util.obj"
-...@erase "$(INTDIR)\jk_worker.obj"
- -...@erase "$(OUTDIR)\isapi_redirect.dll"
+ -...@erase "$(OUTDIR)\$(TARGET).dll"
-...@erase "$(OUTDIR)\isapi_redirect.exp"
-...@erase "$(OUTDIR)\isapi_redirect.lib"
- -...@erase "$(OUTDIR)\isapi_redirect.pdb"
+ -...@erase "$(OUTDIR)\$(TARGET).pdb"
"$(OUTDIR)" :
if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
@@ -76,7 +79,7 @@ BSC32_FLAGS=/nologo /o"$(OUTDIR)\isapi.b
BSC32_SBRS= \
LINK32=link.exe
-LINK32_FLAGS=kernel32.lib user32.lib advapi32.lib ws2_32.lib mswsock.lib
strsafe.lib $(EXTRA_LIBS) /nologo /base:"0x6A6B0000" /dll /incremental:no
/pdb:"$(OUTDIR)\isapi_redirect.pdb" /debug /machine:I386 /def:".\isapi.def"
/out:"$(OUTDIR)\isapi_redirect.dll" /implib:"$(OUTDIR)\isapi_redirect.lib"
+LINK32_FLAGS=kernel32.lib user32.lib advapi32.lib ws2_32.lib mswsock.lib
strsafe.lib $(EXTRA_LIBS) /nologo /base:"0x6A6B0000" /dll /incremental:no
/pdb:"$(OUTDIR)\$(TARGET).pdb" /debug /machine:I386 /def:".\isapi.def"
/out:"$(OUTDIR)\$(TARGET).dll" /implib:"$(OUTDIR)\isapi_redirect.lib"
DEF_FILE= \
".\isapi.def"
LINK32_OBJS= \
@@ -106,12 +109,12 @@ LINK32_OBJS= \
"$(INTDIR)\jk.res" \
".\pcre\Release_x86\pcre.lib"
-"$(OUTDIR)\isapi_redirect.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
+"$(OUTDIR)\$(TARGET).dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
$(LINK32) @<<
$(LINK32_FLAGS) $(LINK32_OBJS)
<<
- IF EXIST $(OUTDIR)\isapi_redirect.manifest \
- mt -nologo -manifest $(OUTDIR)\isapi_redirect.manifest
-outputresource:$(OUTDIR)\isapi_redirect.dll;2
+ IF EXIST $(OUTDIR)\$(TARGET).manifest \
+ mt -nologo -manifest $(OUTDIR)\$(TARGET).manifest
-outputresource:$(OUTDIR)\$(TARGET).dll;2
CPP_PROJ=-nologo -MD -W3 -O2 -Ob2 -Oy- -Zi -EHsc /I "..\common" /I "pcre" /I
"$(JAVA_HOME)\include" /I "$(JAVA_HOME)\include\win32" $(CFLAGS) /D "WIN32" /D
"NDEBUG" /D "_WINDOWS" /D "JK_ISAPI" /D "ISAPI_EXPORTS" /D "HAS_PCRE" /D
"PCRE_STATIC" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\isapi_redirector_src" /FD /c
Modified: tomcat/jk/trunk/native/iis/jk_isapi_plugin.c
URL:
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/iis/jk_isapi_plugin.c?rev=1026222&r1=1026221&r2=1026222&view=diff
==============================================================================
--- tomcat/jk/trunk/native/iis/jk_isapi_plugin.c (original)
+++ tomcat/jk/trunk/native/iis/jk_isapi_plugin.c Fri Oct 22 06:35:25 2010
@@ -26,9 +26,9 @@
// This define is needed to include wincrypt,h, needed to get client
certificates
#ifndef _WIN32_WINNT
-#define _WIN32_WINNT 0x0400
+#define _WIN32_WINNT 0x0500
#endif
-
+#include <winsock2.h>
#include <httpext.h>
#include <httpfilt.h>
#include <wininet.h>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
