nacho 2002/06/08 18:54:08 Modified: jk/native2/jni jkjni.dsp Log: * Fixed the "release" build * Added Message reources Revision Changes Path 1.2 +94 -34 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.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- jkjni.dsp 5 Jun 2002 22:27:34 -0000 1.1 +++ jkjni.dsp 9 Jun 2002 01:54:07 -0000 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 "$(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" @@ -79,20 +79,23 @@ # 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 +# 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 "isapi - Win32 Release" -# Name "isapi - Win32 Debug" +# 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 @@ -105,11 +108,15 @@ # End Source File # Begin Source File +SOURCE=..\common\jk_channel_un.c +# End Source File +# Begin Source File + SOURCE=..\common\jk_config.c # End Source File # Begin Source File -SOURCE=..\common\jk_config_registry.c +SOURCE=..\common\jk_config_file.c # End Source File # Begin Source File @@ -137,6 +144,10 @@ # End Source File # Begin Source File +SOURCE=..\common\jk_logger_win32.c +# End Source File +# Begin Source File + SOURCE=..\common\jk_map.c # End Source File # Begin Source File @@ -149,6 +160,18 @@ # End Source File # Begin Source File +SOURCE=..\common\jk_mutex.c +# End Source File +# Begin Source File + +SOURCE=..\common\jk_mutex_proc.c +# End Source File +# Begin Source File + +SOURCE=..\common\jk_mutex_thread.c +# End Source File +# Begin Source File + SOURCE=..\common\jk_nwmain.c # End Source File # Begin Source File @@ -169,10 +192,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 @@ -197,10 +216,6 @@ # End Source File # Begin Source File -SOURCE=..\common\jk_worker_ctl.c -# End Source File -# Begin Source File - SOURCE=..\common\jk_worker_jni.c # End Source File # Begin Source File @@ -219,16 +234,16 @@ SOURCE=..\common\jk_workerEnv.c # End Source File -# Begin Source File - -SOURCE=.\org_apache_jk_apr_AprImpl.h -# End Source File # End Group # Begin Group "Header Files" # PROP Default_Filter "h;hpp;hxx;hm;inl" # Begin Source File +SOURCE=..\include\jk_bean.h +# End Source File +# Begin Source File + SOURCE=..\include\jk_channel.h # End Source File # Begin Source File @@ -257,6 +272,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 @@ -269,7 +288,7 @@ # End Source File # Begin Source File -SOURCE=..\include\jk_mt.h +SOURCE=..\include\jk_mutex.h # End Source File # Begin Source File @@ -281,6 +300,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 @@ -311,10 +334,47 @@ SOURCE=..\include\jk_workerEnv.h # End Source File +# Begin Source File + +SOURCE=.\org_apache_jk_apr_AprImpl.h +# End Source File # End Group # Begin Group "Resource Files" # PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe" +# Begin Source File + +SOURCE=..\common\jk_logger_win32_message.mc + +!IF "$(CFG)" == "Jni - Win32 Release" + +# Begin Custom Build - Creating resources from $(InputPath) +InputDir=\tomcat\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)" == "Jni - Win32 Debug" + +# Begin Custom Build - Creating resources from $(InputPath) +InputDir=\tomcat\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 + +!ENDIF + +# End Source File +# Begin Source File + +SOURCE=..\common\jk_logger_win32_message.rc +# End Source File # End Group # End Target # End Project
-- To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]> For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
