>wrowe 2005/05/12 12:28:03
>
> Modified: jni/native libtcnative.dsp libtcnative.dsw tcnative.dsp
> jni/native/build win32ver.awk
> jni/native/src shm.c ssl.c
> Log:
> Fix more ^M polution, whitespace changes, only.
>
> Revision Changes Path
> 1.6 +218 -218 jakarta-tomcat-connectors/jni/native/libtcnative.dsp
>
> Index: libtcnative.dsp
> ===================================================================
> RCS file: /home/cvs/jakarta-tomcat-connectors/jni/native/libtcnative.dsp,v
> retrieving revision 1.5
> retrieving revision 1.6
> diff -u -r1.5 -r1.6
> --- libtcnative.dsp 3 Feb 2005 07:48:56 -0000 1.5
> +++ libtcnative.dsp 12 May 2005 19:28:03 -0000 1.6
> @@ -1,218 +1,218 @@
> -# Microsoft Developer Studio Project File - Name="libtcnative" - Package
> Owner=<4>
> -# Microsoft Developer Studio Generated Build File, Format Version 6.00
> -# ** DO NOT EDIT **
> -
> -# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
> -
> -CFG=libtcnative - 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 "libtcnative.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 "libtcnative.mak" CFG="libtcnative - Win32 Debug"
> -!MESSAGE
> -!MESSAGE Possible choices for configuration are:
> -!MESSAGE
> -!MESSAGE "libtcnative - Win32 Release" (based on "Win32 (x86) Dynamic-Link
> Library")
> -!MESSAGE "libtcnative - 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)" == "libtcnative - 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 /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /FD
> /c
> -# ADD CPP /nologo /MD /W3 /Zi /O2 /I "./include" /I "../apr/include" /I
> "../apr/include/arch/win32" /I "$(JAVA_HOME)/include" /I
> "$(JAVA_HOME)/include/win32" /I "../openssl/inc32" /D "NDEBUG" /D
> "TCN_DECLARE_EXPORT" /D "WIN32" /D "_WINDOWS" /D "WIN32_LEAN_AND_MEAN" /D
> "NO_IDEA" /D "NO_RC5" /D "NO_MDC2" /D "OPENSSL_NO_IDEA" /D "OPENSSL_NO_RC5"
> /D "OPENSSL_NO_MDC2" /D "HAVE_OPENSSL" /D HAVE_SSL_SET_STATE=1
> /Fd"Release\libtcnative_src" /FD /c
> -# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o /win32 "NUL"
> -# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o /win32 "NUL"
> -# 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 kernel32.lib advapi32.lib ws2_32.lib mswsock.lib
> wldap32.lib psapi.lib ole32.lib /nologo /base:"0x6EE00000" /subsystem:windows
> /dll /debug /machine:I386 /opt:ref
> -# ADD LINK32 kernel32.lib advapi32.lib ws2_32.lib mswsock.lib wldap32.lib
> psapi.lib ole32.lib libeay32.lib ssleay32.lib /nologo /base:"0x6EE00000"
> /subsystem:windows /dll /debug /machine:I386 /out:"Release/libtcnative-1.dll"
> /libpath:"../openssl/out32dll" /libpath:"../openssl/out32" /opt:ref
> -
> -!ELSEIF "$(CFG)" == "libtcnative - 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 /MDd /W3 /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D
> "_WINDOWS" /FD /c
> -# ADD CPP /nologo /MDd /W4 /GX /Zi /Od /I "./include" /I "../apr/include"
> /I "../apr/include/arch/win32" /I "$(JAVA_HOME)/include" /I
> "$(JAVA_HOME)/include/win32" /I "../openssl/inc32" /D "_DEBUG" /D
> "TCN_DECLARE_EXPORT" /D "WIN32" /D "_WINDOWS" /D "WIN32_LEAN_AND_MEAN" /D
> "NO_IDEA" /D "NO_RC5" /D "NO_MDC2" /D "OPENSSL_NO_IDEA" /D "OPENSSL_NO_RC5"
> /D "OPENSSL_NO_MDC2" /D "HAVE_OPENSSL" /D HAVE_SSL_SET_STATE=1
> /Fd"Debug\libtcnative_src" /FD /c
> -# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o /win32 "NUL"
> -# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o /win32 "NUL"
> -# 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 kernel32.lib advapi32.lib ws2_32.lib mswsock.lib
> wldap32.lib psapi.lib ole32.lib /nologo /base:"0x6EE00000" /subsystem:windows
> /dll /incremental:no /debug /machine:I386
> -# ADD LINK32 kernel32.lib advapi32.lib ws2_32.lib mswsock.lib wldap32.lib
> psapi.lib ole32.lib libeay32.lib ssleay32.lib /nologo /base:"0x6EE00000"
> /subsystem:windows /dll /incremental:no /debug /machine:I386
> /out:"Debug/libtcnative-1.dll" /libpath:"../openssl/out32dll"
> /libpath:"../openssl/out32"
> -
> -!ENDIF
> -
> -# Begin Target
> -
> -# Name "libtcnative - Win32 Release"
> -# Name "libtcnative - Win32 Debug"
> -# Begin Group "Source Files"
> -
> -# PROP Default_Filter ""
> -# Begin Source File
> -
> -SOURCE=.\src\dir.c
> -# End Source File
> -# Begin Source File
> -
> -SOURCE=.\src\error.c
> -# End Source File
> -# Begin Source File
> -
> -SOURCE=.\src\file.c
> -# End Source File
> -# Begin Source File
> -
> -SOURCE=.\src\info.c
> -# End Source File
> -# Begin Source File
> -
> -SOURCE=.\src\jnilib.c
> -# End Source File
> -# Begin Source File
> -
> -SOURCE=.\src\lock.c
> -# End Source File
> -# Begin Source File
> -
> -SOURCE=.\src\misc.c
> -# End Source File
> -# Begin Source File
> -
> -SOURCE=.\src\mmap.c
> -# End Source File
> -# Begin Source File
> -
> -SOURCE=.\src\network.c
> -# End Source File
> -# Begin Source File
> -
> -SOURCE=.\src\poll.c
> -# End Source File
> -# Begin Source File
> -
> -SOURCE=.\src\pool.c
> -# End Source File
> -# Begin Source File
> -
> -SOURCE=.\src\proc.c
> -# End Source File
> -# Begin Source File
> -
> -SOURCE=.\src\shm.c
> -# End Source File
> -# Begin Source File
> -
> -SOURCE=.\src\ssl.c
> -# End Source File
> -# Begin Source File
> -
> -SOURCE=.\src\stdlib.c
> -# End Source File
> -# Begin Source File
> -
> -SOURCE=.\src\user.c
> -# End Source File
> -# End Group
> -# Begin Group "Generated Files"
> -
> -# PROP Default_Filter ""
> -# End Group
> -# Begin Group "Header Files"
> -
> -# PROP Default_Filter ""
> -# Begin Source File
> -
> -SOURCE=.\include\tcn.h
> -# End Source File
> -# Begin Source File
> -
> -SOURCE=.\include\tcn_version.h
> -# End Source File
> -# End Group
> -# Begin Group "Platform Files"
> -
> -# PROP Default_Filter ""
> -# Begin Source File
> -
> -SOURCE=.\os\win32\system.c
> -# End Source File
> -# End Group
> -# Begin Source File
> -
> -SOURCE=.\libtcnative.rc
> -# End Source File
> -# Begin Source File
> -
> -SOURCE=.\build\win32ver.awk
> -
> -!IF "$(CFG)" == "libtcnative - Win32 Release"
> -
> -# PROP Ignore_Default_Tool 1
> -USERDEP__WIN32="./include/tcn_version.h"
> -# Begin Custom Build - Creating Version Resource
> -InputPath=.\build\win32ver.awk
> -
> -".\libtcnative.rc" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
> - awk -f ./build/win32ver.awk libtcnative-1.dll "Tomcat Native Java
> Library" ./include/tcn_version.h > .\libtcnative.rc
> -
> -# End Custom Build
> -
> -!ELSEIF "$(CFG)" == "libtcnative - Win32 Debug"
> -
> -# PROP Ignore_Default_Tool 1
> -USERDEP__WIN32="./include/tcn_version.h"
> -# Begin Custom Build - Creating Version Resource
> -InputPath=.\build\win32ver.awk
> -
> -".\libtcnative.rc" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
> - awk -f ./build/win32ver.awk libtcnative-1.dll "Tomcat Native Java
> Library" ./include/tcn_version.h > .\libtcnative.rc
> -
> -# End Custom Build
> -
> -!ENDIF
> -
> -# End Source File
> -# End Target
> -# End Project
> +# Microsoft Developer Studio Project File - Name="libtcnative" - Package
> Owner=<4>
> +# Microsoft Developer Studio Generated Build File, Format Version 6.00
> +# ** DO NOT EDIT **
> +
> +# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
> +
> +CFG=libtcnative - 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 "libtcnative.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 "libtcnative.mak" CFG="libtcnative - Win32 Debug"
> +!MESSAGE
> +!MESSAGE Possible choices for configuration are:
> +!MESSAGE
> +!MESSAGE "libtcnative - Win32 Release" (based on "Win32 (x86) Dynamic-Link
> Library")
> +!MESSAGE "libtcnative - 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)" == "libtcnative - 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 /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /FD
> /c
> +# ADD CPP /nologo /MD /W3 /Zi /O2 /I "./include" /I "../apr/include" /I
> "../apr/include/arch/win32" /I "$(JAVA_HOME)/include" /I
> "$(JAVA_HOME)/include/win32" /I "../openssl/inc32" /D "NDEBUG" /D
> "TCN_DECLARE_EXPORT" /D "WIN32" /D "_WINDOWS" /D "WIN32_LEAN_AND_MEAN" /D
> "NO_IDEA" /D "NO_RC5" /D "NO_MDC2" /D "OPENSSL_NO_IDEA" /D "OPENSSL_NO_RC5"
> /D "OPENSSL_NO_MDC2" /D "HAVE_OPENSSL" /D HAVE_SSL_SET_STATE=1
> /Fd"Release\libtcnative_src" /FD /c
> +# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o /win32 "NUL"
> +# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o /win32 "NUL"
> +# 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 kernel32.lib advapi32.lib ws2_32.lib mswsock.lib
> wldap32.lib psapi.lib ole32.lib /nologo /base:"0x6EE00000" /subsystem:windows
> /dll /debug /machine:I386 /opt:ref
> +# ADD LINK32 kernel32.lib advapi32.lib ws2_32.lib mswsock.lib wldap32.lib
> psapi.lib ole32.lib libeay32.lib ssleay32.lib /nologo /base:"0x6EE00000"
> /subsystem:windows /dll /debug /machine:I386 /out:"Release/libtcnative-1.dll"
> /libpath:"../openssl/out32dll" /libpath:"../openssl/out32" /opt:ref
> +
> +!ELSEIF "$(CFG)" == "libtcnative - 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 /MDd /W3 /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D
> "_WINDOWS" /FD /c
> +# ADD CPP /nologo /MDd /W4 /GX /Zi /Od /I "./include" /I "../apr/include"
> /I "../apr/include/arch/win32" /I "$(JAVA_HOME)/include" /I
> "$(JAVA_HOME)/include/win32" /I "../openssl/inc32" /D "_DEBUG" /D
> "TCN_DECLARE_EXPORT" /D "WIN32" /D "_WINDOWS" /D "WIN32_LEAN_AND_MEAN" /D
> "NO_IDEA" /D "NO_RC5" /D "NO_MDC2" /D "OPENSSL_NO_IDEA" /D "OPENSSL_NO_RC5"
> /D "OPENSSL_NO_MDC2" /D "HAVE_OPENSSL" /D HAVE_SSL_SET_STATE=1
> /Fd"Debug\libtcnative_src" /FD /c
> +# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o /win32 "NUL"
> +# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o /win32 "NUL"
> +# 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 kernel32.lib advapi32.lib ws2_32.lib mswsock.lib
> wldap32.lib psapi.lib ole32.lib /nologo /base:"0x6EE00000" /subsystem:windows
> /dll /incremental:no /debug /machine:I386
> +# ADD LINK32 kernel32.lib advapi32.lib ws2_32.lib mswsock.lib wldap32.lib
> psapi.lib ole32.lib libeay32.lib ssleay32.lib /nologo /base:"0x6EE00000"
> /subsystem:windows /dll /incremental:no /debug /machine:I386
> /out:"Debug/libtcnative-1.dll" /libpath:"../openssl/out32dll"
> /libpath:"../openssl/out32"
> +
> +!ENDIF
> +
> +# Begin Target
> +
> +# Name "libtcnative - Win32 Release"
> +# Name "libtcnative - Win32 Debug"
> +# Begin Group "Source Files"
> +
> +# PROP Default_Filter ""
> +# Begin Source File
> +
> +SOURCE=.\src\dir.c
> +# End Source File
> +# Begin Source File
> +
> +SOURCE=.\src\error.c
> +# End Source File
> +# Begin Source File
> +
> +SOURCE=.\src\file.c
> +# End Source File
> +# Begin Source File
> +
> +SOURCE=.\src\info.c
> +# End Source File
> +# Begin Source File
> +
> +SOURCE=.\src\jnilib.c
> +# End Source File
> +# Begin Source File
> +
> +SOURCE=.\src\lock.c
> +# End Source File
> +# Begin Source File
> +
> +SOURCE=.\src\misc.c
> +# End Source File
> +# Begin Source File
> +
> +SOURCE=.\src\mmap.c
> +# End Source File
> +# Begin Source File
> +
> +SOURCE=.\src\network.c
> +# End Source File
> +# Begin Source File
> +
> +SOURCE=.\src\poll.c
> +# End Source File
> +# Begin Source File
> +
> +SOURCE=.\src\pool.c
> +# End Source File
> +# Begin Source File
> +
> +SOURCE=.\src\proc.c
> +# End Source File
> +# Begin Source File
> +
> +SOURCE=.\src\shm.c
> +# End Source File
> +# Begin Source File
> +
> +SOURCE=.\src\ssl.c
> +# End Source File
> +# Begin Source File
> +
> +SOURCE=.\src\stdlib.c
> +# End Source File
> +# Begin Source File
> +
> +SOURCE=.\src\user.c
> +# End Source File
> +# End Group
> +# Begin Group "Generated Files"
> +
> +# PROP Default_Filter ""
> +# End Group
> +# Begin Group "Header Files"
> +
> +# PROP Default_Filter ""
> +# Begin Source File
> +
> +SOURCE=.\include\tcn.h
> +# End Source File
> +# Begin Source File
> +
> +SOURCE=.\include\tcn_version.h
> +# End Source File
> +# End Group
> +# Begin Group "Platform Files"
> +
> +# PROP Default_Filter ""
> +# Begin Source File
> +
> +SOURCE=.\os\win32\system.c
> +# End Source File
> +# End Group
> +# Begin Source File
> +
> +SOURCE=.\libtcnative.rc
> +# End Source File
> +# Begin Source File
> +
> +SOURCE=.\build\win32ver.awk
> +
> +!IF "$(CFG)" == "libtcnative - Win32 Release"
> +
> +# PROP Ignore_Default_Tool 1
> +USERDEP__WIN32="./include/tcn_version.h"
> +# Begin Custom Build - Creating Version Resource
> +InputPath=.\build\win32ver.awk
> +
> +".\libtcnative.rc" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
> + awk -f ./build/win32ver.awk libtcnative-1.dll "Tomcat Native Java
> Library" ./include/tcn_version.h > .\libtcnative.rc
> +
> +# End Custom Build
> +
> +!ELSEIF "$(CFG)" == "libtcnative - Win32 Debug"
> +
> +# PROP Ignore_Default_Tool 1
> +USERDEP__WIN32="./include/tcn_version.h"
> +# Begin Custom Build - Creating Version Resource
> +InputPath=.\build\win32ver.awk
> +
> +".\libtcnative.rc" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
> + awk -f ./build/win32ver.awk libtcnative-1.dll "Tomcat Native Java
> Library" ./include/tcn_version.h > .\libtcnative.rc
> +
> +# End Custom Build
> +
> +!ENDIF
> +
> +# End Source File
> +# End Target
> +# End Project
>
>
>
> 1.4 +71 -71 jakarta-tomcat-connectors/jni/native/libtcnative.dsw
>
> Index: libtcnative.dsw
> ===================================================================
> RCS file: /home/cvs/jakarta-tomcat-connectors/jni/native/libtcnative.dsw,v
> retrieving revision 1.3
> retrieving revision 1.4
> diff -u -r1.3 -r1.4
> --- libtcnative.dsw 17 Jan 2005 18:27:47 -0000 1.3
> +++ libtcnative.dsw 12 May 2005 19:28:03 -0000 1.4
> @@ -1,71 +1,71 @@
> -Microsoft Developer Studio Workspace File, Format Version 6.00
> -# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
> -
>
> -###############################################################################
> -
> -Project: "apr"=..\apr\apr.dsp - Package Owner=<4>
> -
> -Package=<5>
> -{{{
> -}}}
> -
> -Package=<4>
> -{{{
> -}}}
> -
>
> -###############################################################################
> -
> -Project: "libapr"=..\apr\libapr.dsp - Package Owner=<4>
> -
> -Package=<5>
> -{{{
> -}}}
> -
> -Package=<4>
> -{{{
> -}}}
> -
>
> -###############################################################################
> -
> -Project: "libtcnative"=.\libtcnative.dsp - Package Owner=<4>
> -
> -Package=<5>
> -{{{
> -}}}
> -
> -Package=<4>
> -{{{
> - Begin Project Dependency
> - Project_Dep_Name libapr
> - End Project Dependency
> -}}}
> -
>
> -###############################################################################
> -
> -Project: "tcnative"=.\tcnative.dsp - Package Owner=<4>
> -
> -Package=<5>
> -{{{
> -}}}
> -
> -Package=<4>
> -{{{
> - Begin Project Dependency
> - Project_Dep_Name apr
> - End Project Dependency
> -}}}
> -
>
> -###############################################################################
> -
> -Global:
> -
> -Package=<5>
> -{{{
> -}}}
> -
> -Package=<3>
> -{{{
> -}}}
> -
>
> -###############################################################################
> -
> +Microsoft Developer Studio Workspace File, Format Version 6.00
> +# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
> +
>
> +###############################################################################
> +
> +Project: "apr"=..\apr\apr.dsp - Package Owner=<4>
> +
> +Package=<5>
> +{{{
> +}}}
> +
> +Package=<4>
> +{{{
> +}}}
> +
>
> +###############################################################################
> +
> +Project: "libapr"=..\apr\libapr.dsp - Package Owner=<4>
> +
> +Package=<5>
> +{{{
> +}}}
> +
> +Package=<4>
> +{{{
> +}}}
> +
>
> +###############################################################################
> +
> +Project: "libtcnative"=.\libtcnative.dsp - Package Owner=<4>
> +
> +Package=<5>
> +{{{
> +}}}
> +
> +Package=<4>
> +{{{
> + Begin Project Dependency
> + Project_Dep_Name libapr
> + End Project Dependency
> +}}}
> +
>
> +###############################################################################
> +
> +Project: "tcnative"=.\tcnative.dsp - Package Owner=<4>
> +
> +Package=<5>
> +{{{
> +}}}
> +
> +Package=<4>
> +{{{
> + Begin Project Dependency
> + Project_Dep_Name apr
> + End Project Dependency
> +}}}
> +
>
> +###############################################################################
> +
> +Global:
> +
> +Package=<5>
> +{{{
> +}}}
> +
> +Package=<3>
> +{{{
> +}}}
> +
>
> +###############################################################################
> +
>
>
>
> 1.5 +214 -214 jakarta-tomcat-connectors/jni/native/tcnative.dsp
>
> Index: tcnative.dsp
> ===================================================================
> RCS file: /home/cvs/jakarta-tomcat-connectors/jni/native/tcnative.dsp,v
> retrieving revision 1.4
> retrieving revision 1.5
> diff -u -r1.4 -r1.5
> --- tcnative.dsp 18 Jan 2005 10:23:15 -0000 1.4
> +++ tcnative.dsp 12 May 2005 19:28:03 -0000 1.5
> @@ -1,214 +1,214 @@
> -# Microsoft Developer Studio Project File - Name="tcnative" - Package
> Owner=<4>
> -# Microsoft Developer Studio Generated Build File, Format Version 6.00
> -# ** DO NOT EDIT **
> -
> -# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
> -
> -CFG=tcnative - 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 "tcnative.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 "tcnative.mak" CFG="tcnative - Win32 Debug"
> -!MESSAGE
> -!MESSAGE Possible choices for configuration are:
> -!MESSAGE
> -!MESSAGE "tcnative - Win32 Release" (based on "Win32 (x86) Dynamic-Link
> Library")
> -!MESSAGE "tcnative - 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)" == "tcnative - 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 /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /FD
> /c
> -# ADD CPP /nologo /MD /W3 /Zi /O2 /I "./include" /I "../apr/include" /I
> "../apr/include/arch/win32" /I "$(JAVA_HOME)/include" /I
> "$(JAVA_HOME)/include/win32" /D "NDEBUG" /D "TCN_DECLARE_EXPORT" /D "WIN32"
> /D "_WINDOWS" /D "APR_DECLARE_STATIC" /Fd"Release\tcnative_src" /FD /c
> -# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o /win32 "NUL"
> -# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o /win32 "NUL"
> -# 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 kernel32.lib advapi32.lib ws2_32.lib mswsock.lib
> wldap32.lib psapi.lib ole32.lib /nologo /base:"0x6EE00000" /subsystem:windows
> /dll /debug /machine:I386 /opt:ref
> -# ADD LINK32 kernel32.lib advapi32.lib ws2_32.lib mswsock.lib wldap32.lib
> psapi.lib ole32.lib rpcrt4.lib /nologo /base:"0x6EE00000" /subsystem:windows
> /dll /debug /machine:I386 /out:"Release/tcnative-1.dll" /opt:ref
> -
> -!ELSEIF "$(CFG)" == "tcnative - 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 /MDd /W3 /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D
> "_WINDOWS" /FD /c
> -# ADD CPP /nologo /MDd /W4 /GX /Zi /Od /I "./include" /I "../apr/include"
> /I "../apr/include/arch/win32" /I "$(JAVA_HOME)/include" /I
> "$(JAVA_HOME)/include/win32" /D "_DEBUG" /D "TCN_DECLARE_EXPORT" /D "WIN32"
> /D "_WINDOWS" /D "APR_DECLARE_STATIC" /Fd"Debug\tcnative_src" /FD /c
> -# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o /win32 "NUL"
> -# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o /win32 "NUL"
> -# 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 kernel32.lib advapi32.lib ws2_32.lib mswsock.lib
> wldap32.lib psapi.lib ole32.lib /nologo /base:"0x6EE00000" /subsystem:windows
> /dll /incremental:no /debug /machine:I386
> -# ADD LINK32 kernel32.lib advapi32.lib ws2_32.lib mswsock.lib wldap32.lib
> psapi.lib ole32.lib rpcrt4.lib /nologo /base:"0x6EE00000" /subsystem:windows
> /dll /incremental:no /debug /machine:I386 /out:"Debug/tcnative-1.dll"
> -
> -!ENDIF
> -
> -# Begin Target
> -
> -# Name "tcnative - Win32 Release"
> -# Name "tcnative - Win32 Debug"
> -# Begin Group "Source Files"
> -
> -# PROP Default_Filter ""
> -# Begin Source File
> -
> -SOURCE=.\src\dir.c
> -# End Source File
> -# Begin Source File
> -
> -SOURCE=.\src\error.c
> -# End Source File
> -# Begin Source File
> -
> -SOURCE=.\src\file.c
> -# End Source File
> -# Begin Source File
> -
> -SOURCE=.\src\info.c
> -# End Source File
> -# Begin Source File
> -
> -SOURCE=.\src\jnilib.c
> -# End Source File
> -# Begin Source File
> -
> -SOURCE=.\src\lock.c
> -# End Source File
> -# Begin Source File
> -
> -SOURCE=.\src\misc.c
> -# End Source File
> -# Begin Source File
> -
> -SOURCE=.\src\mmap.c
> -# End Source File
> -# Begin Source File
> -
> -SOURCE=.\src\network.c
> -# End Source File
> -# Begin Source File
> -
> -SOURCE=.\src\poll.c
> -# End Source File
> -# Begin Source File
> -
> -SOURCE=.\src\pool.c
> -# End Source File
> -# Begin Source File
> -
> -SOURCE=.\src\proc.c
> -# End Source File
> -# Begin Source File
> -
> -SOURCE=.\src\shm.c
> -# End Source File
> -# Begin Source File
> -
> -SOURCE=.\src\stdlib.c
> -# End Source File
> -# Begin Source File
> -
> -SOURCE=.\src\user.c
> -# End Source File
> -# End Group
> -# Begin Group "Generated Files"
> -
> -# PROP Default_Filter ""
> -# End Group
> -# Begin Group "Header Files"
> -
> -# PROP Default_Filter ""
> -# Begin Source File
> -
> -SOURCE=.\include\tcn.h
> -# End Source File
> -# Begin Source File
> -
> -SOURCE=.\include\tcn_version.h
> -# End Source File
> -# End Group
> -# Begin Group "Platform Files"
> -
> -# PROP Default_Filter ""
> -# Begin Source File
> -
> -SOURCE=.\os\win32\system.c
> -# End Source File
> -# End Group
> -# Begin Source File
> -
> -SOURCE=.\tcnative.rc
> -# End Source File
> -# Begin Source File
> -
> -SOURCE=.\build\win32ver.awk
> -
> -!IF "$(CFG)" == "tcnative - Win32 Release"
> -
> -# PROP Ignore_Default_Tool 1
> -USERDEP__WIN32="./include/tcn_version.h"
> -# Begin Custom Build - Creating Version Resource
> -InputPath=.\build\win32ver.awk
> -
> -".\tcnative.rc" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
> - awk -f ./build/win32ver.awk tcnative-1.dll "Tomcat Native Java
> Library" ./include/tcn_version.h > .\tcnative.rc
> -
> -# End Custom Build
> -
> -!ELSEIF "$(CFG)" == "tcnative - Win32 Debug"
> -
> -# PROP Ignore_Default_Tool 1
> -USERDEP__WIN32="./include/tcn_version.h"
> -# Begin Custom Build - Creating Version Resource
> -InputPath=.\build\win32ver.awk
> -
> -".\tcnative.rc" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
> - awk -f ./build/win32ver.awk tcnative-1.dll "Tomcat Native Java
> Library" ./include/tcn_version.h > .\tcnative.rc
> -
> -# End Custom Build
> -
> -!ENDIF
> -
> -# End Source File
> -# End Target
> -# End Project
> +# Microsoft Developer Studio Project File - Name="tcnative" - Package
> Owner=<4>
> +# Microsoft Developer Studio Generated Build File, Format Version 6.00
> +# ** DO NOT EDIT **
> +
> +# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
> +
> +CFG=tcnative - 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 "tcnative.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 "tcnative.mak" CFG="tcnative - Win32 Debug"
> +!MESSAGE
> +!MESSAGE Possible choices for configuration are:
> +!MESSAGE
> +!MESSAGE "tcnative - Win32 Release" (based on "Win32 (x86) Dynamic-Link
> Library")
> +!MESSAGE "tcnative - 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)" == "tcnative - 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 /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /FD
> /c
> +# ADD CPP /nologo /MD /W3 /Zi /O2 /I "./include" /I "../apr/include" /I
> "../apr/include/arch/win32" /I "$(JAVA_HOME)/include" /I
> "$(JAVA_HOME)/include/win32" /D "NDEBUG" /D "TCN_DECLARE_EXPORT" /D "WIN32"
> /D "_WINDOWS" /D "APR_DECLARE_STATIC" /Fd"Release\tcnative_src" /FD /c
> +# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o /win32 "NUL"
> +# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o /win32 "NUL"
> +# 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 kernel32.lib advapi32.lib ws2_32.lib mswsock.lib
> wldap32.lib psapi.lib ole32.lib /nologo /base:"0x6EE00000" /subsystem:windows
> /dll /debug /machine:I386 /opt:ref
> +# ADD LINK32 kernel32.lib advapi32.lib ws2_32.lib mswsock.lib wldap32.lib
> psapi.lib ole32.lib rpcrt4.lib /nologo /base:"0x6EE00000" /subsystem:windows
> /dll /debug /machine:I386 /out:"Release/tcnative-1.dll" /opt:ref
> +
> +!ELSEIF "$(CFG)" == "tcnative - 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 /MDd /W3 /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D
> "_WINDOWS" /FD /c
> +# ADD CPP /nologo /MDd /W4 /GX /Zi /Od /I "./include" /I "../apr/include"
> /I "../apr/include/arch/win32" /I "$(JAVA_HOME)/include" /I
> "$(JAVA_HOME)/include/win32" /D "_DEBUG" /D "TCN_DECLARE_EXPORT" /D "WIN32"
> /D "_WINDOWS" /D "APR_DECLARE_STATIC" /Fd"Debug\tcnative_src" /FD /c
> +# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o /win32 "NUL"
> +# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o /win32 "NUL"
> +# 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 kernel32.lib advapi32.lib ws2_32.lib mswsock.lib
> wldap32.lib psapi.lib ole32.lib /nologo /base:"0x6EE00000" /subsystem:windows
> /dll /incremental:no /debug /machine:I386
> +# ADD LINK32 kernel32.lib advapi32.lib ws2_32.lib mswsock.lib wldap32.lib
> psapi.lib ole32.lib rpcrt4.lib /nologo /base:"0x6EE00000" /subsystem:windows
> /dll /incremental:no /debug /machine:I386 /out:"Debug/tcnative-1.dll"
> +
> +!ENDIF
> +
> +# Begin Target
> +
> +# Name "tcnative - Win32 Release"
> +# Name "tcnative - Win32 Debug"
> +# Begin Group "Source Files"
> +
> +# PROP Default_Filter ""
> +# Begin Source File
> +
> +SOURCE=.\src\dir.c
> +# End Source File
> +# Begin Source File
> +
> +SOURCE=.\src\error.c
> +# End Source File
> +# Begin Source File
> +
> +SOURCE=.\src\file.c
> +# End Source File
> +# Begin Source File
> +
> +SOURCE=.\src\info.c
> +# End Source File
> +# Begin Source File
> +
> +SOURCE=.\src\jnilib.c
> +# End Source File
> +# Begin Source File
> +
> +SOURCE=.\src\lock.c
> +# End Source File
> +# Begin Source File
> +
> +SOURCE=.\src\misc.c
> +# End Source File
> +# Begin Source File
> +
> +SOURCE=.\src\mmap.c
> +# End Source File
> +# Begin Source File
> +
> +SOURCE=.\src\network.c
> +# End Source File
> +# Begin Source File
> +
> +SOURCE=.\src\poll.c
> +# End Source File
> +# Begin Source File
> +
> +SOURCE=.\src\pool.c
> +# End Source File
> +# Begin Source File
> +
> +SOURCE=.\src\proc.c
> +# End Source File
> +# Begin Source File
> +
> +SOURCE=.\src\shm.c
> +# End Source File
> +# Begin Source File
> +
> +SOURCE=.\src\stdlib.c
> +# End Source File
> +# Begin Source File
> +
> +SOURCE=.\src\user.c
> +# End Source File
> +# End Group
> +# Begin Group "Generated Files"
> +
> +# PROP Default_Filter ""
> +# End Group
> +# Begin Group "Header Files"
> +
> +# PROP Default_Filter ""
> +# Begin Source File
> +
> +SOURCE=.\include\tcn.h
> +# End Source File
> +# Begin Source File
> +
> +SOURCE=.\include\tcn_version.h
> +# End Source File
> +# End Group
> +# Begin Group "Platform Files"
> +
> +# PROP Default_Filter ""
> +# Begin Source File
> +
> +SOURCE=.\os\win32\system.c
> +# End Source File
> +# End Group
> +# Begin Source File
> +
> +SOURCE=.\tcnative.rc
> +# End Source File
> +# Begin Source File
> +
> +SOURCE=.\build\win32ver.awk
> +
> +!IF "$(CFG)" == "tcnative - Win32 Release"
> +
> +# PROP Ignore_Default_Tool 1
> +USERDEP__WIN32="./include/tcn_version.h"
> +# Begin Custom Build - Creating Version Resource
> +InputPath=.\build\win32ver.awk
> +
> +".\tcnative.rc" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
> + awk -f ./build/win32ver.awk tcnative-1.dll "Tomcat Native Java
> Library" ./include/tcn_version.h > .\tcnative.rc
> +
> +# End Custom Build
> +
> +!ELSEIF "$(CFG)" == "tcnative - Win32 Debug"
> +
> +# PROP Ignore_Default_Tool 1
> +USERDEP__WIN32="./include/tcn_version.h"
> +# Begin Custom Build - Creating Version Resource
> +InputPath=.\build\win32ver.awk
> +
> +".\tcnative.rc" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
> + awk -f ./build/win32ver.awk tcnative-1.dll "Tomcat Native Java
> Library" ./include/tcn_version.h > .\tcnative.rc
> +
> +# End Custom Build
> +
> +!ENDIF
> +
> +# End Source File
> +# End Target
> +# End Project
>
>
>
> 1.2 +121 -121 jakarta-tomcat-connectors/jni/native/build/win32ver.awk
>
> Index: win32ver.awk
> ===================================================================
> RCS file: /home/cvs/jakarta-tomcat-connectors/jni/native/build/win32ver.awk,v
> retrieving revision 1.1
> retrieving revision 1.2
> diff -u -r1.1 -r1.2
> --- win32ver.awk 17 Jan 2005 07:15:44 -0000 1.1
> +++ win32ver.awk 12 May 2005 19:28:03 -0000 1.2
> @@ -1,121 +1,121 @@
> -BEGIN {
> -
> - # ff bits: 1(debug), 2(prerelease), 4(patched), 8(vendor) and 32(special)
> - # debug is summed based on the /Define _DEBUG
> - # prerelease is based on the -dev extension,
> - # patched is based on a non-standard "-ver" extension,
> - # special and vendor are toggled by their args.
> - #
> - ff = 0;
> -
> - file=ARGV[1];
> - desc=ARGV[2];
> - rel_h=ARGV[3];
> -
> - filename = file;
> - if (match(file, /\./)) {
> - sub(/\.[^\.]*$/, "", file);
> - }
> -
> - i = 4;
> - while (length(ARGV[i])) {
> - if (match(ARGV[i], /icon=/)) {
> - icon = substr(ARGV[i], 6);
> - }
> - if (match(ARGV[i], /vendor=/)) {
> - vendor = substr(ARGV[i], 8);
> - ff = ff + 8;
> - }
> - if (match(ARGV[i], /special=/)) {
> - special = substr(ARGV[i], 9);
> - ff = ff + 32;
> - }
> - i = i + 1
> - }
> -
> - i = i - 1;
> - while (i) {
> - delete ARGV[i];
> - i = i - 1;
> - }
> -
> - while ((getline < rel_h) > 0) {
> - if (match ($0, /^#define TC._MAJOR_VERSION/)) {
> - ver_major = $3;
> - }
> - if (match ($0, /^#define TC._MINOR_VERSION/)) {
> - ver_minor = $3;
> - }
> - if (match ($0, /^#define TC._PATCH_VERSION/)) {
> - ver_patch = $3;
> - }
> - if (match ($0, /^#define TC._IS_DEV_VERSION/)) {
> - ver_suffix = "-dev";
> - ver_build = "0";
> - }
> - if (match ($0, /^#undef TC._IS_DEV_VERSION/)) {
> - ver_build = "100";
> - }
> - if (match ($0, /^.*Copyright /)) {
> - copyright = substr($0, RLENGTH + 1);
> - }
> - }
> - ver = ver_major "." ver_minor "." ver_patch ver_suffix;
> - verc = ver_major "," ver_minor "," ver_patch "," ver_build;
> -
> - if (length(vendor)) {
> - ff = ff + 8;
> - }
> -
> - if (length(icon)) {
> - print "1 ICON DISCARDABLE \"" icon "\"";
> - }
> - print "1 VERSIONINFO";
> - print " FILEVERSION " verc "";
> - print " PRODUCTVERSION " verc "";
> - print " FILEFLAGSMASK 0x3fL";
> - print "#if defined(_DEBUG)"
> - print " FILEFLAGS 0x" sprintf("%02x", ff + 1) "L";
> - print "#else"
> - print " FILEFLAGS 0x" sprintf("%02x", ff) "L";
> - print "#endif"
> - print " FILEOS 0x40004L";
> - print " FILETYPE 0x1L";
> - print " FILESUBTYPE 0x0L";
> - print "BEGIN";
> - print " BLOCK \"StringFileInfo\"";
> - print " BEGIN";
> - print " BLOCK \"040904b0\"";
> - print " BEGIN";
> - print " VALUE \"Comments\", "\
> - "\"Licensed under the Apache License, Version 2.0 (the
> \"\"License\"\"); "\
> - "you may not use this file except in compliance with the License. "\
> - "You may obtain a copy of the License at\\r\\n\\r\\n"\
> - "http://www.apache.org/licenses/LICENSE-2.0\\r\\n\\r\\n"\
> - "Unless required by applicable law or agreed to in writing, "\
> - "software distributed under the License is distributed on an "\
> - "\"\"AS IS\"\" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, "\
> - "either express or implied. See the License for the specific "\
> - "language governing permissions and limitations under the
> License.\\0\"";
> - print " VALUE \"CompanyName\", \"Apache Software Foundation\\0\"";
> - print " VALUE \"FileDescription\", \"" desc "\\0\"";
> - print " VALUE \"FileVersion\", \"" ver "\\0\"";
> - print " VALUE \"InternalName\", \"" file "\\0\"";
> - print " VALUE \"LegalCopyright\", \"Copyright " copyright "\\0\"";
> - print " VALUE \"OriginalFilename\", \"" filename "\\0\"";
> - if (vendor) {
> - print " VALUE \"PrivateBuild\", \"" vendor "\\0\"";
> - }
> - if (special) {
> - print " VALUE \"SpecialBuild\", \"" vendor "\\0\"";
> - }
> - print " VALUE \"ProductName\", \"Apache Portable Runtime\\0\"";
> - print " VALUE \"ProductVersion\", \"" ver "\\0\"";
> - print " END";
> - print " END";
> - print " BLOCK \"VarFileInfo\"";
> - print " BEGIN";
> - print " VALUE \"Translation\", 0x409, 1200";
> - print " END";
> - print "END";
> -}
> +BEGIN {
> +
> + # ff bits: 1(debug), 2(prerelease), 4(patched), 8(vendor) and 32(special)
> + # debug is summed based on the /Define _DEBUG
> + # prerelease is based on the -dev extension,
> + # patched is based on a non-standard "-ver" extension,
> + # special and vendor are toggled by their args.
> + #
> + ff = 0;
> +
> + file=ARGV[1];
> + desc=ARGV[2];
> + rel_h=ARGV[3];
> +
> + filename = file;
> + if (match(file, /\./)) {
> + sub(/\.[^\.]*$/, "", file);
> + }
> +
> + i = 4;
> + while (length(ARGV[i])) {
> + if (match(ARGV[i], /icon=/)) {
> + icon = substr(ARGV[i], 6);
> + }
> + if (match(ARGV[i], /vendor=/)) {
> + vendor = substr(ARGV[i], 8);
> + ff = ff + 8;
> + }
> + if (match(ARGV[i], /special=/)) {
> + special = substr(ARGV[i], 9);
> + ff = ff + 32;
> + }
> + i = i + 1
> + }
> +
> + i = i - 1;
> + while (i) {
> + delete ARGV[i];
> + i = i - 1;
> + }
> +
> + while ((getline < rel_h) > 0) {
> + if (match ($0, /^#define TC._MAJOR_VERSION/)) {
> + ver_major = $3;
> + }
> + if (match ($0, /^#define TC._MINOR_VERSION/)) {
> + ver_minor = $3;
> + }
> + if (match ($0, /^#define TC._PATCH_VERSION/)) {
> + ver_patch = $3;
> + }
> + if (match ($0, /^#define TC._IS_DEV_VERSION/)) {
> + ver_suffix = "-dev";
> + ver_build = "0";
> + }
> + if (match ($0, /^#undef TC._IS_DEV_VERSION/)) {
> + ver_build = "100";
> + }
> + if (match ($0, /^.*Copyright /)) {
> + copyright = substr($0, RLENGTH + 1);
> + }
> + }
> + ver = ver_major "." ver_minor "." ver_patch ver_suffix;
> + verc = ver_major "," ver_minor "," ver_patch "," ver_build;
> +
> + if (length(vendor)) {
> + ff = ff + 8;
> + }
> +
> + if (length(icon)) {
> + print "1 ICON DISCARDABLE \"" icon "\"";
> + }
> + print "1 VERSIONINFO";
> + print " FILEVERSION " verc "";
> + print " PRODUCTVERSION " verc "";
> + print " FILEFLAGSMASK 0x3fL";
> + print "#if defined(_DEBUG)"
> + print " FILEFLAGS 0x" sprintf("%02x", ff + 1) "L";
> + print "#else"
> + print " FILEFLAGS 0x" sprintf("%02x", ff) "L";
> + print "#endif"
> + print " FILEOS 0x40004L";
> + print " FILETYPE 0x1L";
> + print " FILESUBTYPE 0x0L";
> + print "BEGIN";
> + print " BLOCK \"StringFileInfo\"";
> + print " BEGIN";
> + print " BLOCK \"040904b0\"";
> + print " BEGIN";
> + print " VALUE \"Comments\", "\
> + "\"Licensed under the Apache License, Version 2.0 (the
> \"\"License\"\"); "\
> + "you may not use this file except in compliance with the License. "\
> + "You may obtain a copy of the License at\\r\\n\\r\\n"\
> + "http://www.apache.org/licenses/LICENSE-2.0\\r\\n\\r\\n"\
> + "Unless required by applicable law or agreed to in writing, "\
> + "software distributed under the License is distributed on an "\
> + "\"\"AS IS\"\" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, "\
> + "either express or implied. See the License for the specific "\
> + "language governing permissions and limitations under the
> License.\\0\"";
> + print " VALUE \"CompanyName\", \"Apache Software Foundation\\0\"";
> + print " VALUE \"FileDescription\", \"" desc "\\0\"";
> + print " VALUE \"FileVersion\", \"" ver "\\0\"";
> + print " VALUE \"InternalName\", \"" file "\\0\"";
> + print " VALUE \"LegalCopyright\", \"Copyright " copyright "\\0\"";
> + print " VALUE \"OriginalFilename\", \"" filename "\\0\"";
> + if (vendor) {
> + print " VALUE \"PrivateBuild\", \"" vendor "\\0\"";
> + }
> + if (special) {
> + print " VALUE \"SpecialBuild\", \"" vendor "\\0\"";
> + }
> + print " VALUE \"ProductName\", \"Apache Portable Runtime\\0\"";
> + print " VALUE \"ProductVersion\", \"" ver "\\0\"";
> + print " END";
> + print " END";
> + print " BLOCK \"VarFileInfo\"";
> + print " BEGIN";
> + print " VALUE \"Translation\", 0x409, 1200";
> + print " END";
> + print "END";
> +}
>
>
>
> 1.3 +14 -14 jakarta-tomcat-connectors/jni/native/src/shm.c
>
> Index: shm.c
> ===================================================================
> RCS file: /home/cvs/jakarta-tomcat-connectors/jni/native/src/shm.c,v
> retrieving revision 1.2
> retrieving revision 1.3
> diff -u -r1.2 -r1.3
> --- shm.c 3 Feb 2005 07:48:20 -0000 1.2
> +++ shm.c 12 May 2005 19:28:03 -0000 1.3
> @@ -108,17 +108,17 @@
> UNREFERENCED_STDARGS;
> return (jlong)apr_shm_size_get(s);
> }
> -
> -TCN_IMPLEMENT_CALL(jobject, Shm, buffer)(TCN_STDARGS, jlong shm)
> -{
> - apr_shm_t *s = J2P(shm, apr_shm_t *);
> - jlong sz = (jlong)apr_shm_size_get(s);
> - void *a;
> -
> - UNREFERENCED(o);
> -
> - if ((a = apr_shm_baseaddr_get(s)) != NULL)
> - return (*e)->NewDirectByteBuffer(e, a, sz);
> - else
> - return NULL;
> -}
> +
> +TCN_IMPLEMENT_CALL(jobject, Shm, buffer)(TCN_STDARGS, jlong shm)
> +{
> + apr_shm_t *s = J2P(shm, apr_shm_t *);
> + jlong sz = (jlong)apr_shm_size_get(s);
> + void *a;
> +
> + UNREFERENCED(o);
> +
> + if ((a = apr_shm_baseaddr_get(s)) != NULL)
> + return (*e)->NewDirectByteBuffer(e, a, sz);
> + else
> + return NULL;
> +}
>
>
>
> 1.2 +50 -50 jakarta-tomcat-connectors/jni/native/src/ssl.c
>
> Index: ssl.c
> ===================================================================
> RCS file: /home/cvs/jakarta-tomcat-connectors/jni/native/src/ssl.c,v
> retrieving revision 1.1
> retrieving revision 1.2
> diff -u -r1.1 -r1.2
> --- ssl.c 3 Feb 2005 07:47:49 -0000 1.1
> +++ ssl.c 12 May 2005 19:28:03 -0000 1.2
> @@ -1,50 +1,50 @@
> -/* Copyright 2000-2004 The Apache Software Foundation
> - *
> - * Licensed under the Apache License, Version 2.0 (the "License");
> - * you may not use this file except in compliance with the License.
> - * You may obtain a copy of the License at
> - *
> - * http://www.apache.org/licenses/LICENSE-2.0
> - *
> - * Unless required by applicable law or agreed to in writing, software
> - * distributed under the License is distributed on an "AS IS" BASIS,
> - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
> - * See the License for the specific language governing permissions and
> - * limitations under the License.
> - */
> -
> -#include "apr.h"
> -#include "apr_pools.h"
> -#include "apr_file_io.h"
> -
> -#include "tcn.h"
> -
> -#ifdef HAVE_OPENSSL
> -
> -/* OpenSSL headers */
> -#include <openssl/ssl.h>
> -#include <openssl/err.h>
> -#include <openssl/x509.h>
> -#include <openssl/pem.h>
> -#include <openssl/crypto.h>
> -#include <openssl/evp.h>
> -#include <openssl/rand.h>
> -#include <openssl/x509v3.h>
> -/* Avoid tripping over an engine build installed globally and detected
> - * when the user points at an explicit non-engine flavor of OpenSSL
> - */
> -#if defined(HAVE_OPENSSL_ENGINE_H) && defined(HAVE_ENGINE_INIT)
> -#include <openssl/engine.h>
> -#endif
> -
> -
> -
> -
> -
> -
> -
> -
> -#else
> -
> -
> -#endif
> +/* Copyright 2000-2004 The Apache Software Foundation
> + *
> + * Licensed under the Apache License, Version 2.0 (the "License");
> + * you may not use this file except in compliance with the License.
> + * You may obtain a copy of the License at
> + *
> + * http://www.apache.org/licenses/LICENSE-2.0
> + *
> + * Unless required by applicable law or agreed to in writing, software
> + * distributed under the License is distributed on an "AS IS" BASIS,
> + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
> + * See the License for the specific language governing permissions and
> + * limitations under the License.
> + */
> +
> +#include "apr.h"
> +#include "apr_pools.h"
> +#include "apr_file_io.h"
> +
> +#include "tcn.h"
> +
> +#ifdef HAVE_OPENSSL
> +
> +/* OpenSSL headers */
> +#include <openssl/ssl.h>
> +#include <openssl/err.h>
> +#include <openssl/x509.h>
> +#include <openssl/pem.h>
> +#include <openssl/crypto.h>
> +#include <openssl/evp.h>
> +#include <openssl/rand.h>
> +#include <openssl/x509v3.h>
> +/* Avoid tripping over an engine build installed globally and detected
> + * when the user points at an explicit non-engine flavor of OpenSSL
> + */
> +#if defined(HAVE_OPENSSL_ENGINE_H) && defined(HAVE_ENGINE_INIT)
> +#include <openssl/engine.h>
> +#endif
> +
> +
> +
> +
> +
> +
> +
> +
> +#else
> +
> +
> +#endif
>
>
>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
