Author: mturk
Date: Mon Nov 14 14:56:52 2011
New Revision: 1201734
URL: http://svn.apache.org/viewvc?rev=1201734&view=rev
Log:
Axe jni worker from build files, and remove jni build dependency
Modified:
tomcat/jk/trunk/native/apache-2.0/Makefile.vc
tomcat/jk/trunk/native/apache-2.0/mod_jk.dsp
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=1201734&r1=1201733&r2=1201734&view=diff
==============================================================================
--- tomcat/jk/trunk/native/apache-2.0/Makefile.vc (original)
+++ tomcat/jk/trunk/native/apache-2.0/Makefile.vc Mon Nov 14 14:56:52 2011
@@ -57,7 +57,6 @@ CLEAN :
-@erase "$(INTDIR)\jk_ajp_common.obj"
-@erase "$(INTDIR)\jk_connect.obj"
-@erase "$(INTDIR)\jk_context.obj"
- -@erase "$(INTDIR)\jk_jni_worker.obj"
-@erase "$(INTDIR)\jk_lb_worker.obj"
-@erase "$(INTDIR)\jk_map.obj"
-@erase "$(INTDIR)\jk_md5.obj"
@@ -96,7 +95,6 @@ LINK32_OBJS= \
"$(INTDIR)\jk_ajp_common.obj" \
"$(INTDIR)\jk_connect.obj" \
"$(INTDIR)\jk_context.obj" \
- "$(INTDIR)\jk_jni_worker.obj" \
"$(INTDIR)\jk_lb_worker.obj" \
"$(INTDIR)\jk_map.obj" \
"$(INTDIR)\jk_md5.obj" \
@@ -120,7 +118,7 @@ LINK32_OBJS= \
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
+CPP_PROJ=-nologo -MD -W3 -O2 -Ob2 -Oy- -Zi -EHsc /I "..\common" /I
"$(APACHE2_HOME)\include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /Fo"$(INTDIR)\\"
/Fd"$(INTDIR)\mod_jk_src" /FD /c
.c{$(INTDIR)}.obj::
$(CPP) @<<
@@ -209,12 +207,6 @@ SOURCE=..\common\jk_context.c
$(CPP) $(CPP_PROJ) $(SOURCE)
-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/apache-2.0/mod_jk.dsp
URL:
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/apache-2.0/mod_jk.dsp?rev=1201734&r1=1201733&r2=1201734&view=diff
==============================================================================
--- tomcat/jk/trunk/native/apache-2.0/mod_jk.dsp (original)
+++ tomcat/jk/trunk/native/apache-2.0/mod_jk.dsp Mon Nov 14 14:56:52 2011
@@ -45,7 +45,7 @@ RSC=rc.exe
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /MD /W3 /Zi /O2 /Oy- /D "WIN32" /D "NDEBUG" /D
"_WINDOWS" /FD /c
-# ADD CPP /nologo /MD /W3 /Zi /O2 /Oy- /I "..\common" /I
"$(JAVA_HOME)\include" /I "$(JAVA_HOME)\include\win32" /I
"$(APACHE2_HOME)\include" /I "$(APACHE2_HOME)\srclib\apr\include" /I
"$(APACHE2_HOME)\srclib\apr-util\include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS"
/D "HAVE_APR" /Fd"Release/mod_jk_src" /FD /c
+# ADD CPP /nologo /MD /W3 /Zi /O2 /Oy- /I "..\common" /I
"$(APACHE2_HOME)\include" /I "$(APACHE2_HOME)\srclib\apr\include" /I
"$(APACHE2_HOME)\srclib\apr-util\include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS"
/D "HAVE_APR" /Fd"Release/mod_jk_src" /FD /c
# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
# ADD BASE RSC /l 0x409 /d "NDEBUG"
@@ -71,7 +71,7 @@ LINK32=link.exe
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /MDd /W3 /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D
"_WINDOWS" /FD /c
-# ADD CPP /nologo /MDd /W3 /GX /Zi /Od /I "..\common" /I
"$(JAVA_HOME)\include" /I "$(JAVA_HOME)\include\win32" /I
"$(APACHE2_HOME)\include" /I "$(APACHE2_HOME)\srclib\apr\include" /I
"$(APACHE2_HOME)\srclib\apr-util\include" /D "_DEBUG" /D "WIN32" /D "_WINDOWS"
/D "HAVE_APR" /Fd"Debug/mod_jk_src" /FD /c
+# ADD CPP /nologo /MDd /W3 /GX /Zi /Od /I "..\common" /I
"$(APACHE2_HOME)\include" /I "$(APACHE2_HOME)\srclib\apr\include" /I
"$(APACHE2_HOME)\srclib\apr-util\include" /D "_DEBUG" /D "WIN32" /D "_WINDOWS"
/D "HAVE_APR" /Fd"Debug/mod_jk_src" /FD /c
# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
# ADD BASE RSC /l 0x409 /d "_DEBUG"
@@ -97,7 +97,7 @@ LINK32=link.exe
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /MD /W3 /Zi /O2 /Oy- /D "WIN32" /D "NDEBUG" /D
"_WINDOWS" /FD /c
-# ADD CPP /nologo /MD /W3 /Zi /O2 /Oy- /I "..\common" /I
"$(JAVA_HOME)\include" /I "$(JAVA_HOME)\include\win32" /I
"$(APACHE2_HOME)\include" /I "$(APACHE2_HOME)\srclib\apr\include" /I
"$(APACHE2_HOME)\srclib\apr-util\include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS"
/D "HAVE_APR" /Fd"Release22/mod_jk_src" /FD /c
+# ADD CPP /nologo /MD /W3 /Zi /O2 /Oy- /I "..\common" /I
"$(APACHE2_HOME)\include" /I "$(APACHE2_HOME)\srclib\apr\include" /I
"$(APACHE2_HOME)\srclib\apr-util\include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS"
/D "HAVE_APR" /Fd"Release22/mod_jk_src" /FD /c
# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
# ADD BASE RSC /l 0x409 /d "NDEBUG"
@@ -123,7 +123,7 @@ LINK32=link.exe
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /MDd /W3 /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D
"_WINDOWS" /FD /c
-# ADD CPP /nologo /MDd /W3 /GX /Zi /Od /I "..\common" /I
"$(JAVA_HOME)\include" /I "$(JAVA_HOME)\include\win32" /I
"$(APACHE2_HOME)\include" /I "$(APACHE2_HOME)\srclib\apr\include" /I
"$(APACHE2_HOME)\srclib\apr-util\include" /D "_DEBUG" /D "WIN32" /D "_WINDOWS"
/D "HAVE_APR" /Fd"Debug22/mod_jk_src" /FD /c
+# ADD CPP /nologo /MDd /W3 /GX /Zi /Od /I "..\common" /I
"$(APACHE2_HOME)\include" /I "$(APACHE2_HOME)\srclib\apr\include" /I
"$(APACHE2_HOME)\srclib\apr-util\include" /D "_DEBUG" /D "WIN32" /D "_WINDOWS"
/D "HAVE_APR" /Fd"Debug22/mod_jk_src" /FD /c
# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
# ADD BASE RSC /l 0x409 /d "_DEBUG"
@@ -180,10 +180,6 @@ SOURCE=..\common\jk_context.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
@@ -280,10 +276,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
