mturk 2004/12/23 05:28:00
Modified: jk/native/apache-1.3 mod_jk.dsp
jk/native/apache-2.0 mod_jk.dsp
jk/native/iis isapi.dsp
Log:
Used .pdb's like in Apache httpd. Patch provided by wrowe.
I did the patch for IIS in the same spirit.
Revision Changes Path
1.6 +6 -6 jakarta-tomcat-connectors/jk/native/apache-1.3/mod_jk.dsp
Index: mod_jk.dsp
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-connectors/jk/native/apache-1.3/mod_jk.dsp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- mod_jk.dsp 20 Jul 2001 15:10:26 -0000 1.5
+++ mod_jk.dsp 23 Dec 2004 13:28:00 -0000 1.6
@@ -42,8 +42,8 @@
# PROP Intermediate_Dir "Release"
# 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 "MOD_JK_EXPORTS" /YX /FD /c
-# ADD CPP /nologo /MT /W3 /GX /O2 /I "..\common" /I
"$(APACHE1_HOME)\src\include" /I "$(APACHE1_HOME)\src\os\win32" /I
"$(JAVA_HOME)\include" /I "$(JAVA_HOME)\include\win32" /D "WIN32" /D "NDEBUG"
/D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "MOD_JK_EXPORTS" /YX /FD /c
+# ADD BASE CPP /nologo /MD /W3 /O2 /Zi /D "WIN32" /D "NDEBUG" /D "_WINDOWS"
/D "_MBCS" /D "_USRDLL" /D "MOD_JK_EXPORTS" /FD /c
+# ADD CPP /nologo /MD /W3 /O2 /Zi /I "..\common" /I
"$(APACHE1_HOME)\include" /I "$(APACHE1_HOME)\src\include" /I
"$(APACHE1_HOME)\src\os\win32" /I "$(JAVA_HOME)\include" /I
"$(JAVA_HOME)\include\win32" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D
"_USRDLL" /D "MOD_JK_EXPORTS" /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"
@@ -53,7 +53,7 @@
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib
comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib
odbc32.lib odbccp32.lib /nologo /dll /machine:I386
-# ADD LINK32 ApacheCore.lib wsock32.lib kernel32.lib user32.lib gdi32.lib
winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib
uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386
/libpath:"$(APACHE1_HOME)\src\CoreR" /libpath:"$(APACHE1_HOME)\src\Release"
+# ADD LINK32 ApacheCore.lib wsock32.lib kernel32.lib user32.lib gdi32.lib
winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib
uuid.lib odbc32.lib odbccp32.lib /nologo /base:"0x6A6B0000" /subsystem:windows
/dll /incremental:no /debug /machine:I386 /out:"Release/mod_jk.so" /opt:ref
/libpath:"$(APACHE1_HOME)\libexec" /libpath:"$(APACHE1_HOME)\src\CoreR"
/libpath:"$(APACHE1_HOME)\src\Release"
!ELSEIF "$(CFG)" == "mod_jk - Win32 Debug"
@@ -68,8 +68,8 @@
# PROP Intermediate_Dir "Debug"
# 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 "MOD_JK_EXPORTS" /YX /FD /GZ /c
-# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "..\common" /I
"$(APACHE1_HOME)\src\include" /I "$(APACHE1_HOME)\src\os\win32" /I
"$(JAVA_HOME)\include" /I "$(JAVA_HOME)\include\win32" /D "WIN32" /D "_DEBUG"
/D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "MOD_JK_EXPORTS" /FR /YX /FD /GZ /c
+# ADD BASE CPP /nologo /MDd /W3 /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D
"_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "MOD_JK_EXPORTS" /FD /c
+# ADD CPP /nologo /MDd /W3 /GX /Zi /Od /I "..\common" /I
"$(APACHE1_HOME)\include" /I "$(APACHE1_HOME)\src\include" /I
"$(APACHE1_HOME)\src\os\win32" /I "$(JAVA_HOME)\include" /I
"$(JAVA_HOME)\include\win32" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D
"_USRDLL" /D "MOD_JK_EXPORTS" /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"
@@ -79,7 +79,7 @@
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib
comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib
odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 ApacheCore.lib wsock32.lib kernel32.lib user32.lib gdi32.lib
winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib
uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386
/pdbtype:sept /libpath:"$(APACHE1_HOME)\src\CoreD"
/libpath:"$(APACHE1_HOME)\src\Debug"
+# ADD LINK32 ApacheCore.lib wsock32.lib kernel32.lib user32.lib gdi32.lib
winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib
uuid.lib odbc32.lib odbccp32.lib /nologo /base:"0x6A6B0000" /subsystem:windows
/dll /incremental:no /debug /machine:I386 /out:"Debug/mod_jk2.so"
/libpath:"$(APACHE1_HOME)\libexec" /libpath:"$(APACHE1_HOME)\src\CoreD"
/libpath:"$(APACHE1_HOME)\src\Debug"
!ENDIF
1.7 +4 -4 jakarta-tomcat-connectors/jk/native/apache-2.0/mod_jk.dsp
Index: mod_jk.dsp
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-connectors/jk/native/apache-2.0/mod_jk.dsp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- mod_jk.dsp 16 Jan 2002 19:46:37 -0000 1.6
+++ mod_jk.dsp 23 Dec 2004 13:28:00 -0000 1.7
@@ -43,7 +43,7 @@
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /MD /W3 /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /FD
/c
-# ADD CPP /nologo /MD /W3 /O2 /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /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" /Fd"Release\mod_jk" /FD /c
+# ADD CPP /nologo /MD /W3 /Zi /O2 /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /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" /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"
@@ -53,7 +53,7 @@
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib advapi32.lib /nologo /dll
/machine:I386
-# ADD LINK32 libhttpd.lib libapr.lib libaprutil.lib kernel32.lib user32.lib
advapi32.lib wsock32.lib /nologo /dll /machine:I386
/libpath:"$(APACHE2_HOME)\Release"
/libpath:"$(APACHE2_HOME)\srclib\apr\Release"
/libpath:"$(APACHE2_HOME)\srclib\apr-util\Release"
/libpath:"$(APACHE2_HOME)\lib"
+# ADD LINK32 libhttpd.lib libapr.lib libaprutil.lib kernel32.lib user32.lib
advapi32.lib wsock32.lib /nologo /base:"0x6A6B0000" /subsystem:windows /dll
/incremental:no /debug /machine:I386 /out:"Release/mod_jk.so" /opt:ref
/libpath:"$(APACHE2_HOME)\Release"
/libpath:"$(APACHE2_HOME)\srclib\apr\Release"
/libpath:"$(APACHE2_HOME)\srclib\apr-util\Release"
/libpath:"$(APACHE2_HOME)\lib"
!ELSEIF "$(CFG)" == "apache - Win32 Debug"
@@ -69,7 +69,7 @@
# 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 /D "_DEBUG" /D "WIN32" /D "_WINDOWS"
/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" /Fd"Debug\mod_jk" /FD /c
+# ADD CPP /nologo /MDd /W3 /GX /Zi /Od /D "_DEBUG" /D "WIN32" /D "_WINDOWS"
/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" /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"
@@ -79,7 +79,7 @@
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib
comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib
odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 libhttpd.lib libapr.lib libaprutil.lib kernel32.lib user32.lib
advapi32.lib wsock32.lib /nologo /dll /debug /machine:I386
/libpath:"$(APACHE2_HOME)/Debug" /libpath:"$(APACHE2_HOME)\srclib\apr\Debug"
/libpath:"$(APACHE2_HOME)\srclib\apr-util\Debug" /libpath:"$(APACHE2_HOME)\lib"
+# ADD LINK32 libhttpd.lib libapr.lib libaprutil.lib kernel32.lib user32.lib
advapi32.lib wsock32.lib /nologo /base:"0x6A6B0000" /subsystem:windows /dll
/incremental:no /debug /machine:I386 /out:"Debug/mod_jk2.so"
/libpath:"$(APACHE2_HOME)/Debug" /libpath:"$(APACHE2_HOME)\srclib\apr\Debug"
/libpath:"$(APACHE2_HOME)\srclib\apr-util\Debug" /libpath:"$(APACHE2_HOME)\lib"
!ENDIF
1.10 +8 -8 jakarta-tomcat-connectors/jk/native/iis/isapi.dsp
Index: isapi.dsp
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/iis/isapi.dsp,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- isapi.dsp 9 Apr 2002 23:06:52 -0000 1.9
+++ isapi.dsp 23 Dec 2004 13:28:00 -0000 1.10
@@ -38,12 +38,12 @@
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "isapi_release"
-# PROP Intermediate_Dir "isapi_release"
+# PROP Output_Dir "Release"
+# PROP Intermediate_Dir "Release"
# 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 "ISAPI_EXPORTS" /YX /FD /c
-# ADD CPP /nologo /MT /W3 /GX /O2 /I "..\common" /I "$(JAVA_HOME)\include"
/I "$(JAVA_HOME)\include\win32" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS"
/D "_USRDLL" /D "ISAPI_EXPORTS" /D "HAVE_JNI" /FR /YX /FD /c
+# ADD CPP /nologo /MD /W3 /Zi /O2 /I "..\common" /I "$(JAVA_HOME)\include"
/I "$(JAVA_HOME)\include\win32" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D
"ISAPI_EXPORTS" /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"
@@ -53,7 +53,7 @@
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib
comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib
odbc32.lib odbccp32.lib /nologo /dll /machine:I386
-# ADD LINK32 wsock32.lib advapi32.lib /nologo /dll /machine:I386
/out:"isapi_release\isapi_redirect.dll"
+# ADD LINK32 wsock32.lib advapi32.lib /nologo /base:"0x6A6B0000" /dll /debug
/machine:I386 /out:"Release\isapi_redirect.dll"
!ELSEIF "$(CFG)" == "isapi - Win32 Debug"
@@ -64,12 +64,12 @@
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "isapi_debug"
-# PROP Intermediate_Dir "isapi_debug"
+# PROP Output_Dir "Debug"
+# PROP Intermediate_Dir "Debug"
# 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 "ISAPI_EXPORTS" /YX /FD /GZ /c
-# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "..\common" /I
"$(JAVA_HOME)\include" /I "$(JAVA_HOME)\include\win32" /D "WIN32" /D "_DEBUG"
/D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "ISAPI_EXPORTS" /FR /YX /FD /GZ /c
+# ADD CPP /nologo /MDd /W3 /GX /Zi /Od /I "..\common" /I
"$(JAVA_HOME)\include" /I "$(JAVA_HOME)\include\win32" /D "_DEBUG" /D "WIN32"
/D "_WINDOWS" /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"
@@ -79,7 +79,7 @@
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib
comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib
odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 wsock32.lib advapi32.lib /nologo /dll /debug /machine:I386
/out:"isapi_debug\isapi_redirect.dll" /pdbtype:sept
+# ADD LINK32 wsock32.lib advapi32.lib /nologo /base:"0x6A6B0000" /dll
/incremental:no /debug /machine:I386 /out:"Debug\isapi_redirect.dll"
!ENDIF
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
