Author: mturk
Date: Mon Nov 14 14:52:51 2011
New Revision: 1201733
URL: http://svn.apache.org/viewvc?rev=1201733&view=rev
Log:
Axe jni worker from build files, and remove jni build dependency
Modified:
tomcat/jk/trunk/native/iis/Makefile.amd64
tomcat/jk/trunk/native/iis/Makefile.ia64
tomcat/jk/trunk/native/iis/Makefile.x86
tomcat/jk/trunk/native/iis/isapi.dsp
Modified: tomcat/jk/trunk/native/iis/Makefile.amd64
URL:
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/iis/Makefile.amd64?rev=1201733&r1=1201732&r2=1201733&view=diff
==============================================================================
--- tomcat/jk/trunk/native/iis/Makefile.amd64 (original)
+++ tomcat/jk/trunk/native/iis/Makefile.amd64 Mon Nov 14 14:52:51 2011
@@ -57,7 +57,6 @@ CLEAN :
-@erase "$(INTDIR)\jk_connect.obj"
-@erase "$(INTDIR)\jk_context.obj"
-@erase "$(INTDIR)\jk_isapi_plugin.obj"
- -@erase "$(INTDIR)\jk_jni_worker.obj"
-@erase "$(INTDIR)\jk_lb_worker.obj"
-@erase "$(INTDIR)\jk_map.obj"
-@erase "$(INTDIR)\jk_md5.obj"
@@ -97,7 +96,6 @@ LINK32_OBJS= \
"$(INTDIR)\jk_connect.obj" \
"$(INTDIR)\jk_context.obj" \
"$(INTDIR)\jk_isapi_plugin.obj" \
- "$(INTDIR)\jk_jni_worker.obj" \
"$(INTDIR)\jk_lb_worker.obj" \
"$(INTDIR)\jk_map.obj" \
"$(INTDIR)\jk_md5.obj" \
@@ -121,7 +119,7 @@ LINK32_OBJS= \
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" /D "WIN32" /D "NDEBUG"
/D "_WINDOWS" /D "_AMD64_=1" -DWIN64 /D "_WIN64" /D "JK_ISAPI" /D
"ISAPI_EXPORTS" /D "HAS_PCRE" /D "PCRE_STATIC" $(CFLAGS) /Fo"$(INTDIR)\\"
/Fd"$(INTDIR)\isapi_redirector_src" /FD /c
+CPP_PROJ=-nologo -MD -W3 -O2 -Ob2 -Oy- -Zi -EHsc /I "..\common" /I "pcre" /D
"WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_AMD64_=1" -DWIN64 /D "_WIN64" /D
"JK_ISAPI" /D "ISAPI_EXPORTS" /D "HAS_PCRE" /D "PCRE_STATIC" $(CFLAGS)
/Fo"$(INTDIR)\\" /Fd"$(INTDIR)\isapi_redirector_src" /FD /c
.c{$(INTDIR)}.obj::
$(CPP) @<<
@@ -215,12 +213,6 @@ SOURCE=.\jk_isapi_plugin.c
"$(INTDIR)\jk_isapi_plugin.obj" : $(SOURCE) "$(INTDIR)"
-SOURCE=..\common\jk_jni_worker.c
-
-"$(INTDIR)\jk_jni_worker.obj" : $(SOURCE) "$(INTDIR)"
- $(CPP) $(CPP_PROJ) $(SOURCE)
-
-
SOURCE=..\common\jk_lb_worker.c
"$(INTDIR)\jk_lb_worker.obj" : $(SOURCE) "$(INTDIR)"
Modified: tomcat/jk/trunk/native/iis/Makefile.ia64
URL:
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/iis/Makefile.ia64?rev=1201733&r1=1201732&r2=1201733&view=diff
==============================================================================
--- tomcat/jk/trunk/native/iis/Makefile.ia64 (original)
+++ tomcat/jk/trunk/native/iis/Makefile.ia64 Mon Nov 14 14:52:51 2011
@@ -57,7 +57,6 @@ CLEAN :
-@erase "$(INTDIR)\jk_connect.obj"
-@erase "$(INTDIR)\jk_context.obj"
-@erase "$(INTDIR)\jk_isapi_plugin.obj"
- -@erase "$(INTDIR)\jk_jni_worker.obj"
-@erase "$(INTDIR)\jk_lb_worker.obj"
-@erase "$(INTDIR)\jk_map.obj"
-@erase "$(INTDIR)\jk_md5.obj"
@@ -97,7 +96,6 @@ LINK32_OBJS= \
"$(INTDIR)\jk_connect.obj" \
"$(INTDIR)\jk_context.obj" \
"$(INTDIR)\jk_isapi_plugin.obj" \
- "$(INTDIR)\jk_jni_worker.obj" \
"$(INTDIR)\jk_lb_worker.obj" \
"$(INTDIR)\jk_map.obj" \
"$(INTDIR)\jk_md5.obj" \
@@ -121,7 +119,7 @@ LINK32_OBJS= \
IF EXIST $(OUTDIR)\$(TARGET).manifest \
mt -nologo -manifest $(OUTDIR)\$(TARGET).manifest
-outputresource:$(OUTDIR)\$(TARGET).dll;2
-CPP_PROJ=-nologo -MD -W3 -O2 -Ob2 -Zi -EHsc /I "..\common" /I "pcre" /I
"$(JAVA_HOME)\include" /I "$(JAVA_HOME)\include\win32" /D "WIN32" /D "NDEBUG"
/D "_WINDOWS" /D "_IA64_=1" -DWIN64 /D "_WIN64" /D "JK_ISAPI" /D
"ISAPI_EXPORTS" /D "HAS_PCRE" /D "PCRE_STATIC" $(CFLAGS) /Fo"$(INTDIR)\\"
/Fd"$(INTDIR)\isapi_redirector_src" /FD /c
+CPP_PROJ=-nologo -MD -W3 -O2 -Ob2 -Zi -EHsc /I "..\common" /I "pcre" /D
"WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_IA64_=1" -DWIN64 /D "_WIN64" /D
"JK_ISAPI" /D "ISAPI_EXPORTS" /D "HAS_PCRE" /D "PCRE_STATIC" $(CFLAGS)
/Fo"$(INTDIR)\\" /Fd"$(INTDIR)\isapi_redirector_src" /FD /c
.c{$(INTDIR)}.obj::
$(CPP) @<<
@@ -215,12 +213,6 @@ SOURCE=.\jk_isapi_plugin.c
"$(INTDIR)\jk_isapi_plugin.obj" : $(SOURCE) "$(INTDIR)"
-SOURCE=..\common\jk_jni_worker.c
-
-"$(INTDIR)\jk_jni_worker.obj" : $(SOURCE) "$(INTDIR)"
- $(CPP) $(CPP_PROJ) $(SOURCE)
-
-
SOURCE=..\common\jk_lb_worker.c
"$(INTDIR)\jk_lb_worker.obj" : $(SOURCE) "$(INTDIR)"
Modified: tomcat/jk/trunk/native/iis/Makefile.x86
URL:
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/iis/Makefile.x86?rev=1201733&r1=1201732&r2=1201733&view=diff
==============================================================================
--- tomcat/jk/trunk/native/iis/Makefile.x86 (original)
+++ tomcat/jk/trunk/native/iis/Makefile.x86 Mon Nov 14 14:52:51 2011
@@ -51,7 +51,6 @@ CLEAN :
-@erase "$(INTDIR)\jk_connect.obj"
-@erase "$(INTDIR)\jk_context.obj"
-@erase "$(INTDIR)\jk_isapi_plugin.obj"
- -@erase "$(INTDIR)\jk_jni_worker.obj"
-@erase "$(INTDIR)\jk_lb_worker.obj"
-@erase "$(INTDIR)\jk_map.obj"
-@erase "$(INTDIR)\jk_md5.obj"
@@ -91,7 +90,6 @@ LINK32_OBJS= \
"$(INTDIR)\jk_connect.obj" \
"$(INTDIR)\jk_context.obj" \
"$(INTDIR)\jk_isapi_plugin.obj" \
- "$(INTDIR)\jk_jni_worker.obj" \
"$(INTDIR)\jk_lb_worker.obj" \
"$(INTDIR)\jk_map.obj" \
"$(INTDIR)\jk_md5.obj" \
@@ -115,7 +113,7 @@ LINK32_OBJS= \
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
+CPP_PROJ=-nologo -MD -W3 -O2 -Ob2 -Oy- -Zi -EHsc /I "..\common" /I "pcre"
$(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
.c{$(INTDIR)}.obj::
$(CPP) @<<
@@ -209,12 +207,6 @@ SOURCE=.\jk_isapi_plugin.c
"$(INTDIR)\jk_isapi_plugin.obj" : $(SOURCE) "$(INTDIR)"
-SOURCE=..\common\jk_jni_worker.c
-
-"$(INTDIR)\jk_jni_worker.obj" : $(SOURCE) "$(INTDIR)"
- $(CPP) $(CPP_PROJ) $(SOURCE)
-
-
SOURCE=..\common\jk_lb_worker.c
"$(INTDIR)\jk_lb_worker.obj" : $(SOURCE) "$(INTDIR)"
Modified: tomcat/jk/trunk/native/iis/isapi.dsp
URL:
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/iis/isapi.dsp?rev=1201733&r1=1201732&r2=1201733&view=diff
==============================================================================
--- tomcat/jk/trunk/native/iis/isapi.dsp (original)
+++ tomcat/jk/trunk/native/iis/isapi.dsp Mon Nov 14 14:52:51 2011
@@ -43,7 +43,7 @@ RSC=rc.exe
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D
"_MBCS" /D "_USRDLL" /D "JK_ISAPI" /D "ISAPI_EXPORTS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /Zi /O2 /I "..\common" /I "pcre" /I
"$(JAVA_HOME)\include" /I "$(JAVA_HOME)\include\win32" /D "WIN32" /D "NDEBUG"
/D "_WINDOWS" /D "JK_ISAPI" /D "ISAPI_EXPORTS" /D "HAS_PCRE" /D "PCRE_STATIC"
/Fd"Release/isapi_redirector_src" /FD /c
+# ADD CPP /nologo /MD /W3 /Zi /O2 /I "..\common" /I "pcre" /D "WIN32" /D
"NDEBUG" /D "_WINDOWS" /D "JK_ISAPI" /D "ISAPI_EXPORTS" /D "HAS_PCRE" /D
"PCRE_STATIC" /Fd"Release/isapi_redirector_src" /FD /c
# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
# ADD BASE RSC /l 0x809 /d "NDEBUG"
@@ -69,7 +69,7 @@ LINK32=link.exe
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D
"_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "JK_ISAPI" /D "ISAPI_EXPORTS" /YX /FD /GZ
/c
-# ADD CPP /nologo /MDd /W3 /GX /Zi /Od /I "..\common" /I "pcre" /I
"$(JAVA_HOME)\include" /I "$(JAVA_HOME)\include\win32" /D "_DEBUG" /D "WIN32"
/D "_WINDOWS" /D "JK_ISAPI" /D "ISAPI_EXPORTS" /D "HAS_PCRE" /D "PCRE_STATIC"
/Fd"Debug/isapi_redirector_src" /FD /c
+# ADD CPP /nologo /MDd /W3 /GX /Zi /Od /I "..\common" /I "pcre" /D "_DEBUG" /D
"WIN32" /D "_WINDOWS" /D "JK_ISAPI" /D "ISAPI_EXPORTS" /D "HAS_PCRE" /D
"PCRE_STATIC" /Fd"Debug/isapi_redirector_src" /FD /c
# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
# ADD BASE RSC /l 0x809 /d "_DEBUG"
@@ -132,10 +132,6 @@ SOURCE=.\jk_isapi_plugin.c
# End Source File
# Begin Source File
-SOURCE=..\common\jk_jni_worker.c
-# End Source File
-# Begin Source File
-
SOURCE=..\common\jk_lb_worker.c
# End Source File
# Begin Source File
@@ -232,10 +228,6 @@ SOURCE=..\common\jk_global.h
# End Source File
# Begin Source File
-SOURCE=..\common\jk_jni_worker.h
-# End Source File
-# Begin Source File
-
SOURCE=..\common\jk_lb_worker.h
# End Source File
# Begin Source File
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
