cvs commit: jakarta-tomcat-connectors/jk/native2/jni jkjni.dsp
hgomez 2004/02/03 07:28:25 Modified:jk/native2/server/apache13 mod_jk2.dsp jk/native2/server/isapi isapi.dsp jk/native2/server/aolserver nsjk2.dsp jk/native2/jni jkjni.dsp Removed: jk/native2/common jk_channel_socket.c Log: Remove obsolete jk_channel_socket.c Revision ChangesPath 1.4 +0 -4 jakarta-tomcat-connectors/jk/native2/server/apache13/mod_jk2.dsp Index: mod_jk2.dsp === RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/server/apache13/mod_jk2.dsp,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- mod_jk2.dsp 3 May 2003 18:09:26 - 1.3 +++ mod_jk2.dsp 3 Feb 2004 15:28:25 - 1.4 @@ -162,10 +162,6 @@ # End Source File # Begin Source File -SOURCE=..\..\common\jk_channel_socket.c -# End Source File -# Begin Source File - SOURCE=..\..\common\jk_channel_un.c # End Source File # Begin Source File 1.23 +406 -410 jakarta-tomcat-connectors/jk/native2/server/isapi/isapi.dsp Index: isapi.dsp === RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/server/isapi/isapi.dsp,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- isapi.dsp 30 Oct 2003 20:14:33 - 1.22 +++ isapi.dsp 3 Feb 2004 15:28:25 - 1.23 @@ -1,410 +1,406 @@ -# Microsoft Developer Studio Project File - Name=isapi - Package Owner=4 -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** DO NOT EDIT ** - -# TARGTYPE Win32 (x86) Dynamic-Link Library 0x0102 - -CFG=isapi - Win32 Debug -!MESSAGE This is not a valid makefile. To build this project using NMAKE, -!MESSAGE use the Export Makefile command and run -!MESSAGE -!MESSAGE NMAKE /f isapi.mak. -!MESSAGE -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f isapi.mak CFG=isapi - Win32 Debug -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE isapi - Win32 Debug (based on Win32 (x86) Dynamic-Link Library) -!MESSAGE isapi - Win32 Release (based on Win32 (x86) Dynamic-Link Library) -!MESSAGE - -# Begin Project -# PROP AllowPerConfigDependencies 0 -# PROP Scc_ProjName -# PROP Scc_LocalPath -CPP=cl.exe -MTL=midl.exe -RSC=rc.exe - -!IF $(CFG) == isapi - Win32 Debug - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir DebugS -# PROP BASE Intermediate_Dir DebugS -# PROP BASE Ignore_Export_Lib 0 -# PROP BASE Target_Dir -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# 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 /I ..\..\include /I $(JAVA_HOME)\include /I $(JAVA_HOME)\include\win32 /I $(APACHE2_HOME)\include /I $(APACHE2_HOME)\os\win32 /D WIN32 /D _DEBUG /D _WINDOWS /D _MBCS /D _USRDLL /D ISAPI_EXPORTS /D HAVE_JNI /D HAS_APR /FR /YX /FD /GZ /c -# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I ..\..\include /I $(JAVA_HOME)\include /I $(JAVA_HOME)\include\win32 /I ..\..\srclib\apr\include /I ..\..\srclib\apr-util\include /I ..\..\srclib\apr-iconv\include /I ..\..\srclib\pcre /D _DEBUG /D APR_DECLARE_STATIC /D APU_DECLARE_STATIC /D API_DECLARE_STATIC /D WIN32 /D _WINDOWS /D _MBCS /D _USRDLL /D ISAPI_EXPORTS /D HAVE_JNI /D HAS_APR /D HAS_PCRE /FR /YX /FD /GZ /c -# ADD BASE MTL /nologo /D _DEBUG /mktyplib203 /win32 -# ADD MTL /nologo /D _DEBUG /mktyplib203 /win32 -# ADD BASE RSC /l 0x409 /d _DEBUG -# ADD RSC /l 0x409 /d _DEBUG -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 libapr.lib libaprutil.lib wsock32.lib advapi32.lib /nologo /dll /debug /machine:I386 /out:Debug/isapi_redirector2.dll /pdbtype:sept /libpath:$(APACHE2_HOME)\lib -# SUBTRACT BASE LINK32 /nodefaultlib -# ADD LINK32 apr.lib aprutil.lib apriconv.lib ws2_32.lib wsock32.lib advapi32.lib pcre.lib pcreposix.lib /nologo /dll /debug /machine:I386 /out:Debug/isapi_redirector2.dll /pdbtype:sept /libpath:..\..\srclib\apr\libD /libpath:..\..\srclib\apr-util\libD /libpath:..\..\srclib\apr-iconv\libD /libpath:..\..\srclib\pcre\libD -# SUBTRACT LINK32 /nodefaultlib - -!ELSEIF $(CFG) == isapi - Win32 Release - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir Release -# PROP BASE Intermediate_Dir Release -# PROP BASE Ignore_Export_Lib 0 -# PROP BASE Target_Dir -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir Release -# PROP Intermediate_Dir Release -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir -# ADD
cvs commit: jakarta-tomcat-connectors/jk/native2/jni jkjni.dsp
hgomez 2004/02/03 08:27:56 Modified:jk/native2/server/apache13 mod_jk2.dsp jk/native2/server/isapi isapi.dsp jk/native2/server/aolserver nsjk2.dsp jk/native2/jni jkjni.dsp Log: Remove ref to jk_pool.c (just removed by JFC). I win another beer ;) Revision ChangesPath 1.5 +0 -4 jakarta-tomcat-connectors/jk/native2/server/apache13/mod_jk2.dsp Index: mod_jk2.dsp === RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/server/apache13/mod_jk2.dsp,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- mod_jk2.dsp 3 Feb 2004 15:28:25 - 1.4 +++ mod_jk2.dsp 3 Feb 2004 16:27:56 - 1.5 @@ -234,10 +234,6 @@ # End Source File # Begin Source File -SOURCE=..\..\common\jk_pool.c -# End Source File -# Begin Source File - SOURCE=..\..\common\jk_pool_apr.c # End Source File # Begin Source File 1.24 +0 -4 jakarta-tomcat-connectors/jk/native2/server/isapi/isapi.dsp Index: isapi.dsp === RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/server/isapi/isapi.dsp,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- isapi.dsp 3 Feb 2004 15:28:25 - 1.23 +++ isapi.dsp 3 Feb 2004 16:27:56 - 1.24 @@ -192,10 +192,6 @@ # End Source File # Begin Source File -SOURCE=..\..\common\jk_pool.c -# End Source File -# Begin Source File - SOURCE=..\..\common\jk_pool_apr.c # End Source File # Begin Source File 1.3 +0 -4 jakarta-tomcat-connectors/jk/native2/server/aolserver/nsjk2.dsp Index: nsjk2.dsp === RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/server/aolserver/nsjk2.dsp,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- nsjk2.dsp 3 Feb 2004 15:28:25 - 1.2 +++ nsjk2.dsp 3 Feb 2004 16:27:56 - 1.3 @@ -296,10 +296,6 @@ # End Source File # Begin Source File -SOURCE=..\..\common\jk_pool.c -# End Source File -# Begin Source File - SOURCE=..\..\common\jk_pool_apr.c # End Source File # Begin Source File 1.7 +0 -4 jakarta-tomcat-connectors/jk/native2/jni/jkjni.dsp Index: jkjni.dsp === RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/jni/jkjni.dsp,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- jkjni.dsp 3 Feb 2004 15:28:25 - 1.6 +++ jkjni.dsp 3 Feb 2004 16:27:56 - 1.7 @@ -176,10 +176,6 @@ # End Source File # Begin Source File -SOURCE=..\common\jk_pool.c -# End Source File -# Begin Source File - SOURCE=..\common\jk_pool_apr.c # End Source File # Begin Source File - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native2/jni jkjni.dsp
nacho 2002/06/29 20:33:06 Modified:jk/native2/jni jkjni.dsp Log: * build jkjni not JKJni Revision ChangesPath 1.4 +363 -388 jakarta-tomcat-connectors/jk/native2/jni/jkjni.dsp Index: jkjni.dsp === RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/jni/jkjni.dsp,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- jkjni.dsp 12 Jun 2002 23:26:36 - 1.3 +++ jkjni.dsp 30 Jun 2002 03:33:06 - 1.4 @@ -1,388 +1,363 @@ -# Microsoft Developer Studio Project File - Name=Jni - Package Owner=4 -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** DO NOT EDIT ** - -# TARGTYPE Win32 (x86) Dynamic-Link Library 0x0102 - -CFG=Jni - Win32 Debug -!MESSAGE This is not a valid makefile. To build this project using NMAKE, -!MESSAGE use the Export Makefile command and run -!MESSAGE -!MESSAGE NMAKE /f JKJni.mak. -!MESSAGE -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f JKJni.mak CFG=Jni - Win32 Debug -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE Jni - Win32 Release (based on Win32 (x86) Dynamic-Link Library) -!MESSAGE Jni - Win32 Debug (based on Win32 (x86) Dynamic-Link Library) -!MESSAGE - -# Begin Project -# PROP AllowPerConfigDependencies 0 -# PROP Scc_ProjName -# PROP Scc_LocalPath -CPP=cl.exe -MTL=midl.exe -RSC=rc.exe - -!IF $(CFG) == Jni - Win32 Release - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir Release -# PROP BASE Intermediate_Dir Release -# PROP BASE Target_Dir -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# 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 JNI_EXPORTS /YX /FD /c -# ADD CPP /nologo /MT /W3 /GX /O2 /I ..\include /I $(JAVA_HOME)\include /I $(JAVA_HOME)\include\win32 /I $(APACHE2_HOME)\include /I $(APACHE2_HOME)\os\win32 /D WIN32 /D NDEBUG /D _WINDOWS /D _MBCS /D _USRDLL /D JNI_EXPORTS /D HAVE_JNI /D HAS_APR /YX /FD /c -# ADD BASE MTL /nologo /D NDEBUG /mktyplib203 /win32 -# ADD MTL /nologo /D NDEBUG /mktyplib203 /win32 -# ADD BASE RSC /l 0xc0a /d NDEBUG -# ADD RSC /l 0xc0a /d NDEBUG -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# 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 libapr.lib libaprutil.lib wsock32.lib advapi32.lib /nologo /dll /machine:I386 /libpath:$(APACHE2_HOME)\lib - -!ELSEIF $(CFG) == Jni - Win32 Debug - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir Jni___Win32_Debug -# PROP BASE Intermediate_Dir Jni___Win32_Debug -# PROP BASE Target_Dir -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# 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 JNI_EXPORTS /YX /FD /GZ /c -# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I ..\include /I $(JAVA_HOME)\include /I $(JAVA_HOME)\include\win32 /I $(APACHE2_HOME)\include /I $(APACHE2_HOME)\os\win32 /D WIN32 /D _DEBUG /D _WINDOWS /D _MBCS /D _USRDLL /D JNI_EXPORTS /D HAVE_JNI /D HAS_APR /FR /YX /FD /GZ /c -# ADD BASE MTL /nologo /D _DEBUG /mktyplib203 /win32 -# ADD MTL /nologo /D _DEBUG /mktyplib203 /win32 -# ADD BASE RSC /l 0xc0a /d _DEBUG -# ADD RSC /l 0x409 /d _DEBUG -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# 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 libapr.lib libaprutil.lib wsock32.lib advapi32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept /libpath:$(APACHE2_HOME)\lib - -!ENDIF - -# Begin Target - -# Name Jni - Win32 Release -# Name Jni - Win32 Debug -# Begin Group Source Files - -# PROP Default_Filter cpp;c;cxx;rc;def;r;odl;idl;hpj;bat -# Begin Source File - -SOURCE=..\common\jk_channel.c -# End Source File -# Begin Source File - -SOURCE=..\common\jk_channel_apr_socket.c -# End Source File -# Begin Source File - -SOURCE=..\common\jk_channel_jni.c -# End Source File -# Begin Source File -
cvs commit: jakarta-tomcat-connectors/jk/native2/jni jkjni.dsp
nacho 2002/06/12 16:26:36 Modified:jk/native2/server/isapi isapi.dsp jk/native2/server/apache2 mod_jk2.dsp jk/native2/jni jkjni.dsp Log: * Added jk_user and jk_signal to the win32 build Revision ChangesPath 1.16 +20 -12jakarta-tomcat-connectors/jk/native2/server/isapi/isapi.dsp Index: isapi.dsp === RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/server/isapi/isapi.dsp,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- isapi.dsp 9 Jun 2002 01:52:34 - 1.15 +++ isapi.dsp 12 Jun 2002 23:26:35 - 1.16 @@ -157,10 +157,6 @@ # End Source File # Begin Source File -SOURCE=..\..\common\jk_logger_win32_message.h -# End Source File -# Begin Source File - SOURCE=..\..\common\jk_map.c # End Source File # Begin Source File @@ -205,10 +201,6 @@ # End Source File # Begin Source File -SOURCE=..\..\common\jk_registry.h -# End Source File -# Begin Source File - SOURCE=..\..\common\jk_requtil.c # End Source File # Begin Source File @@ -221,6 +213,10 @@ # End Source File # Begin Source File +SOURCE=..\..\common\jk_signal.c +# End Source File +# Begin Source File + SOURCE=..\..\common\jk_uriEnv.c # End Source File # Begin Source File @@ -229,6 +225,10 @@ # End Source File # Begin Source File +SOURCE=..\..\common\jk_user.c +# End Source File +# Begin Source File + SOURCE=..\..\common\jk_vm_default.c # End Source File # Begin Source File @@ -255,10 +255,6 @@ SOURCE=..\..\common\jk_workerEnv.c # End Source File -# Begin Source File - -SOURCE=..\..\jni\org_apache_jk_apr_AprImpl.h -# End Source File # End Group # Begin Group Header Files @@ -297,6 +293,10 @@ # End Source File # Begin Source File +SOURCE=..\..\common\jk_logger_win32_message.h +# End Source File +# Begin Source File + SOURCE=..\..\include\jk_map.h # End Source File # Begin Source File @@ -321,6 +321,10 @@ # End Source File # Begin Source File +SOURCE=..\..\common\jk_registry.h +# End Source File +# Begin Source File + SOURCE=..\..\include\jk_requtil.h # End Source File # Begin Source File @@ -350,6 +354,10 @@ # Begin Source File SOURCE=..\..\include\jk_workerEnv.h +# End Source File +# Begin Source File + +SOURCE=..\..\jni\org_apache_jk_apr_AprImpl.h # End Source File # End Group # Begin Group Resource Files 1.3 +12 -0 jakarta-tomcat-connectors/jk/native2/server/apache2/mod_jk2.dsp Index: mod_jk2.dsp === RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/server/apache2/mod_jk2.dsp,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- mod_jk2.dsp 9 Jun 2002 01:53:50 - 1.2 +++ mod_jk2.dsp 12 Jun 2002 23:26:35 - 1.3 @@ -141,6 +141,10 @@ # End Source File # Begin Source File +SOURCE=..\..\jni\jk_jni_aprImpl.c +# End Source File +# Begin Source File + SOURCE=.\jk_logger_apache2.c # End Source File # Begin Source File @@ -213,11 +217,19 @@ # End Source File # Begin Source File +SOURCE=..\..\common\jk_signal.c +# End Source File +# Begin Source File + SOURCE=..\..\common\jk_uriEnv.c # End Source File # Begin Source File SOURCE=..\..\common\jk_uriMap.c +# End Source File +# Begin Source File + +SOURCE=..\..\common\jk_user.c # End Source File # Begin Source File 1.3 +8 -0 jakarta-tomcat-connectors/jk/native2/jni/jkjni.dsp Index: jkjni.dsp === RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/jni/jkjni.dsp,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- jkjni.dsp 9 Jun 2002 01:54:07 - 1.2 +++ jkjni.dsp 12 Jun 2002 23:26:36 - 1.3 @@ -200,11 +200,19 @@ # End Source File # Begin Source File +SOURCE=..\common\jk_signal.c +# End Source File +# Begin Source File + SOURCE=..\common\jk_uriEnv.c # End Source File # Begin Source File SOURCE=..\common\jk_uriMap.c +# End Source File +# Begin Source File + +SOURCE=..\common\jk_user.c # End Source File # Begin Source File -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native2/jni jkjni.dsp
nacho 2002/06/08 18:54:08 Modified:jk/native2/jni jkjni.dsp Log: * Fixed the release build * Added Message reources Revision ChangesPath 1.2 +94 -34jakarta-tomcat-connectors/jk/native2/jni/jkjni.dsp Index: jkjni.dsp === RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/jni/jkjni.dsp,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- jkjni.dsp 5 Jun 2002 22:27:34 - 1.1 +++ jkjni.dsp 9 Jun 2002 01:54:07 - 1.2 @@ -1,24 +1,24 @@ -# Microsoft Developer Studio Project File - Name=isapi - Package Owner=4 +# Microsoft Developer Studio Project File - Name=Jni - Package Owner=4 # Microsoft Developer Studio Generated Build File, Format Version 6.00 # ** DO NOT EDIT ** # TARGTYPE Win32 (x86) Dynamic-Link Library 0x0102 -CFG=isapi - Win32 Debug +CFG=Jni - Win32 Debug !MESSAGE This is not a valid makefile. To build this project using NMAKE, !MESSAGE use the Export Makefile command and run !MESSAGE -!MESSAGE NMAKE /f jkjni.mak. +!MESSAGE NMAKE /f JKJni.mak. !MESSAGE !MESSAGE You can specify a configuration when running NMAKE !MESSAGE by defining the macro CFG on the command line. For example: !MESSAGE -!MESSAGE NMAKE /f jkjni.mak CFG=isapi - Win32 Debug +!MESSAGE NMAKE /f JKJni.mak CFG=Jni - Win32 Debug !MESSAGE !MESSAGE Possible choices for configuration are: !MESSAGE -!MESSAGE isapi - Win32 Release (based on Win32 (x86) Dynamic-Link Library) -!MESSAGE isapi - Win32 Debug (based on Win32 (x86) Dynamic-Link Library) +!MESSAGE Jni - Win32 Release (based on Win32 (x86) Dynamic-Link Library) +!MESSAGE Jni - Win32 Debug (based on Win32 (x86) Dynamic-Link Library) !MESSAGE # Begin Project @@ -29,7 +29,7 @@ MTL=midl.exe RSC=rc.exe -!IF $(CFG) == isapi - Win32 Release +!IF $(CFG) == Jni - Win32 Release # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 0 @@ -42,25 +42,25 @@ # 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 ..\..\include /I $(JAVA_HOME)\include /I $(JAVA_HOME)\include\win32 /I $(APACHE20_HOME)\include /I $(APR_HOME)\apr\include /I $(APR_HOME)\apr-util\include /I $(APACHE20_HOME)\os\win32 /D WIN32 /D NDEBUG /D _WINDOWS /D _MBCS /D _USRDLL /D ISAPI_EXPORTS /YX /FD /c +# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D WIN32 /D NDEBUG /D _WINDOWS /D _MBCS /D _USRDLL /D JNI_EXPORTS /YX /FD /c +# ADD CPP /nologo /MT /W3 /GX /O2 /I ..\include /I $(JAVA_HOME)\include /I $(JAVA_HOME)\include\win32 /I $(APACHE2_HOME)\include /I $(APACHE2_HOME)\os\win32 /D WIN32 /D NDEBUG /D _WINDOWS /D _MBCS /D _USRDLL /D JNI_EXPORTS /D HAVE_JNI /D HAS_APR /YX /FD /c # ADD BASE MTL /nologo /D NDEBUG /mktyplib203 /win32 # ADD MTL /nologo /D NDEBUG /mktyplib203 /win32 # ADD BASE RSC /l 0xc0a /d NDEBUG -# ADD RSC /l 0x409 /d NDEBUG +# ADD RSC /l 0xc0a /d NDEBUG BSC32=bscmake.exe # ADD BASE BSC32 /nologo # 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 kernel32.lib user32.lib advapi32.lib wsock32.lib /nologo /dll /machine:I386 /out:Release/isapi_redirector2.dll +# ADD LINK32 libapr.lib libaprutil.lib wsock32.lib advapi32.lib /nologo /dll /machine:I386 /libpath:$(APACHE2_HOME)\lib -!ELSEIF $(CFG) == isapi - Win32 Debug +!ELSEIF $(CFG) == Jni - Win32 Debug # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir Debug -# PROP BASE Intermediate_Dir Debug +# PROP BASE Output_Dir Jni___Win32_Debug +# PROP BASE Intermediate_Dir Jni___Win32_Debug # PROP BASE Target_Dir # PROP Use_MFC 0 # PROP Use_Debug_Libraries 1 @@ -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 ISAPI_EXPORTS /YX /FD /GZ /c -# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I ..\..\include /I $(JAVA_HOME)\include /I $(JAVA_HOME)\include\win32 /I $(APACHE20_HOME)\include /I $(APR_HOME)\apr\include /I $(APR_HOME)\apr-util\include /I $(APACHE20_HOME)\os\win32 /D WIN32 /D _DEBUG /D _WINDOWS /D _MBCS /D _USRDLL /D ISAPI_EXPORTS /FR /YX /FD /GZ /c +# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D WIN32 /D _DEBUG /D _WINDOWS /D _MBCS /D _USRDLL /D JNI_EXPORTS /YX /FD /GZ /c +# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I ..\include /I $(JAVA_HOME)\include /I
cvs commit: jakarta-tomcat-connectors/jk/native2/jni jkjni.dsp
costin 2002/06/05 15:27:35 Added: jk/native2/jni jkjni.dsp Log: I don't know how Nacho missed this :-) A DSP to build libjkjni.dll, for MSVC users. Revision ChangesPath 1.1 jakarta-tomcat-connectors/jk/native2/jni/jkjni.dsp Index: jkjni.dsp === # Microsoft Developer Studio Project File - Name=isapi - Package Owner=4 # Microsoft Developer Studio Generated Build File, Format Version 6.00 # ** DO NOT EDIT ** # TARGTYPE Win32 (x86) Dynamic-Link Library 0x0102 CFG=isapi - Win32 Debug !MESSAGE This is not a valid makefile. To build this project using NMAKE, !MESSAGE use the Export Makefile command and run !MESSAGE !MESSAGE NMAKE /f jkjni.mak. !MESSAGE !MESSAGE You can specify a configuration when running NMAKE !MESSAGE by defining the macro CFG on the command line. For example: !MESSAGE !MESSAGE NMAKE /f jkjni.mak CFG=isapi - Win32 Debug !MESSAGE !MESSAGE Possible choices for configuration are: !MESSAGE !MESSAGE isapi - Win32 Release (based on Win32 (x86) Dynamic-Link Library) !MESSAGE isapi - Win32 Debug (based on Win32 (x86) Dynamic-Link Library) !MESSAGE # Begin Project # PROP AllowPerConfigDependencies 0 # PROP Scc_ProjName # PROP Scc_LocalPath CPP=cl.exe MTL=midl.exe RSC=rc.exe !IF $(CFG) == isapi - Win32 Release # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 0 # PROP BASE Output_Dir Release # PROP BASE Intermediate_Dir Release # PROP BASE Target_Dir # PROP Use_MFC 0 # PROP Use_Debug_Libraries 0 # 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 ..\..\include /I $(JAVA_HOME)\include /I $(JAVA_HOME)\include\win32 /I $(APACHE20_HOME)\include /I $(APR_HOME)\apr\include /I $(APR_HOME)\apr-util\include /I $(APACHE20_HOME)\os\win32 /D WIN32 /D NDEBUG /D _WINDOWS /D _MBCS /D _USRDLL /D ISAPI_EXPORTS /YX /FD /c # ADD BASE MTL /nologo /D NDEBUG /mktyplib203 /win32 # ADD MTL /nologo /D NDEBUG /mktyplib203 /win32 # ADD BASE RSC /l 0xc0a /d NDEBUG # ADD RSC /l 0x409 /d NDEBUG BSC32=bscmake.exe # ADD BASE BSC32 /nologo # 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 kernel32.lib user32.lib advapi32.lib wsock32.lib /nologo /dll /machine:I386 /out:Release/isapi_redirector2.dll !ELSEIF $(CFG) == isapi - Win32 Debug # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 1 # PROP BASE Output_Dir Debug # PROP BASE Intermediate_Dir Debug # PROP BASE Target_Dir # PROP Use_MFC 0 # PROP Use_Debug_Libraries 1 # 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 ..\..\include /I $(JAVA_HOME)\include /I $(JAVA_HOME)\include\win32 /I $(APACHE20_HOME)\include /I $(APR_HOME)\apr\include /I $(APR_HOME)\apr-util\include /I $(APACHE20_HOME)\os\win32 /D WIN32 /D _DEBUG /D _WINDOWS /D _MBCS /D _USRDLL /D ISAPI_EXPORTS /FR /YX /FD /GZ /c # ADD BASE MTL /nologo /D _DEBUG /mktyplib203 /win32 # ADD MTL /nologo /D _DEBUG /mktyplib203 /win32 # ADD BASE RSC /l 0xc0a /d _DEBUG # ADD RSC /l 0x409 /d _DEBUG BSC32=bscmake.exe # ADD BASE BSC32 /nologo # 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 kernel32.lib user32.lib advapi32.lib wsock32.lib /nologo /dll /debug /machine:I386 /out:Debug/isapi_redirector2.dll /pdbtype:sept # SUBTRACT LINK32 /nodefaultlib !ENDIF # Begin Target # Name isapi - Win32 Release # Name isapi - Win32 Debug # Begin Group Source Files # PROP Default_Filter cpp;c;cxx;rc;def;r;odl;idl;hpj;bat # Begin Source File SOURCE=..\common\jk_channel_apr_socket.c # End Source File # Begin Source File SOURCE=..\common\jk_channel_jni.c # End Source File # Begin Source File SOURCE=..\common\jk_channel_socket.c # End Source File # Begin Source File SOURCE=..\common\jk_config.c # End Source File # Begin Source File SOURCE=..\common\jk_config_registry.c # End Source File # Begin Source File SOURCE=..\common\jk_endpoint.c
