mturk 2002/09/25 01:04:00 Modified: jk/native2/server/apache13 mod_jk2.dsp Log: Add two new Configurations Debug APR and Release APR, enabling compiling using APR/APR-UTIL and JNI Revision Changes Path 1.2 +90 -2 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.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- mod_jk2.dsp 24 Sep 2002 13:27:03 -0000 1.1 +++ mod_jk2.dsp 25 Sep 2002 08:04:00 -0000 1.2 @@ -4,7 +4,7 @@ # TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102 -CFG=mod_jk2 - Win32 Debug +CFG=mod_jk2 - Win32 Debug APR !MESSAGE This is not a valid makefile. To build this project using NMAKE, !MESSAGE use the Export Makefile command and run !MESSAGE @@ -13,12 +13,14 @@ !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 "mod_jk2.mak" CFG="mod_jk2 - Win32 Debug" +!MESSAGE NMAKE /f "mod_jk2.mak" CFG="mod_jk2 - Win32 Debug APR" !MESSAGE !MESSAGE Possible choices for configuration are: !MESSAGE !MESSAGE "mod_jk2 - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library") !MESSAGE "mod_jk2 - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library") +!MESSAGE "mod_jk2 - Win32 Debug APR" (based on "Win32 (x86) Dynamic-Link Library") +!MESSAGE "mod_jk2 - Win32 Release APR" (based on "Win32 (x86) Dynamic-Link Library") !MESSAGE # Begin Project @@ -81,12 +83,68 @@ # 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 gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib ApacheCore.lib wsock32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept /libpath:"$(APACHE_HOME)\lib" /libpath:"$(APACHE2_HOME)\lib" +!ELSEIF "$(CFG)" == "mod_jk2 - Win32 Debug APR" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 1 +# PROP BASE Output_Dir "mod_jk2___Win32_Debug_APR" +# PROP BASE Intermediate_Dir "mod_jk2___Win32_Debug_APR" +# PROP BASE Ignore_Export_Lib 0 +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 1 +# PROP Output_Dir "DebugA" +# PROP Intermediate_Dir "DebugA" +# PROP Ignore_Export_Lib 0 +# PROP Target_Dir "" +# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\..\include" /I "$(APACHE_HOME)\include" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "SHARED_MODULE" /D "WIN32_LEAN_AND_MEAN" /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 "$(APACHE_HOME)\include" /I "$(APACHE2_HOME)\include" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "SHARED_MODULE" /D "WIN32_LEAN_AND_MEAN" /D "HAVE_JNI" /D "HAS_APR" /YX /FD /GZ /c +# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 +# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 +# ADD BASE RSC /l 0x41a /d "_DEBUG" +# ADD RSC /l 0x41a /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 ApacheCore.lib wsock32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept /libpath:"$(APACHE_HOME)\lib" /libpath:"$(APACHE2_HOME)\lib" +# ADD 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 ApacheCore.lib wsock32.lib libapr.lib libaprutil.lib /nologo /dll /debug /machine:I386 /pdbtype:sept /libpath:"$(APACHE_HOME)\lib" /libpath:"$(APACHE2_HOME)\lib" + +!ELSEIF "$(CFG)" == "mod_jk2 - Win32 Release APR" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 0 +# PROP BASE Output_Dir "mod_jk2___Win32_Release_APR" +# PROP BASE Intermediate_Dir "mod_jk2___Win32_Release_APR" +# PROP BASE Ignore_Export_Lib 0 +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 0 +# PROP Output_Dir "ReleaseA" +# PROP Intermediate_Dir "ReleaseA" +# PROP Ignore_Export_Lib 0 +# PROP Target_Dir "" +# ADD BASE CPP /nologo /MD /W3 /GX /O2 /I "..\..\include" /I "$(APACHE_HOME)\include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "SHARED_MODULE" /D "WIN32_LEAN_AND_MEAN" /YX /FD /c +# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\include" /I "$(JAVA_HOME)\include" /I "$(JAVA_HOME)\include\win32" /I "$(APACHE_HOME)\include" /I "$(APACHE2_HOME)\include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "SHARED_MODULE" /D "WIN32_LEAN_AND_MEAN" /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 0x41a /d "NDEBUG" +# ADD RSC /l 0x41a /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 ApacheCore.lib ws2_32.lib /nologo /dll /machine:I386 /libpath:"$(APACHE_HOME)\lib" /libpath:"$(APACHE2_HOME)\lib" +# ADD 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 ApacheCore.lib ws2_32.lib libapr.lib libaprutil.lib /nologo /dll /machine:I386 /libpath:"$(APACHE_HOME)\lib" /libpath:"$(APACHE2_HOME)\lib" + !ENDIF # Begin Target # Name "mod_jk2 - Win32 Release" # Name "mod_jk2 - Win32 Debug" +# Name "mod_jk2 - Win32 Debug APR" +# Name "mod_jk2 - Win32 Release APR" # Begin Group "Source Files" # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" @@ -136,6 +194,10 @@ # End Source File # Begin Source File +SOURCE=..\..\jni\jk_jni_aprImpl.c +# End Source File +# Begin Source File + SOURCE=..\..\common\jk_logger_file.c # End Source File # Begin Source File @@ -346,6 +408,10 @@ 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" @@ -366,6 +432,28 @@ # End Custom Build !ELSEIF "$(CFG)" == "mod_jk2 - Win32 Debug" + +# Begin Custom Build +InputDir=\WORK\apache\jakarta-tomcat-connectors\jk\native2\common +InputPath=..\..\common\jk_logger_win32_message.mc + +"..\..\common\jk_logger_win32_message.rc" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + mc -h $(InputDir) -r $(InputDir) $(InputPath) + +# End Custom Build + +!ELSEIF "$(CFG)" == "mod_jk2 - Win32 Debug APR" + +# Begin Custom Build +InputDir=\WORK\apache\jakarta-tomcat-connectors\jk\native2\common +InputPath=..\..\common\jk_logger_win32_message.mc + +"..\..\common\jk_logger_win32_message.rc" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + mc -h $(InputDir) -r $(InputDir) $(InputPath) + +# End Custom Build + +!ELSEIF "$(CFG)" == "mod_jk2 - Win32 Release APR" # Begin Custom Build InputDir=\WORK\apache\jakarta-tomcat-connectors\jk\native2\common
-- To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]> For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
