Return-Path: Delivered-To: apmail-jakarta-tomcat-dev-archive@www.apache.org Received: (qmail 40076 invoked from network); 30 Oct 2003 20:14:44 -0000 Received: from daedalus.apache.org (HELO mail.apache.org) (208.185.179.12) by minotaur-2.apache.org with SMTP; 30 Oct 2003 20:14:44 -0000 Received: (qmail 23746 invoked by uid 500); 30 Oct 2003 20:14:24 -0000 Delivered-To: apmail-jakarta-tomcat-dev-archive@jakarta.apache.org Received: (qmail 23695 invoked by uid 500); 30 Oct 2003 20:14:24 -0000 Mailing-List: contact tomcat-dev-help@jakarta.apache.org; run by ezmlm Precedence: bulk List-Unsubscribe: List-Subscribe: List-Help: List-Post: List-Id: "Tomcat Developers List" Reply-To: "Tomcat Developers List" Delivered-To: mailing list tomcat-dev@jakarta.apache.org Received: (qmail 23667 invoked by uid 500); 30 Oct 2003 20:14:24 -0000 Received: (qmail 23663 invoked from network); 30 Oct 2003 20:14:24 -0000 Received: from unknown (HELO minotaur.apache.org) (209.237.227.194) by daedalus.apache.org with SMTP; 30 Oct 2003 20:14:24 -0000 Received: (qmail 40031 invoked by uid 1526); 30 Oct 2003 20:14:33 -0000 Date: 30 Oct 2003 20:14:33 -0000 Message-ID: <20031030201433.40030.qmail@minotaur.apache.org> From: mturk@apache.org To: jakarta-tomcat-connectors-cvs@apache.org Subject: cvs commit: jakarta-tomcat-connectors/jk/native2/server/isapi isapi.dsw isapi.dsp X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N X-Spam-Rating: minotaur-2.apache.org 1.6.2 0/1000/N mturk 2003/10/30 12:14:33 Modified: jk/native2/server/isapi isapi.dsp Added: jk/native2/server/isapi isapi.dsw Log: Allow to build the connector without need for a apache. apr, apr-utis, apr-iconv and pcre are presumed to be in the j-t-c/native2/srclib directory. Since we have official apr distributions those can be downloaded seprately. Revision Changes Path 1.22 +410 -490 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.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- isapi.dsp 22 Oct 2002 11:57:33 -0000 1.21 +++ isapi.dsp 30 Oct 2003 20:14:33 -0000 1.22 @@ -1,490 +1,410 @@ -# 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 Static -!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 Static" -!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 "isapi - Win32 Debug Static" (based on "Win32 (x86) Dynamic-Link Library") -!MESSAGE "isapi - Win32 Release Static" (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 /MD /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "ISAPI_EXPORTS" /YX /FD /c -# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\include" /I "$(JAVA_HOME)\include" /I "$(JAVA_HOME)\include\win32" /I "$(APACHE2_HOME)\include" /I "$(APACHE2_HOME)\os\win32" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "ISAPI_EXPORTS" /D "HAVE_JNI" /D "HAS_APR" /D "HAS_PCRE" /FR /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 libapr.lib libaprutil.lib wsock32.lib advapi32.lib pcre.lib pcreposix.lib /nologo /dll /machine:I386 /out:"Release/isapi_redirector2.dll" /libpath:"$(APACHE2_HOME)\lib" - -!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 "$(APACHE2_HOME)\include" /I "$(APACHE2_HOME)\os\win32" /D "_DEBUG" /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 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 pcre.lib pcreposix.lib /nologo /dll /debug /machine:I386 /out:"Debug/isapi_redirector2.dll" /pdbtype:sept /libpath:"$(APACHE2_HOME)\lib" -# SUBTRACT LINK32 /nodefaultlib - -!ELSEIF "$(CFG)" == "isapi - Win32 Debug Static" - -# 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 "DebugS" -# PROP Intermediate_Dir "DebugS" -# 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 "$(APACHE2_HOME)\include" /I "$(APACHE2_HOME)\os\win32" /D "_DEBUG" /D "APR_DECLARE_STATIC" /D "APU_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 ws2_32.lib wsock32.lib advapi32.lib pcre.lib pcreposix.lib /nologo /dll /debug /machine:I386 /out:"DebugS/isapi_redirector2.dll" /pdbtype:sept /libpath:"$(APACHE2_HOME)\lib" -# SUBTRACT LINK32 /nodefaultlib - -!ELSEIF "$(CFG)" == "isapi - Win32 Release Static" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "ReleaseS" -# PROP BASE Intermediate_Dir "ReleaseS" -# PROP BASE Ignore_Export_Lib 0 -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "ReleaseS" -# PROP Intermediate_Dir "ReleaseS" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /MD /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 "ISAPI_EXPORTS" /D "HAVE_JNI" /D "HAS_APR" /FR /YX /FD /c -# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\include" /I "$(JAVA_HOME)\include" /I "$(JAVA_HOME)\include\win32" /I "$(APACHE2_HOME)\include" /I "$(APACHE2_HOME)\os\win32" /D "NDEBUG" /D "_WIN32" /D "APR_DECLARE_STATIC" /D "APU_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 /c -# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 -# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 -# ADD BASE RSC /l 0x409 /d "NDEBUG" -# ADD RSC /l 0x409 /d "NDEBUG" -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 /machine:I386 /out:"Release/isapi_redirector2.dll" /libpath:"$(APACHE2_HOME)\lib" -# ADD LINK32 apr.lib aprutil.lib ws2_32.lib wsock32.lib advapi32.lib pcre.lib pcreposix.lib /nologo /dll /machine:I386 /out:"ReleaseS/isapi_redirector2.dll" /libpath:"$(APACHE2_HOME)\lib" - -!ENDIF - -# Begin Target - -# Name "isapi - Win32 Release" -# Name "isapi - Win32 Debug" -# Name "isapi - Win32 Debug Static" -# Name "isapi - Win32 Release Static" -# Begin Group "Source Files" - -# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" -# Begin Source File - -SOURCE=.\isapi.def -# End Source File -# 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 - -SOURCE=..\..\common\jk_channel_socket.c -# 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_file.c -# End Source File -# Begin Source File - -SOURCE=..\..\common\jk_endpoint.c -# End Source File -# Begin Source File - -SOURCE=..\..\common\jk_env.c -# End Source File -# Begin Source File - -SOURCE=..\..\common\jk_handler_logon.c -# End Source File -# Begin Source File - -SOURCE=..\..\common\jk_handler_response.c -# End Source File -# Begin Source File - -SOURCE=.\jk_iis_thread_pool.c -# End Source File -# Begin Source File - -SOURCE=.\jk_isapi_plugin.c -# 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 - -SOURCE=..\..\common\jk_logger_win32.c -# End Source File -# Begin Source File - -SOURCE=..\..\common\jk_map.c -# End Source File -# Begin Source File - -SOURCE=..\..\common\jk_md5.c -# End Source File -# Begin Source File - -SOURCE=..\..\common\jk_msg_ajp.c -# 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 - -SOURCE=..\..\common\jk_objCache.c -# 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 - -SOURCE=..\..\common\jk_registry.c -# End Source File -# Begin Source File - -SOURCE=..\..\common\jk_requtil.c -# End Source File -# Begin Source File - -SOURCE=.\jk_service_iis.c -# End Source File -# Begin Source File - -SOURCE=..\..\common\jk_shm.c -# 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 - -SOURCE=..\..\common\jk_vm_default.c -# End Source File -# Begin Source File - -SOURCE=..\..\common\jk_worker_ajp13.c -# End Source File -# Begin Source File - -SOURCE=..\..\common\jk_worker_jni.c -# End Source File -# Begin Source File - -SOURCE=..\..\common\jk_worker_lb.c -# End Source File -# Begin Source File - -SOURCE=..\..\common\jk_worker_run.c -# End Source File -# Begin Source File - -SOURCE=..\..\common\jk_worker_status.c -# End Source File -# Begin Source File - -SOURCE=..\..\common\jk_workerEnv.c -# End Source File -# End Group -# Begin Group "Header Files" - -# PROP Default_Filter "h;hpp;hxx;hm;inl" -# Begin Source File - -SOURCE=..\..\include\jk_channel.h -# End Source File -# Begin Source File - -SOURCE=..\..\include\jk_config.h -# End Source File -# Begin Source File - -SOURCE=..\..\include\jk_endpoint.h -# End Source File -# Begin Source File - -SOURCE=..\..\include\jk_env.h -# End Source File -# Begin Source File - -SOURCE=..\..\include\jk_global.h -# End Source File -# Begin Source File - -SOURCE=..\..\include\jk_handler.h -# End Source File -# Begin Source File - -SOURCE=.\jk_iis.h -# End Source File -# Begin Source File - -SOURCE=..\..\include\jk_logger.h -# 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 - -SOURCE=..\..\include\jk_md5.h -# End Source File -# Begin Source File - -SOURCE=..\..\include\jk_msg.h -# End Source File -# Begin Source File - -SOURCE=..\..\include\jk_mt.h -# End Source File -# Begin Source File - -SOURCE=..\..\include\jk_objCache.h -# End Source File -# Begin Source File - -SOURCE=..\..\include\jk_pool.h -# 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 - -SOURCE=..\..\include\jk_service.h -# End Source File -# Begin Source File - -SOURCE=..\..\include\jk_shm.h -# End Source File -# Begin Source File - -SOURCE=..\..\include\jk_uriEnv.h -# End Source File -# Begin Source File - -SOURCE=..\..\include\jk_uriMap.h -# End Source File -# Begin Source File - -SOURCE=..\..\include\jk_vm.h -# End Source File -# Begin Source File - -SOURCE=..\..\include\jk_worker.h -# End Source File -# 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" - -# 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)" == "isapi - Win32 Release" - -# Begin Custom Build - Creating resources from $(InputPath) -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)" == "isapi - Win32 Debug" - -# PROP Ignore_Default_Tool 1 -# Begin Custom Build - Creating resources from $(InputPath) -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)" == "isapi - Win32 Debug Static" - -# PROP BASE Ignore_Default_Tool 1 -# PROP Ignore_Default_Tool 1 -# Begin Custom Build - Creating resources from $(InputPath) -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)" == "isapi - Win32 Release Static" - -# Begin Custom Build - Creating resources from $(InputPath) -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 - -!ENDIF - -# End Source File -# Begin Source File - -SOURCE=..\..\common\jk_logger_win32_message.rc -# End Source File -# End Group -# End Target -# End Project +# 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 BASE CPP /nologo /MD /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 "ISAPI_EXPORTS" /D "HAVE_JNI" /D "HAS_APR" /FR /YX /FD /c +# ADD CPP /nologo /MD /W3 /GX /O2 /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 "NDEBUG" /D "_WIN32" /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 /c +# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 +# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 +# ADD BASE RSC /l 0x409 /d "NDEBUG" +# ADD RSC /l 0x409 /d "NDEBUG" +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 /machine:I386 /out:"Release/isapi_redirector2.dll" /libpath:"$(APACHE2_HOME)\lib" +# ADD LINK32 apr.lib aprutil.lib apriconv.lib ws2_32.lib wsock32.lib advapi32.lib pcre.lib pcreposix.lib /nologo /dll /machine:I386 /out:"Release/isapi_redirector2.dll" /libpath:"..\..\srclib\apr\libR" /libpath:"..\..\srclib\apr-util\libR" /libpath:"..\..\srclib\apr-iconv\libR" /libpath:"..\..\srclib\pcre\libD" + +!ENDIF + +# Begin Target + +# Name "isapi - Win32 Debug" +# Name "isapi - Win32 Release" +# Begin Group "Source Files" + +# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" +# Begin Source File + +SOURCE=.\isapi.def +# End Source File +# 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 + +SOURCE=..\..\common\jk_channel_socket.c +# 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_file.c +# End Source File +# Begin Source File + +SOURCE=..\..\common\jk_endpoint.c +# End Source File +# Begin Source File + +SOURCE=..\..\common\jk_env.c +# End Source File +# Begin Source File + +SOURCE=..\..\common\jk_handler_logon.c +# End Source File +# Begin Source File + +SOURCE=..\..\common\jk_handler_response.c +# End Source File +# Begin Source File + +SOURCE=.\jk_iis_thread_pool.c +# End Source File +# Begin Source File + +SOURCE=.\jk_isapi_plugin.c +# 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 + +SOURCE=..\..\common\jk_logger_win32.c +# End Source File +# Begin Source File + +SOURCE=..\..\common\jk_map.c +# End Source File +# Begin Source File + +SOURCE=..\..\common\jk_md5.c +# End Source File +# Begin Source File + +SOURCE=..\..\common\jk_msg_ajp.c +# 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 + +SOURCE=..\..\common\jk_objCache.c +# 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 + +SOURCE=..\..\common\jk_registry.c +# End Source File +# Begin Source File + +SOURCE=..\..\common\jk_requtil.c +# End Source File +# Begin Source File + +SOURCE=.\jk_service_iis.c +# End Source File +# Begin Source File + +SOURCE=..\..\common\jk_shm.c +# 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 + +SOURCE=..\..\common\jk_vm_default.c +# End Source File +# Begin Source File + +SOURCE=..\..\common\jk_worker_ajp13.c +# End Source File +# Begin Source File + +SOURCE=..\..\common\jk_worker_jni.c +# End Source File +# Begin Source File + +SOURCE=..\..\common\jk_worker_lb.c +# End Source File +# Begin Source File + +SOURCE=..\..\common\jk_worker_run.c +# End Source File +# Begin Source File + +SOURCE=..\..\common\jk_worker_status.c +# End Source File +# Begin Source File + +SOURCE=..\..\common\jk_workerEnv.c +# End Source File +# End Group +# Begin Group "Header Files" + +# PROP Default_Filter "h;hpp;hxx;hm;inl" +# Begin Source File + +SOURCE=..\..\include\jk_channel.h +# End Source File +# Begin Source File + +SOURCE=..\..\include\jk_config.h +# End Source File +# Begin Source File + +SOURCE=..\..\include\jk_endpoint.h +# End Source File +# Begin Source File + +SOURCE=..\..\include\jk_env.h +# End Source File +# Begin Source File + +SOURCE=..\..\include\jk_global.h +# End Source File +# Begin Source File + +SOURCE=..\..\include\jk_handler.h +# End Source File +# Begin Source File + +SOURCE=.\jk_iis.h +# End Source File +# Begin Source File + +SOURCE=..\..\include\jk_logger.h +# 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 + +SOURCE=..\..\include\jk_md5.h +# End Source File +# Begin Source File + +SOURCE=..\..\include\jk_msg.h +# End Source File +# Begin Source File + +SOURCE=..\..\include\jk_mt.h +# End Source File +# Begin Source File + +SOURCE=..\..\include\jk_objCache.h +# End Source File +# Begin Source File + +SOURCE=..\..\include\jk_pool.h +# 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 + +SOURCE=..\..\include\jk_service.h +# End Source File +# Begin Source File + +SOURCE=..\..\include\jk_shm.h +# End Source File +# Begin Source File + +SOURCE=..\..\include\jk_uriEnv.h +# End Source File +# Begin Source File + +SOURCE=..\..\include\jk_uriMap.h +# End Source File +# Begin Source File + +SOURCE=..\..\include\jk_vm.h +# End Source File +# Begin Source File + +SOURCE=..\..\include\jk_worker.h +# End Source File +# 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" + +# 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)" == "isapi - Win32 Debug" + +# PROP BASE Ignore_Default_Tool 1 +# PROP Ignore_Default_Tool 1 +# Begin Custom Build - Creating resources from $(InputPath) +InputDir=\WORK\PROJECTS\apache\jk2\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)" == "isapi - Win32 Release" + +# Begin Custom Build - Creating resources from $(InputPath) +InputDir=\WORK\PROJECTS\apache\jk2\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 1.1 jakarta-tomcat-connectors/jk/native2/server/isapi/isapi.dsw Index: isapi.dsw =================================================================== Microsoft Developer Studio Workspace File, Format Version 6.00 # WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE! ############################################################################### Project: "apr"=..\..\srclib\apr\apr.dsp - Package Owner=<4> Package=<5> {{{ }}} Package=<4> {{{ }}} ############################################################################### Project: "apriconv"="..\..\srclib\apr-iconv\apriconv.dsp" - Package Owner=<4> Package=<5> {{{ }}} Package=<4> {{{ }}} ############################################################################### Project: "aprutil"="..\..\srclib\apr-util\aprutil.dsp" - Package Owner=<4> Package=<5> {{{ }}} Package=<4> {{{ Begin Project Dependency Project_Dep_Name gen_uri_delims End Project Dependency }}} ############################################################################### Project: "dftables"=..\..\srclib\pcre\dftables.dsp - Package Owner=<4> Package=<5> {{{ }}} Package=<4> {{{ }}} ############################################################################### Project: "gen_uri_delims"="..\..\srclib\apr-util\uri\gen_uri_delims.dsp" - Package Owner=<4> Package=<5> {{{ }}} Package=<4> {{{ }}} ############################################################################### Project: "isapi"=.\isapi.dsp - Package Owner=<4> Package=<5> {{{ }}} Package=<4> {{{ }}} ############################################################################### Project: "pcre"=..\..\srclib\pcre\pcre.dsp - Package Owner=<4> Package=<5> {{{ }}} Package=<4> {{{ Begin Project Dependency Project_Dep_Name dftables End Project Dependency Begin Project Dependency Project_Dep_Name pcreposix End Project Dependency }}} ############################################################################### Project: "pcreposix"=..\..\srclib\pcre\pcreposix.dsp - Package Owner=<4> Package=<5> {{{ }}} Package=<4> {{{ }}} ############################################################################### Project: "xml"="..\..\srclib\apr-util\xml\expat\lib\xml.dsp" - Package Owner=<4> Package=<5> {{{ }}} Package=<4> {{{ }}} ############################################################################### Global: Package=<5> {{{ }}} Package=<3> {{{ }}} ############################################################################### --------------------------------------------------------------------- To unsubscribe, e-mail: tomcat-dev-unsubscribe@jakarta.apache.org For additional commands, e-mail: tomcat-dev-help@jakarta.apache.org