httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From wr...@locus.apache.org
Subject cvs commit: apache-2.0/src/support cvstodsp6.pl dsp6tocvs.pl ab.dsp htdigest.dsp htpasswd.dsp logresolve.dsp rotatelogs.dsp
Date Fri, 19 May 2000 05:09:22 GMT
wrowe       00/05/18 22:09:21

  Modified:    src      Apache.dsp ApacheCore.dsp
               src/lib/apr aprlib.dsp aprlibdll.dsp
               src/lib/pcre dftables.dsp
               src/main gen_test_char.dsp gen_uri_delims.dsp
               src/modules/proxy ApacheModuleProxy.dsp
               src/os/win32 ApacheModuleAuthAnon.dsp
                        ApacheModuleAuthDigest.dsp ApacheModuleCERNMeta.dsp
                        ApacheModuleExpires.dsp ApacheModuleFileCache.dsp
                        ApacheModuleHeaders.dsp ApacheModuleInfo.dsp
                        ApacheModuleRewrite.dsp ApacheModuleSpeling.dsp
                        ApacheModuleStatus.dsp ApacheModuleUserTrack.dsp
               src/os/win32/installer/installdll install.dsp
               src/support ab.dsp htdigest.dsp htpasswd.dsp logresolve.dsp
                        rotatelogs.dsp
  Added:       src/support cvstodsp6.pl dsp6tocvs.pl
  Log:
  
    Current and clean make files for Win95.  Changes Include:
  
    All projects link incrementally with no link maps in Debug mode.
    New cvstodsp6.pl and dsp6tocvs.pl will fix up /the /ZI - /Zi issue.
    Includes corrections noted by Tim Costello
  
  
  Revision  Changes    Path
  1.7       +7 -2      apache-2.0/src/Apache.dsp
  
  Index: Apache.dsp
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/Apache.dsp,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- Apache.dsp	2000/05/17 00:35:16	1.6
  +++ Apache.dsp	2000/05/19 05:09:13	1.7
  @@ -50,7 +50,7 @@
   # ADD BSC32 /nologo
   LINK32=link.exe
   # ADD BASE LINK32 aprlib.lib ApacheCore.lib kernel32.lib advapi32.lib /nologo /subsystem:console /map /machine:I386 /libpath:"lib\apr\Release" /libpath:"CoreR"
  -# ADD LINK32 aprlib.lib ApacheCore.lib kernel32.lib advapi32.lib /nologo /subsystem:console /map /machine:I386 /libpath:"lib\apr\Release" /libpath:"CoreR"
  +# ADD LINK32 aprlib.lib ApacheCore.lib kernel32.lib advapi32.lib user32.lib /nologo /subsystem:console /map /machine:I386 /libpath:"lib\apr\Release" /libpath:"CoreR"
   
   !ELSEIF  "$(CFG)" == "Apache - Win32 Debug"
   
  @@ -75,7 +75,8 @@
   # ADD BSC32 /nologo
   LINK32=link.exe
   # ADD BASE LINK32 aprlib.lib ApacheCore.lib kernel32.lib advapi32.lib /nologo /subsystem:console /map /debug /machine:I386 /libpath:"lib\apr\debug" /libpath:"CoreD"
  -# ADD LINK32 aprlib.lib ApacheCore.lib kernel32.lib advapi32.lib /nologo /subsystem:console /map /debug /machine:I386 /libpath:"lib\apr\debug" /libpath:"CoreD"
  +# ADD LINK32 aprlib.lib ApacheCore.lib kernel32.lib advapi32.lib user32.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"lib\apr\debug" /libpath:"CoreD"
  +# SUBTRACT LINK32 /incremental:no /map
   
   !ENDIF 
   
  @@ -102,6 +103,10 @@
   # Begin Group "Header Files"
   
   # PROP Default_Filter "h;hpp;hxx;hm;inl;fi;fd"
  +# Begin Source File
  +
  +SOURCE=.\OS\WIN32\main_win32.h
  +# End Source File
   # Begin Source File
   
   SOURCE=.\os\win32\registry.h
  
  
  
  1.23      +7 -4      apache-2.0/src/ApacheCore.dsp
  
  Index: ApacheCore.dsp
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/ApacheCore.dsp,v
  retrieving revision 1.22
  retrieving revision 1.23
  diff -u -r1.22 -r1.23
  --- ApacheCore.dsp	2000/05/17 23:30:04	1.22
  +++ ApacheCore.dsp	2000/05/19 05:09:14	1.23
  @@ -17,8 +17,10 @@
   !MESSAGE 
   !MESSAGE Possible choices for configuration are:
   !MESSAGE 
  -!MESSAGE "ApacheCore - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
  -!MESSAGE "ApacheCore - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
  +!MESSAGE "ApacheCore - Win32 Release" (based on\
  + "Win32 (x86) Dynamic-Link Library")
  +!MESSAGE "ApacheCore - Win32 Debug" (based on\
  + "Win32 (x86) Dynamic-Link Library")
   !MESSAGE 
   
   # Begin Project
  @@ -69,7 +71,7 @@
   # PROP Ignore_Export_Lib 0
   # PROP Target_Dir ""
   # ADD BASE CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /c
  -# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I ".\include" /I ".\lib\apr\include" /I ".\os\win32" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "WIN32_LEAN_AND_MEAN" /FD /c
  +# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I ".\include" /I ".\lib\apr\include" /I ".\os\win32" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "WIN32_LEAN_AND_MEAN" /FD /c
   # SUBTRACT CPP /YX
   # ADD BASE MTL /nologo /D "_DEBUG" /win32
   # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
  @@ -80,7 +82,8 @@
   # ADD BSC32 /nologo
   LINK32=link.exe
   # ADD BASE LINK32 aprlib.lib regex.lib ap.lib pcreposix.lib pcre.lib kernel32.lib advapi32.lib ws2_32.lib mswsock.lib /nologo /subsystem:windows /dll /map /debug /machine:I386 /libpath:"lib\apr\debug" /libpath:"regex\debug" /libpath:"ap\Debug" /base:@"os\win32\BaseAddr.ref",ApacheCore
  -# ADD LINK32 aprlib.lib ap.lib pcre.lib pcreposix.lib kernel32.lib advapi32.lib ws2_32.lib mswsock.lib /nologo /subsystem:windows /dll /map /debug /machine:I386 /libpath:"lib\apr\debug" /libpath:"lib\pcre\LibD" /libpath:"ap\Debug" /base:@"os\win32\BaseAddr.ref",ApacheCore
  +# ADD LINK32 aprlib.lib ap.lib pcre.lib pcreposix.lib kernel32.lib advapi32.lib ws2_32.lib mswsock.lib /nologo /subsystem:windows /dll /debug /machine:I386 /libpath:"lib\apr\debug" /libpath:"lib\pcre\LibD" /libpath:"ap\Debug" /base:@"os\win32\BaseAddr.ref",ApacheCore
  +# SUBTRACT LINK32 /incremental:no /map
   
   !ENDIF 
   
  
  
  
  1.28      +7 -7      apache-2.0/src/lib/apr/aprlib.dsp
  
  Index: aprlib.dsp
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/aprlib.dsp,v
  retrieving revision 1.27
  retrieving revision 1.28
  diff -u -r1.27 -r1.28
  --- aprlib.dsp	2000/05/17 23:30:08	1.27
  +++ aprlib.dsp	2000/05/19 05:09:14	1.28
  @@ -40,7 +40,7 @@
   # PROP Intermediate_Dir "LibR"
   # PROP Target_Dir ""
   # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
  -# ADD CPP /nologo /MD /W3 /GX /O2 /I "include" /I "dso/win32" /I "file_io/win32" /I "locks/win32" /I "misc/win32" /I "network_io/win32" /I "threadproc/win32" /I "time/win32" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /FD /c
  +# ADD CPP /nologo /MD /W3 /GX /O2 /I "include" /I "dso/win32" /I "file_io/win32" /I "locks/win32" /I "misc/win32" /I "misc/unix" /I "network_io/win32" /I "threadproc/win32" /I "time/win32" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /FD /c
   # SUBTRACT CPP /YX
   # ADD BASE RSC /l 0x409
   # ADD RSC /l 0x409
  @@ -65,7 +65,7 @@
   # PROP Ignore_Export_Lib 0
   # PROP Target_Dir ""
   # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
  -# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "include" /I "dso/win32" /I "file_io/win32" /I "locks/win32" /I "misc/win32" /I "network_io/win32" /I "threadproc/win32" /I "time/win32" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /FD /c
  +# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "include" /I "dso/win32" /I "file_io/win32" /I "locks/win32" /I "misc/win32" /I "misc/unix" /I "network_io/win32" /I "threadproc/win32" /I "time/win32" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /FD /c
   # SUBTRACT CPP /YX
   # ADD BASE RSC /l 0x409
   # ADD RSC /l 0x409
  @@ -131,7 +131,7 @@
   # End Source File
   # Begin Source File
   
  -SOURCE=.\misc\win32\canonerr.c
  +SOURCE=.\misc\unix\canonerr.c
   # End Source File
   # Begin Source File
   
  @@ -143,11 +143,11 @@
   # End Source File
   # Begin Source File
   
  -SOURCE=.\misc\win32\errorcodes.c
  +SOURCE=.\misc\unix\errorcodes.c
   # End Source File
   # Begin Source File
   
  -SOURCE=.\file_io\win32\fileacc.c
  +SOURCE=.\file_io\unix\fileacc.c
   # End Source File
   # Begin Source File
   
  @@ -159,7 +159,7 @@
   # End Source File
   # Begin Source File
   
  -SOURCE=.\misc\win32\getopt.c
  +SOURCE=.\misc\unix\getopt.c
   # End Source File
   # Begin Source File
   
  @@ -223,7 +223,7 @@
   # End Source File
   # Begin Source File
   
  -SOURCE=.\misc\win32\start.c
  +SOURCE=.\misc\unix\start.c
   # End Source File
   # Begin Source File
   
  
  
  
  1.7       +11 -8     apache-2.0/src/lib/apr/aprlibdll.dsp
  
  Index: aprlibdll.dsp
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/aprlibdll.dsp,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- aprlibdll.dsp	2000/05/17 23:30:08	1.6
  +++ aprlibdll.dsp	2000/05/19 05:09:14	1.7
  @@ -17,8 +17,10 @@
   !MESSAGE 
   !MESSAGE Possible choices for configuration are:
   !MESSAGE 
  -!MESSAGE "aprlibdll - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
  -!MESSAGE "aprlibdll - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
  +!MESSAGE "aprlibdll - Win32 Release" (based on\
  + "Win32 (x86) Dynamic-Link Library")
  +!MESSAGE "aprlibdll - Win32 Debug" (based on\
  + "Win32 (x86) Dynamic-Link Library")
   !MESSAGE 
   
   # Begin Project
  @@ -44,8 +46,8 @@
   # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
   # ADD CPP /nologo /MD /W3 /GX /O2 /I "include" /I "dso/win32" /I "file_io/win32" /I "locks/win32" /I "misc/win32" /I "network_io/win32" /I "threadproc/win32" /I "time/win32" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /FD /c
   # SUBTRACT CPP /YX
  -# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
  -# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
  +# 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
  @@ -69,10 +71,10 @@
   # PROP Ignore_Export_Lib 0
   # PROP Target_Dir ""
   # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
  -# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "include" /I "dso/win32" /I "file_io/win32" /I "locks/win32" /I "misc/win32" /I "network_io/win32" /I "threadproc/win32" /I "time/win32" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /FD /c
  +# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "include" /I "dso/win32" /I "file_io/win32" /I "locks/win32" /I "misc/win32" /I "network_io/win32" /I "threadproc/win32" /I "time/win32" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /FD /c
   # SUBTRACT CPP /YX
  -# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
  -# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
  +# 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
  @@ -80,7 +82,8 @@
   # ADD BSC32 /nologo
   LINK32=link.exe
   # ADD BASE LINK32 apr.lib kernel32.lib advapi32.lib ws2_32.lib mswsock.lib /nologo /subsystem:windows /dll /map /debug /machine:I386 /out:"Debug/aprlib.dll" /libpath:"LibD" /base:@"..\..\os\win32\BaseAddr.ref",aprlib
  -# ADD LINK32 apr.lib kernel32.lib advapi32.lib ws2_32.lib mswsock.lib /nologo /subsystem:windows /dll /map /debug /machine:I386 /out:"Debug/aprlib.dll" /libpath:"LibD" /base:@"..\..\os\win32\BaseAddr.ref",aprlib
  +# ADD LINK32 apr.lib kernel32.lib advapi32.lib ws2_32.lib mswsock.lib /nologo /subsystem:windows /dll /debug /machine:I386 /out:"Debug/aprlib.dll" /libpath:"LibD" /base:@"..\..\os\win32\BaseAddr.ref",aprlib
  +# SUBTRACT LINK32 /incremental:no /map
   
   !ENDIF 
   
  
  
  
  1.5       +5 -3      apache-2.0/src/lib/pcre/dftables.dsp
  
  Index: dftables.dsp
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/pcre/dftables.dsp,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- dftables.dsp	2000/05/17 23:30:09	1.4
  +++ dftables.dsp	2000/05/19 05:09:15	1.5
  @@ -17,7 +17,8 @@
   !MESSAGE 
   !MESSAGE Possible choices for configuration are:
   !MESSAGE 
  -!MESSAGE "dftables - Win32 Release" (based on "Win32 (x86) Console Application")
  +!MESSAGE "dftables - Win32 Release" (based on\
  + "Win32 (x86) Console Application")
   !MESSAGE "dftables - Win32 Debug" (based on "Win32 (x86) Console Application")
   !MESSAGE 
   
  @@ -49,7 +50,7 @@
   # ADD BSC32 /nologo
   LINK32=link.exe
   # ADD BASE LINK32 kernel32.lib /nologo /subsystem:console /machine:I386
  -# ADD LINK32 kernel32.lib /nologo /subsystem:console /pdb:none /machine:I386
  +# ADD LINK32 kernel32.lib /nologo /subsystem:console /pdb:none /map /machine:I386
   
   !ELSEIF  "$(CFG)" == "dftables - Win32 Debug"
   
  @@ -65,7 +66,7 @@
   # PROP Ignore_Export_Lib 0
   # PROP Target_Dir ""
   # ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
  -# ADD CPP /nologo /MDd /W3 /Gm /ZI /Od /D "_WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
  +# ADD CPP /nologo /MDd /W3 /Gm /Zi /Od /D "_WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
   # ADD BASE RSC /l 0x809 /d "_DEBUG"
   # ADD RSC /l 0x809 /d "_DEBUG"
   BSC32=bscmake.exe
  @@ -74,6 +75,7 @@
   LINK32=link.exe
   # ADD BASE LINK32 kernel32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
   # ADD LINK32 kernel32.lib /nologo /subsystem:console /pdb:none /debug /machine:I386
  +# SUBTRACT LINK32 /map
   
   !ENDIF 
   
  
  
  
  1.7       +3 -6      apache-2.0/src/main/gen_test_char.dsp
  
  Index: gen_test_char.dsp
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/main/gen_test_char.dsp,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- gen_test_char.dsp	2000/05/06 15:02:13	1.6
  +++ gen_test_char.dsp	2000/05/19 05:09:15	1.7
  @@ -51,7 +51,7 @@
   # ADD BSC32 /nologo
   LINK32=link.exe
   # ADD BASE LINK32 kernel32.lib /nologo /subsystem:console /machine:I386
  -# ADD LINK32 kernel32.lib /nologo /subsystem:console /pdb:none /machine:I386
  +# ADD LINK32 kernel32.lib /nologo /subsystem:console /pdb:none /map /machine:I386
   
   !ELSEIF  "$(CFG)" == "gen_test_char - Win32 Debug"
   
  @@ -67,7 +67,7 @@
   # PROP Ignore_Export_Lib 0
   # PROP Target_Dir ""
   # ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
  -# ADD CPP /nologo /MDd /W3 /Gm /GX- /Zi /Od /I "..\include" /I "..\lib\apr\include" /I "..\os\win32" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
  +# ADD CPP /nologo /MDd /W3 /Gm /Zi /Od /I "..\include" /I "..\lib\apr\include" /I "..\os\win32" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
   # SUBTRACT CPP /Fr
   # ADD BASE RSC /l 0x809 /d "_DEBUG"
   # ADD RSC /l 0x809 /d "_DEBUG"
  @@ -77,6 +77,7 @@
   LINK32=link.exe
   # ADD BASE LINK32 kernel32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
   # ADD LINK32 kernel32.lib /nologo /subsystem:console /pdb:none /debug /machine:I386
  +# SUBTRACT LINK32 /map
   
   !ENDIF 
   
  @@ -84,13 +85,9 @@
   
   # Name "gen_test_char - Win32 Release"
   # Name "gen_test_char - Win32 Debug"
  -# Begin Group "Source Files"
  -
  -# PROP Default_Filter ""
   # Begin Source File
   
   SOURCE=.\gen_test_char.c
   # End Source File
  -# End Group
   # End Target
   # End Project
  
  
  
  1.6       +7 -8      apache-2.0/src/main/gen_uri_delims.dsp
  
  Index: gen_uri_delims.dsp
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/main/gen_uri_delims.dsp,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- gen_uri_delims.dsp	2000/05/17 23:30:11	1.5
  +++ gen_uri_delims.dsp	2000/05/19 05:09:15	1.6
  @@ -17,8 +17,10 @@
   !MESSAGE 
   !MESSAGE Possible choices for configuration are:
   !MESSAGE 
  -!MESSAGE "gen_uri_delims - Win32 Release" (based on "Win32 (x86) Console Application")
  -!MESSAGE "gen_uri_delims - Win32 Debug" (based on "Win32 (x86) Console Application")
  +!MESSAGE "gen_uri_delims - Win32 Release" (based on\
  + "Win32 (x86) Console Application")
  +!MESSAGE "gen_uri_delims - Win32 Debug" (based on\
  + "Win32 (x86) Console Application")
   !MESSAGE 
   
   # Begin Project
  @@ -49,7 +51,7 @@
   # ADD BSC32 /nologo
   LINK32=link.exe
   # ADD BASE LINK32 kernel32.lib /nologo /subsystem:console /machine:I386
  -# ADD LINK32 kernel32.lib /nologo /subsystem:console /pdb:none /machine:I386
  +# ADD LINK32 kernel32.lib /nologo /subsystem:console /pdb:none /map /machine:I386
   
   !ELSEIF  "$(CFG)" == "gen_uri_delims - Win32 Debug"
   
  @@ -65,7 +67,7 @@
   # PROP Ignore_Export_Lib 0
   # PROP Target_Dir ""
   # ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
  -# ADD CPP /nologo /MDd /W3 /Gm /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
  +# ADD CPP /nologo /MDd /W3 /Gm /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
   # ADD BASE RSC /l 0x809 /d "_DEBUG"
   # ADD RSC /l 0x809 /d "_DEBUG"
   BSC32=bscmake.exe
  @@ -74,6 +76,7 @@
   LINK32=link.exe
   # ADD BASE LINK32 kernel32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
   # ADD LINK32 kernel32.lib /nologo /subsystem:console /pdb:none /debug /machine:I386
  +# SUBTRACT LINK32 /map
   
   !ENDIF 
   
  @@ -81,13 +84,9 @@
   
   # Name "gen_uri_delims - Win32 Release"
   # Name "gen_uri_delims - Win32 Debug"
  -# Begin Group "Source Files"
  -
  -# PROP Default_Filter ""
   # Begin Source File
   
   SOURCE=.\gen_uri_delims.c
   # End Source File
  -# End Group
   # End Target
   # End Project
  
  
  
  1.5       +2 -5      apache-2.0/src/modules/proxy/ApacheModuleProxy.dsp
  
  Index: ApacheModuleProxy.dsp
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/modules/proxy/ApacheModuleProxy.dsp,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- ApacheModuleProxy.dsp	2000/04/22 15:44:56	1.4
  +++ ApacheModuleProxy.dsp	2000/05/19 05:09:15	1.5
  @@ -81,7 +81,8 @@
   # ADD BSC32 /nologo
   LINK32=link.exe
   # ADD BASE LINK32 ApacheCore.lib aprlib.lib kernel32.lib ws2_32.lib mswsock.lib /nologo /subsystem:windows /dll /map /debug /machine:I386 /libpath:"..\..\CoreD" /libpath:"..\..\lib\apr\Debug" /base:@BaseAddr.ref,mod_proxy
  -# ADD LINK32 ApacheCore.lib aprlib.lib kernel32.lib ws2_32.lib mswsock.lib /nologo /subsystem:windows /dll /map /debug /machine:I386 /libpath:"..\..\CoreD" /libpath:"..\..\lib\apr\Debug" /base:@BaseAddr.ref,mod_proxy
  +# ADD LINK32 ApacheCore.lib aprlib.lib kernel32.lib ws2_32.lib mswsock.lib /nologo /subsystem:windows /dll /debug /machine:I386 /libpath:"..\..\CoreD" /libpath:"..\..\lib\apr\Debug" /base:@BaseAddr.ref,mod_proxy
  +# SUBTRACT LINK32 /incremental:no /map
   
   !ENDIF 
   
  @@ -124,10 +125,6 @@
   
   SOURCE=.\mod_proxy.h
   # End Source File
  -# End Group
  -# Begin Group "Resource Files"
  -
  -# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;cnt;rtf;gif;jpg;jpeg;jpe"
   # End Group
   # End Target
   # End Project
  
  
  
  1.6       +5 -20     apache-2.0/src/os/win32/ApacheModuleAuthAnon.dsp
  
  Index: ApacheModuleAuthAnon.dsp
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/os/win32/ApacheModuleAuthAnon.dsp,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- ApacheModuleAuthAnon.dsp	2000/04/20 19:28:06	1.5
  +++ ApacheModuleAuthAnon.dsp	2000/05/19 05:09:16	1.6
  @@ -55,8 +55,8 @@
   # ADD BASE BSC32 /nologo
   # ADD BSC32 /nologo
   LINK32=link.exe
  -# ADD BASE LINK32 ApacheCore.lib aprlib.lib kernel32.lib /nologo /base:@BaseAddr.ref,mod_auth_anon /subsystem:windows /dll /map /machine:I386 /libpath:"..\..\CoreR" /libpath:"..\..\lib\apr\Release"
  -# ADD LINK32 ApacheCore.lib aprlib.lib kernel32.lib /nologo /base:@BaseAddr.ref,mod_auth_anon /subsystem:windows /dll /map /machine:I386 /libpath:"..\..\CoreR" /libpath:"..\..\lib\apr\Release"
  +# ADD BASE LINK32 ApacheCore.lib aprlib.lib kernel32.lib /nologo /subsystem:windows /dll /map /machine:I386 /libpath:"..\..\CoreR" /libpath:"..\..\lib\apr\Release" /base:@BaseAddr.ref,mod_auth_anon
  +# ADD LINK32 ApacheCore.lib aprlib.lib kernel32.lib /nologo /subsystem:windows /dll /map /machine:I386 /libpath:"..\..\CoreR" /libpath:"..\..\lib\apr\Release" /base:@BaseAddr.ref,mod_auth_anon
   
   !ELSEIF  "$(CFG)" == "ApacheModuleAuthAnon - Win32 Debug"
   
  @@ -82,8 +82,9 @@
   # ADD BASE BSC32 /nologo
   # ADD BSC32 /nologo
   LINK32=link.exe
  -# ADD BASE LINK32 ApacheCore.lib aprlib.lib kernel32.lib /nologo /base:@BaseAddr.ref,mod_auth_anon /subsystem:windows /dll /map /debug /machine:I386 /libpath:"..\..\CoreD" /libpath:"..\..\lib\apr\Debug"
  -# ADD LINK32 ApacheCore.lib aprlib.lib kernel32.lib /nologo /base:@BaseAddr.ref,mod_auth_anon /subsystem:windows /dll /map /debug /machine:I386 /libpath:"..\..\CoreD" /libpath:"..\..\lib\apr\Debug"
  +# ADD BASE LINK32 ApacheCore.lib aprlib.lib kernel32.lib /nologo /subsystem:windows /dll /map /debug /machine:I386 /libpath:"..\..\CoreD" /libpath:"..\..\lib\apr\Debug" /base:@BaseAddr.ref,mod_auth_anon
  +# ADD LINK32 ApacheCore.lib aprlib.lib kernel32.lib /nologo /subsystem:windows /dll /debug /machine:I386 /libpath:"..\..\CoreD" /libpath:"..\..\lib\apr\Debug" /base:@BaseAddr.ref,mod_auth_anon
  +# SUBTRACT LINK32 /incremental:no /map
   
   !ENDIF 
   
  @@ -91,25 +92,9 @@
   
   # Name "ApacheModuleAuthAnon - Win32 Release"
   # Name "ApacheModuleAuthAnon - Win32 Debug"
  -# Begin Group "Source Files"
  -
  -# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"
   # Begin Source File
   
   SOURCE=..\..\modules\standard\mod_auth_anon.c
   # End Source File
  -# End Group
  -# Begin Group "Header Files"
  -
  -# PROP Default_Filter "h;hpp;hxx;hm;inl;fi;fd"
  -# Begin Source File
  -
  -SOURCE=.\readdir.h
  -# End Source File
  -# End Group
  -# Begin Group "Resource Files"
  -
  -# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;cnt;rtf;gif;jpg;jpeg;jpe"
  -# End Group
   # End Target
   # End Project
  
  
  
  1.6       +13 -10    apache-2.0/src/os/win32/ApacheModuleAuthDigest.dsp
  
  Index: ApacheModuleAuthDigest.dsp
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/os/win32/ApacheModuleAuthDigest.dsp,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- ApacheModuleAuthDigest.dsp	2000/05/17 23:30:12	1.5
  +++ ApacheModuleAuthDigest.dsp	2000/05/19 05:09:16	1.6
  @@ -13,12 +13,15 @@
   !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 "ApacheModuleAuthDigest.mak" CFG="ApacheModuleAuthDigest - Win32 Debug"
  +!MESSAGE NMAKE /f "ApacheModuleAuthDigest.mak"\
  + CFG="ApacheModuleAuthDigest - Win32 Debug"
   !MESSAGE 
   !MESSAGE Possible choices for configuration are:
   !MESSAGE 
  -!MESSAGE "ApacheModuleAuthDigest - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
  -!MESSAGE "ApacheModuleAuthDigest - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
  +!MESSAGE "ApacheModuleAuthDigest - Win32 Release" (based on\
  + "Win32 (x86) Dynamic-Link Library")
  +!MESSAGE "ApacheModuleAuthDigest - Win32 Debug" (based on\
  + "Win32 (x86) Dynamic-Link Library")
   !MESSAGE 
   
   # Begin Project
  @@ -43,8 +46,8 @@
   # PROP Target_Dir ""
   # ADD BASE CPP /nologo /MD /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /FD /c
   # ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\include" /I ".\\" /I "..\..\lib\apr\include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /FD /c
  -# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
  -# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
  +# 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
  @@ -69,9 +72,9 @@
   # PROP Ignore_Export_Lib 0
   # PROP Target_Dir ""
   # ADD BASE CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /FD /c
  -# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\..\include" /I ".\\" /I "..\..\lib\apr\include" /D "_DEBUG" /D "SHARED_MODULE" /D "WIN32" /D "_WINDOWS" /FD /c
  -# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
  -# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
  +# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\include" /I ".\\" /I "..\..\lib\apr\include" /D "_DEBUG" /D "SHARED_MODULE" /D "WIN32" /D "_WINDOWS" /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
  @@ -79,8 +82,8 @@
   # ADD BSC32 /nologo
   LINK32=link.exe
   # ADD BASE LINK32 ApacheCore.lib aprlib.lib kernel32.lib /nologo /subsystem:windows /dll /debug /machine:I386 /pdbtype:sept
  -# ADD LINK32 ApacheCore.lib aprlib.lib kernel32.lib /nologo /subsystem:windows /dll /map /debug /machine:I386 /pdbtype:sept /libpath:"..\..\CoreD" /libpath:"..\..\lib\apr\Debug" /base:@BaseAddr.ref,mod_auth_digest
  -# SUBTRACT LINK32 /pdb:none
  +# ADD LINK32 ApacheCore.lib aprlib.lib kernel32.lib /nologo /subsystem:windows /dll /debug /machine:I386 /pdbtype:sept /libpath:"..\..\CoreD" /libpath:"..\..\lib\apr\Debug" /base:@BaseAddr.ref,mod_auth_digest
  +# SUBTRACT LINK32 /pdb:none /incremental:no /map
   
   !ENDIF 
   
  
  
  
  1.7       +9 -21     apache-2.0/src/os/win32/ApacheModuleCERNMeta.dsp
  
  Index: ApacheModuleCERNMeta.dsp
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/os/win32/ApacheModuleCERNMeta.dsp,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- ApacheModuleCERNMeta.dsp	2000/05/17 23:30:12	1.6
  +++ ApacheModuleCERNMeta.dsp	2000/05/19 05:09:16	1.7
  @@ -13,12 +13,15 @@
   !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 "ApacheModuleCERNMeta.mak" CFG="ApacheModuleCERNMeta - Win32 Release"
  +!MESSAGE NMAKE /f "ApacheModuleCERNMeta.mak"\
  + CFG="ApacheModuleCERNMeta - Win32 Release"
   !MESSAGE 
   !MESSAGE Possible choices for configuration are:
   !MESSAGE 
  -!MESSAGE "ApacheModuleCERNMeta - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
  -!MESSAGE "ApacheModuleCERNMeta - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
  +!MESSAGE "ApacheModuleCERNMeta - Win32 Release" (based on\
  + "Win32 (x86) Dynamic-Link Library")
  +!MESSAGE "ApacheModuleCERNMeta - Win32 Debug" (based on\
  + "Win32 (x86) Dynamic-Link Library")
   !MESSAGE 
   
   # Begin Project
  @@ -69,7 +72,7 @@
   # PROP Ignore_Export_Lib 0
   # PROP Target_Dir ""
   # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /c
  -# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\..\include" /I ".\\" /I "..\..\lib\apr\include" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /FD /c
  +# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\include" /I ".\\" /I "..\..\lib\apr\include" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /FD /c
   # SUBTRACT CPP /YX
   # ADD BASE MTL /nologo /D "_DEBUG" /win32
   # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
  @@ -80,7 +83,8 @@
   # ADD BSC32 /nologo
   LINK32=link.exe
   # ADD BASE LINK32 ApacheCore.lib aprlib.lib kernel32.lib /nologo /subsystem:windows /dll /map /debug /machine:I386 /libpath:"..\..\CoreD" /libpath:"..\..\lib\apr\Debug" /base:@BaseAddr.ref,mod_cern_meta
  -# ADD LINK32 ApacheCore.lib aprlib.lib kernel32.lib /nologo /subsystem:windows /dll /map /debug /machine:I386 /libpath:"..\..\CoreD" /libpath:"..\..\lib\apr\Debug" /base:@BaseAddr.ref,mod_cern_meta
  +# ADD LINK32 ApacheCore.lib aprlib.lib kernel32.lib /nologo /subsystem:windows /dll /debug /machine:I386 /libpath:"..\..\CoreD" /libpath:"..\..\lib\apr\Debug" /base:@BaseAddr.ref,mod_cern_meta
  +# SUBTRACT LINK32 /incremental:no /map
   
   !ENDIF 
   
  @@ -88,25 +92,9 @@
   
   # Name "ApacheModuleCERNMeta - Win32 Release"
   # Name "ApacheModuleCERNMeta - Win32 Debug"
  -# Begin Group "Source Files"
  -
  -# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"
   # Begin Source File
   
   SOURCE=..\..\modules\standard\mod_cern_meta.c
   # End Source File
  -# End Group
  -# Begin Group "Header Files"
  -
  -# PROP Default_Filter "h;hpp;hxx;hm;inl;fi;fd"
  -# Begin Source File
  -
  -SOURCE=.\readdir.h
  -# End Source File
  -# End Group
  -# Begin Group "Resource Files"
  -
  -# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;cnt;rtf;gif;jpg;jpeg;jpe"
  -# End Group
   # End Target
   # End Project
  
  
  
  1.7       +9 -21     apache-2.0/src/os/win32/ApacheModuleExpires.dsp
  
  Index: ApacheModuleExpires.dsp
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/os/win32/ApacheModuleExpires.dsp,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- ApacheModuleExpires.dsp	2000/05/17 23:30:12	1.6
  +++ ApacheModuleExpires.dsp	2000/05/19 05:09:17	1.7
  @@ -13,12 +13,15 @@
   !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 "ApacheModuleExpires.mak" CFG="ApacheModuleExpires - Win32 Release"
  +!MESSAGE NMAKE /f "ApacheModuleExpires.mak"\
  + CFG="ApacheModuleExpires - Win32 Release"
   !MESSAGE 
   !MESSAGE Possible choices for configuration are:
   !MESSAGE 
  -!MESSAGE "ApacheModuleExpires - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
  -!MESSAGE "ApacheModuleExpires - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
  +!MESSAGE "ApacheModuleExpires - Win32 Release" (based on\
  + "Win32 (x86) Dynamic-Link Library")
  +!MESSAGE "ApacheModuleExpires - Win32 Debug" (based on\
  + "Win32 (x86) Dynamic-Link Library")
   !MESSAGE 
   
   # Begin Project
  @@ -69,7 +72,7 @@
   # PROP Ignore_Export_Lib 0
   # PROP Target_Dir ""
   # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /c
  -# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\..\include" /I ".\\" /I "..\..\lib\apr\include" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /FD /c
  +# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\include" /I ".\\" /I "..\..\lib\apr\include" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /FD /c
   # SUBTRACT CPP /YX
   # ADD BASE MTL /nologo /D "_DEBUG" /win32
   # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
  @@ -80,7 +83,8 @@
   # ADD BSC32 /nologo
   LINK32=link.exe
   # ADD BASE LINK32 ApacheCore.lib aprlib.lib kernel32.lib /nologo /subsystem:windows /dll /map /debug /machine:I386 /libpath:"..\..\CoreD" /libpath:"..\..\lib\apr\Debug" /base:@BaseAddr.ref,mod_expires
  -# ADD LINK32 ApacheCore.lib aprlib.lib kernel32.lib /nologo /subsystem:windows /dll /map /debug /machine:I386 /libpath:"..\..\CoreD" /libpath:"..\..\lib\apr\Debug" /base:@BaseAddr.ref,mod_expires
  +# ADD LINK32 ApacheCore.lib aprlib.lib kernel32.lib /nologo /subsystem:windows /dll /debug /machine:I386 /libpath:"..\..\CoreD" /libpath:"..\..\lib\apr\Debug" /base:@BaseAddr.ref,mod_expires
  +# SUBTRACT LINK32 /incremental:no /map
   
   !ENDIF 
   
  @@ -88,25 +92,9 @@
   
   # Name "ApacheModuleExpires - Win32 Release"
   # Name "ApacheModuleExpires - Win32 Debug"
  -# Begin Group "Source Files"
  -
  -# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"
   # Begin Source File
   
   SOURCE=..\..\modules\standard\mod_expires.c
   # End Source File
  -# End Group
  -# Begin Group "Header Files"
  -
  -# PROP Default_Filter "h;hpp;hxx;hm;inl;fi;fd"
  -# Begin Source File
  -
  -SOURCE=.\readdir.h
  -# End Source File
  -# End Group
  -# Begin Group "Resource Files"
  -
  -# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;cnt;rtf;gif;jpg;jpeg;jpe"
  -# End Group
   # End Target
   # End Project
  
  
  
  1.3       +13 -9     apache-2.0/src/os/win32/ApacheModuleFileCache.dsp
  
  Index: ApacheModuleFileCache.dsp
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/os/win32/ApacheModuleFileCache.dsp,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- ApacheModuleFileCache.dsp	2000/05/17 23:30:12	1.2
  +++ ApacheModuleFileCache.dsp	2000/05/19 05:09:17	1.3
  @@ -13,12 +13,15 @@
   !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 "ApacheModuleFileCache.mak" CFG="ApacheModuleFileCache - Win32 Debug"
  +!MESSAGE NMAKE /f "ApacheModuleFileCache.mak"\
  + CFG="ApacheModuleFileCache - Win32 Debug"
   !MESSAGE 
   !MESSAGE Possible choices for configuration are:
   !MESSAGE 
  -!MESSAGE "ApacheModuleFileCache - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
  -!MESSAGE "ApacheModuleFileCache - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
  +!MESSAGE "ApacheModuleFileCache - Win32 Release" (based on\
  + "Win32 (x86) Dynamic-Link Library")
  +!MESSAGE "ApacheModuleFileCache - Win32 Debug" (based on\
  + "Win32 (x86) Dynamic-Link Library")
   !MESSAGE 
   
   # Begin Project
  @@ -44,8 +47,8 @@
   # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
   # ADD CPP /nologo /MT /W3 /GX /O2 /I "..\..\include" /I ".\\" /I "..\..\lib\apr\include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /FD /c
   # SUBTRACT CPP /YX
  -# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
  -# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
  +# 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
  @@ -69,10 +72,10 @@
   # PROP Ignore_Export_Lib 0
   # PROP Target_Dir ""
   # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
  -# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "..\..\include" /I ".\\" /I "..\..\lib\apr\include" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /FD /c
  +# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "..\..\include" /I ".\\" /I "..\..\lib\apr\include" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /FD /c
   # SUBTRACT CPP /YX
  -# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
  -# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
  +# 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
  @@ -80,7 +83,8 @@
   # 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 /subsystem:windows /dll /debug /machine:I386 /pdbtype:sept
  -# ADD LINK32 ApacheCore.lib aprlib.lib kernel32.lib /nologo /subsystem:windows /dll /incremental:no /map /debug /machine:I386 /pdbtype:sept /libpath:"..\..\CoreD" /libpath:"..\..\lib\apr\Debug"
  +# ADD LINK32 ApacheCore.lib aprlib.lib kernel32.lib /nologo /subsystem:windows /dll /debug /machine:I386 /pdbtype:sept /libpath:"..\..\CoreD" /libpath:"..\..\lib\apr\Debug"
  +# SUBTRACT LINK32 /incremental:no /map
   
   !ENDIF 
   
  
  
  
  1.7       +9 -21     apache-2.0/src/os/win32/ApacheModuleHeaders.dsp
  
  Index: ApacheModuleHeaders.dsp
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/os/win32/ApacheModuleHeaders.dsp,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- ApacheModuleHeaders.dsp	2000/05/17 23:30:13	1.6
  +++ ApacheModuleHeaders.dsp	2000/05/19 05:09:17	1.7
  @@ -13,12 +13,15 @@
   !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 "ApacheModuleHeaders.mak" CFG="ApacheModuleHeaders - Win32 Release"
  +!MESSAGE NMAKE /f "ApacheModuleHeaders.mak"\
  + CFG="ApacheModuleHeaders - Win32 Release"
   !MESSAGE 
   !MESSAGE Possible choices for configuration are:
   !MESSAGE 
  -!MESSAGE "ApacheModuleHeaders - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
  -!MESSAGE "ApacheModuleHeaders - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
  +!MESSAGE "ApacheModuleHeaders - Win32 Release" (based on\
  + "Win32 (x86) Dynamic-Link Library")
  +!MESSAGE "ApacheModuleHeaders - Win32 Debug" (based on\
  + "Win32 (x86) Dynamic-Link Library")
   !MESSAGE 
   
   # Begin Project
  @@ -69,7 +72,7 @@
   # PROP Ignore_Export_Lib 0
   # PROP Target_Dir ""
   # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /c
  -# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\..\include" /I ".\\" /I "..\..\lib\apr\include" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /FD /c
  +# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\include" /I ".\\" /I "..\..\lib\apr\include" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /FD /c
   # SUBTRACT CPP /YX
   # ADD BASE MTL /nologo /D "_DEBUG" /win32
   # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
  @@ -80,7 +83,8 @@
   # ADD BSC32 /nologo
   LINK32=link.exe
   # ADD BASE LINK32 ApacheCore.lib aprlib.lib kernel32.lib /nologo /subsystem:windows /dll /map /debug /machine:I386 /libpath:"..\..\CoreD" /libpath:"..\..\lib\apr\Debug" /base:@BaseAddr.ref,mod_headers
  -# ADD LINK32 ApacheCore.lib aprlib.lib kernel32.lib /nologo /subsystem:windows /dll /map /debug /machine:I386 /libpath:"..\..\CoreD" /libpath:"..\..\lib\apr\Debug" /base:@BaseAddr.ref,mod_headers
  +# ADD LINK32 ApacheCore.lib aprlib.lib kernel32.lib /nologo /subsystem:windows /dll /debug /machine:I386 /libpath:"..\..\CoreD" /libpath:"..\..\lib\apr\Debug" /base:@BaseAddr.ref,mod_headers
  +# SUBTRACT LINK32 /incremental:no /map
   
   !ENDIF 
   
  @@ -88,25 +92,9 @@
   
   # Name "ApacheModuleHeaders - Win32 Release"
   # Name "ApacheModuleHeaders - Win32 Debug"
  -# Begin Group "Source Files"
  -
  -# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"
   # Begin Source File
   
   SOURCE=..\..\modules\standard\mod_headers.c
   # End Source File
  -# End Group
  -# Begin Group "Header Files"
  -
  -# PROP Default_Filter "h;hpp;hxx;hm;inl;fi;fd"
  -# Begin Source File
  -
  -SOURCE=.\readdir.h
  -# End Source File
  -# End Group
  -# Begin Group "Resource Files"
  -
  -# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;cnt;rtf;gif;jpg;jpeg;jpe"
  -# End Group
   # End Target
   # End Project
  
  
  
  1.7       +7 -20     apache-2.0/src/os/win32/ApacheModuleInfo.dsp
  
  Index: ApacheModuleInfo.dsp
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/os/win32/ApacheModuleInfo.dsp,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- ApacheModuleInfo.dsp	2000/05/17 23:30:13	1.6
  +++ ApacheModuleInfo.dsp	2000/05/19 05:09:17	1.7
  @@ -17,8 +17,10 @@
   !MESSAGE 
   !MESSAGE Possible choices for configuration are:
   !MESSAGE 
  -!MESSAGE "ApacheModuleInfo - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
  -!MESSAGE "ApacheModuleInfo - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
  +!MESSAGE "ApacheModuleInfo - Win32 Release" (based on\
  + "Win32 (x86) Dynamic-Link Library")
  +!MESSAGE "ApacheModuleInfo - Win32 Debug" (based on\
  + "Win32 (x86) Dynamic-Link Library")
   !MESSAGE 
   
   # Begin Project
  @@ -69,7 +71,7 @@
   # PROP Ignore_Export_Lib 0
   # PROP Target_Dir ""
   # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /c
  -# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\..\include" /I ".\\" /I "..\..\lib\apr\include" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /FD /c
  +# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\include" /I ".\\" /I "..\..\lib\apr\include" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /FD /c
   # SUBTRACT CPP /YX
   # ADD BASE MTL /nologo /D "_DEBUG" /win32
   # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
  @@ -80,7 +82,8 @@
   # ADD BSC32 /nologo
   LINK32=link.exe
   # ADD BASE LINK32 ApacheCore.lib aprlib.lib kernel32.lib /nologo /subsystem:windows /dll /map /debug /machine:I386 /libpath:"..\..\CoreD" /libpath:"..\..\lib\apr\Debug" /base:@BaseAddr.ref,mod_info
  -# ADD LINK32 ApacheCore.lib aprlib.lib kernel32.lib /nologo /subsystem:windows /dll /map /debug /machine:I386 /libpath:"..\..\CoreD" /libpath:"..\..\lib\apr\Debug" /base:@BaseAddr.ref,mod_info
  +# ADD LINK32 ApacheCore.lib aprlib.lib kernel32.lib /nologo /subsystem:windows /dll /debug /machine:I386 /libpath:"..\..\CoreD" /libpath:"..\..\lib\apr\Debug" /base:@BaseAddr.ref,mod_info
  +# SUBTRACT LINK32 /incremental:no /map
   
   !ENDIF 
   
  @@ -88,25 +91,9 @@
   
   # Name "ApacheModuleInfo - Win32 Release"
   # Name "ApacheModuleInfo - Win32 Debug"
  -# Begin Group "Source Files"
  -
  -# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"
   # Begin Source File
   
   SOURCE=..\..\modules\standard\mod_info.c
   # End Source File
  -# End Group
  -# Begin Group "Header Files"
  -
  -# PROP Default_Filter "h;hpp;hxx;hm;inl;fi;fd"
  -# Begin Source File
  -
  -SOURCE=.\readdir.h
  -# End Source File
  -# End Group
  -# Begin Group "Resource Files"
  -
  -# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;cnt;rtf;gif;jpg;jpeg;jpe"
  -# End Group
   # End Target
   # End Project
  
  
  
  1.7       +9 -17     apache-2.0/src/os/win32/ApacheModuleRewrite.dsp
  
  Index: ApacheModuleRewrite.dsp
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/os/win32/ApacheModuleRewrite.dsp,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- ApacheModuleRewrite.dsp	2000/05/17 23:30:14	1.6
  +++ ApacheModuleRewrite.dsp	2000/05/19 05:09:17	1.7
  @@ -13,12 +13,15 @@
   !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 "ApacheModuleRewrite.mak" CFG="ApacheModuleRewrite - Win32 Release"
  +!MESSAGE NMAKE /f "ApacheModuleRewrite.mak"\
  + CFG="ApacheModuleRewrite - Win32 Release"
   !MESSAGE 
   !MESSAGE Possible choices for configuration are:
   !MESSAGE 
  -!MESSAGE "ApacheModuleRewrite - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
  -!MESSAGE "ApacheModuleRewrite - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
  +!MESSAGE "ApacheModuleRewrite - Win32 Release" (based on\
  + "Win32 (x86) Dynamic-Link Library")
  +!MESSAGE "ApacheModuleRewrite - Win32 Debug" (based on\
  + "Win32 (x86) Dynamic-Link Library")
   !MESSAGE 
   
   # Begin Project
  @@ -69,7 +72,7 @@
   # PROP Ignore_Export_Lib 0
   # PROP Target_Dir ""
   # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /c
  -# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\..\include" /I ".\\" /I "..\..\lib\apr\include" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "NO_DBM_REWRITEMAP" /D "SHARED_MODULE" /D "WIN32_LEAN_AND_MEAN" /FD /c
  +# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\include" /I ".\\" /I "..\..\lib\apr\include" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "NO_DBM_REWRITEMAP" /D "SHARED_MODULE" /D "WIN32_LEAN_AND_MEAN" /FD /c
   # SUBTRACT CPP /YX
   # ADD BASE MTL /nologo /D "_DEBUG" /win32
   # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
  @@ -80,7 +83,8 @@
   # ADD BSC32 /nologo
   LINK32=link.exe
   # ADD BASE LINK32 ApacheCore.lib aprlib.lib kernel32.lib /nologo /subsystem:windows /dll /map /debug /machine:I386 /libpath:"..\..\CoreD" /libpath:"..\..\lib\apr\Debug" /base:@BaseAddr.ref,mod_rewrite
  -# ADD LINK32 ApacheCore.lib aprlib.lib kernel32.lib /nologo /subsystem:windows /dll /map /debug /machine:I386 /libpath:"..\..\CoreD" /libpath:"..\..\lib\apr\Debug" /base:@BaseAddr.ref,mod_rewrite
  +# ADD LINK32 ApacheCore.lib aprlib.lib kernel32.lib /nologo /subsystem:windows /dll /debug /machine:I386 /libpath:"..\..\CoreD" /libpath:"..\..\lib\apr\Debug" /base:@BaseAddr.ref,mod_rewrite
  +# SUBTRACT LINK32 /incremental:no /map
   
   !ENDIF 
   
  @@ -99,18 +103,6 @@
   
   SOURCE=.\passwd.c
   # End Source File
  -# End Group
  -# Begin Group "Header Files"
  -
  -# PROP Default_Filter "h;hpp;hxx;hm;inl;fi;fd"
  -# Begin Source File
  -
  -SOURCE=.\readdir.h
  -# End Source File
  -# End Group
  -# Begin Group "Resource Files"
  -
  -# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;cnt;rtf;gif;jpg;jpeg;jpe"
   # End Group
   # End Target
   # End Project
  
  
  
  1.7       +9 -21     apache-2.0/src/os/win32/ApacheModuleSpeling.dsp
  
  Index: ApacheModuleSpeling.dsp
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/os/win32/ApacheModuleSpeling.dsp,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- ApacheModuleSpeling.dsp	2000/05/17 23:30:14	1.6
  +++ ApacheModuleSpeling.dsp	2000/05/19 05:09:17	1.7
  @@ -13,12 +13,15 @@
   !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 "ApacheModuleSpeling.mak" CFG="ApacheModuleSpeling - Win32 Release"
  +!MESSAGE NMAKE /f "ApacheModuleSpeling.mak"\
  + CFG="ApacheModuleSpeling - Win32 Release"
   !MESSAGE 
   !MESSAGE Possible choices for configuration are:
   !MESSAGE 
  -!MESSAGE "ApacheModuleSpeling - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
  -!MESSAGE "ApacheModuleSpeling - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
  +!MESSAGE "ApacheModuleSpeling - Win32 Release" (based on\
  + "Win32 (x86) Dynamic-Link Library")
  +!MESSAGE "ApacheModuleSpeling - Win32 Debug" (based on\
  + "Win32 (x86) Dynamic-Link Library")
   !MESSAGE 
   
   # Begin Project
  @@ -69,7 +72,7 @@
   # PROP Ignore_Export_Lib 0
   # PROP Target_Dir ""
   # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /c
  -# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\..\include" /I ".\\" /I "..\..\lib\apr\include" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /FD /c
  +# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\include" /I ".\\" /I "..\..\lib\apr\include" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /FD /c
   # SUBTRACT CPP /YX
   # ADD BASE MTL /nologo /D "_DEBUG" /win32
   # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
  @@ -80,7 +83,8 @@
   # ADD BSC32 /nologo
   LINK32=link.exe
   # ADD BASE LINK32 ApacheCore.lib aprlib.lib kernel32.lib /nologo /subsystem:windows /dll /map /debug /machine:I386 /libpath:"..\..\CoreD" /libpath:"..\..\lib\apr\Debug" /base:@BaseAddr.ref,mod_speling
  -# ADD LINK32 ApacheCore.lib aprlib.lib kernel32.lib /nologo /subsystem:windows /dll /map /debug /machine:I386 /libpath:"..\..\CoreD" /libpath:"..\..\lib\apr\Debug" /base:@BaseAddr.ref,mod_speling
  +# ADD LINK32 ApacheCore.lib aprlib.lib kernel32.lib /nologo /subsystem:windows /dll /debug /machine:I386 /libpath:"..\..\CoreD" /libpath:"..\..\lib\apr\Debug" /base:@BaseAddr.ref,mod_speling
  +# SUBTRACT LINK32 /incremental:no /map
   
   !ENDIF 
   
  @@ -88,25 +92,9 @@
   
   # Name "ApacheModuleSpeling - Win32 Release"
   # Name "ApacheModuleSpeling - Win32 Debug"
  -# Begin Group "Source Files"
  -
  -# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"
   # Begin Source File
   
   SOURCE=..\..\modules\standard\mod_speling.c
   # End Source File
  -# End Group
  -# Begin Group "Header Files"
  -
  -# PROP Default_Filter "h;hpp;hxx;hm;inl;fi;fd"
  -# Begin Source File
  -
  -SOURCE=.\readdir.h
  -# End Source File
  -# End Group
  -# Begin Group "Resource Files"
  -
  -# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;cnt;rtf;gif;jpg;jpeg;jpe"
  -# End Group
   # End Target
   # End Project
  
  
  
  1.7       +9 -21     apache-2.0/src/os/win32/ApacheModuleStatus.dsp
  
  Index: ApacheModuleStatus.dsp
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/os/win32/ApacheModuleStatus.dsp,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- ApacheModuleStatus.dsp	2000/05/17 23:30:14	1.6
  +++ ApacheModuleStatus.dsp	2000/05/19 05:09:17	1.7
  @@ -13,12 +13,15 @@
   !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 "ApacheModuleStatus.mak" CFG="ApacheModuleStatus - Win32 Release"
  +!MESSAGE NMAKE /f "ApacheModuleStatus.mak"\
  + CFG="ApacheModuleStatus - Win32 Release"
   !MESSAGE 
   !MESSAGE Possible choices for configuration are:
   !MESSAGE 
  -!MESSAGE "ApacheModuleStatus - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
  -!MESSAGE "ApacheModuleStatus - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
  +!MESSAGE "ApacheModuleStatus - Win32 Release" (based on\
  + "Win32 (x86) Dynamic-Link Library")
  +!MESSAGE "ApacheModuleStatus - Win32 Debug" (based on\
  + "Win32 (x86) Dynamic-Link Library")
   !MESSAGE 
   
   # Begin Project
  @@ -69,7 +72,7 @@
   # PROP Ignore_Export_Lib 0
   # PROP Target_Dir ""
   # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /c
  -# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\..\include" /I ".\\" /I "..\..\lib\apr\include" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /FD /c
  +# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\include" /I ".\\" /I "..\..\lib\apr\include" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /FD /c
   # SUBTRACT CPP /YX
   # ADD BASE MTL /nologo /D "_DEBUG" /win32
   # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
  @@ -80,7 +83,8 @@
   # ADD BSC32 /nologo
   LINK32=link.exe
   # ADD BASE LINK32 ApacheCore.lib aprlib.lib kernel32.lib /nologo /subsystem:windows /dll /map /debug /machine:I386 /libpath:"..\..\CoreD" /libpath:"..\..\lib\apr\Debug" /base:@BaseAddr.ref,mod_status
  -# ADD LINK32 ApacheCore.lib aprlib.lib kernel32.lib /nologo /subsystem:windows /dll /map /debug /machine:I386 /libpath:"..\..\CoreD" /libpath:"..\..\lib\apr\Debug" /base:@BaseAddr.ref,mod_status
  +# ADD LINK32 ApacheCore.lib aprlib.lib kernel32.lib /nologo /subsystem:windows /dll /debug /machine:I386 /libpath:"..\..\CoreD" /libpath:"..\..\lib\apr\Debug" /base:@BaseAddr.ref,mod_status
  +# SUBTRACT LINK32 /incremental:no /map
   
   !ENDIF 
   
  @@ -88,25 +92,9 @@
   
   # Name "ApacheModuleStatus - Win32 Release"
   # Name "ApacheModuleStatus - Win32 Debug"
  -# Begin Group "Source Files"
  -
  -# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"
   # Begin Source File
   
   SOURCE=..\..\modules\standard\mod_status.c
   # End Source File
  -# End Group
  -# Begin Group "Header Files"
  -
  -# PROP Default_Filter "h;hpp;hxx;hm;inl;fi;fd"
  -# Begin Source File
  -
  -SOURCE=.\readdir.h
  -# End Source File
  -# End Group
  -# Begin Group "Resource Files"
  -
  -# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;cnt;rtf;gif;jpg;jpeg;jpe"
  -# End Group
   # End Target
   # End Project
  
  
  
  1.7       +9 -21     apache-2.0/src/os/win32/ApacheModuleUserTrack.dsp
  
  Index: ApacheModuleUserTrack.dsp
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/os/win32/ApacheModuleUserTrack.dsp,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- ApacheModuleUserTrack.dsp	2000/05/17 23:30:14	1.6
  +++ ApacheModuleUserTrack.dsp	2000/05/19 05:09:17	1.7
  @@ -13,12 +13,15 @@
   !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 "ApacheModuleUserTrack.mak" CFG="ApacheModuleUserTrack - Win32 Release"
  +!MESSAGE NMAKE /f "ApacheModuleUserTrack.mak"\
  + CFG="ApacheModuleUserTrack - Win32 Release"
   !MESSAGE 
   !MESSAGE Possible choices for configuration are:
   !MESSAGE 
  -!MESSAGE "ApacheModuleUserTrack - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
  -!MESSAGE "ApacheModuleUserTrack - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
  +!MESSAGE "ApacheModuleUserTrack - Win32 Release" (based on\
  + "Win32 (x86) Dynamic-Link Library")
  +!MESSAGE "ApacheModuleUserTrack - Win32 Debug" (based on\
  + "Win32 (x86) Dynamic-Link Library")
   !MESSAGE 
   
   # Begin Project
  @@ -69,7 +72,7 @@
   # PROP Ignore_Export_Lib 0
   # PROP Target_Dir ""
   # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /c
  -# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\..\include" /I ".\\" /I "..\..\lib\apr\include" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /FD /c
  +# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\include" /I ".\\" /I "..\..\lib\apr\include" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /FD /c
   # SUBTRACT CPP /YX
   # ADD BASE MTL /nologo /D "_DEBUG" /win32
   # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
  @@ -80,7 +83,8 @@
   # ADD BSC32 /nologo
   LINK32=link.exe
   # ADD BASE LINK32 ApacheCore.lib aprlib.lib kernel32.lib /nologo /subsystem:windows /dll /map /debug /machine:I386 /libpath:"..\..\CoreD" /libpath:"..\..\lib\apr\Debug" /base:@BaseAddr.ref,mod_usertrack
  -# ADD LINK32 ApacheCore.lib aprlib.lib kernel32.lib /nologo /subsystem:windows /dll /map /debug /machine:I386 /libpath:"..\..\CoreD" /libpath:"..\..\lib\apr\Debug" /base:@BaseAddr.ref,mod_usertrack
  +# ADD LINK32 ApacheCore.lib aprlib.lib kernel32.lib /nologo /subsystem:windows /dll /debug /machine:I386 /libpath:"..\..\CoreD" /libpath:"..\..\lib\apr\Debug" /base:@BaseAddr.ref,mod_usertrack
  +# SUBTRACT LINK32 /incremental:no /map
   
   !ENDIF 
   
  @@ -88,25 +92,9 @@
   
   # Name "ApacheModuleUserTrack - Win32 Release"
   # Name "ApacheModuleUserTrack - Win32 Debug"
  -# Begin Group "Source Files"
  -
  -# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"
   # Begin Source File
   
   SOURCE=..\..\modules\standard\mod_usertrack.c
   # End Source File
  -# End Group
  -# Begin Group "Header Files"
  -
  -# PROP Default_Filter "h;hpp;hxx;hm;inl;fi;fd"
  -# Begin Source File
  -
  -SOURCE=.\readdir.h
  -# End Source File
  -# End Group
  -# Begin Group "Resource Files"
  -
  -# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;cnt;rtf;gif;jpg;jpeg;jpe"
  -# End Group
   # End Target
   # End Project
  
  
  
  1.6       +9 -11     apache-2.0/src/os/win32/installer/installdll/install.dsp
  
  Index: install.dsp
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/os/win32/installer/installdll/install.dsp,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- install.dsp	2000/05/17 23:30:19	1.5
  +++ install.dsp	2000/05/19 05:09:19	1.6
  @@ -17,7 +17,8 @@
   !MESSAGE 
   !MESSAGE Possible choices for configuration are:
   !MESSAGE 
  -!MESSAGE "install - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
  +!MESSAGE "install - Win32 Release" (based on\
  + "Win32 (x86) Dynamic-Link Library")
   !MESSAGE "install - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
   !MESSAGE 
   
  @@ -44,8 +45,8 @@
   # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
   # ADD CPP /nologo /MD /W3 /GX /O2 /I "../../../../lib/apr/include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /FD /c
   # SUBTRACT CPP /YX
  -# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
  -# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
  +# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o /win32 "NUL"
  +# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o /win32 "NUL"
   # ADD BASE RSC /l 0x809 /d "NDEBUG"
   # ADD RSC /l 0x809 /d "NDEBUG"
   BSC32=bscmake.exe
  @@ -53,7 +54,7 @@
   # 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 /subsystem:windows /dll /machine:I386
  -# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib wsock32.lib /nologo /subsystem:windows /dll /machine:I386
  +# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib wsock32.lib /nologo /subsystem:windows /dll /map /machine:I386
   
   !ELSEIF  "$(CFG)" == "install - Win32 Debug"
   
  @@ -69,10 +70,10 @@
   # PROP Ignore_Export_Lib 0
   # PROP Target_Dir ""
   # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
  -# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "../../../../lib/apr/include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /FD /c
  +# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../../../../lib/apr/include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /FD /c
   # SUBTRACT CPP /YX
  -# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
  -# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
  +# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o /win32 "NUL"
  +# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o /win32 "NUL"
   # ADD BASE RSC /l 0x809 /d "_DEBUG"
   # ADD RSC /l 0x809 /d "_DEBUG"
   BSC32=bscmake.exe
  @@ -81,6 +82,7 @@
   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 /subsystem:windows /dll /debug /machine:I386 /pdbtype:sept
   # ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib wsock32.lib /nologo /subsystem:windows /dll /debug /machine:I386 /pdbtype:sept
  +# SUBTRACT LINK32 /incremental:no /map
   
   !ENDIF 
   
  @@ -88,9 +90,6 @@
   
   # Name "install - Win32 Release"
   # Name "install - Win32 Debug"
  -# Begin Group "Source Files"
  -
  -# PROP Default_Filter ""
   # Begin Source File
   
   SOURCE=.\install.c
  @@ -99,6 +98,5 @@
   
   SOURCE=.\install.def
   # End Source File
  -# End Group
   # End Target
   # End Project
  
  
  
  1.4       +3 -2      apache-2.0/src/support/ab.dsp
  
  Index: ab.dsp
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/support/ab.dsp,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- ab.dsp	2000/05/06 15:44:40	1.3
  +++ ab.dsp	2000/05/19 05:09:19	1.4
  @@ -49,7 +49,7 @@
   # 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 /subsystem:console /machine:I386
  -# ADD LINK32 kernel32.lib advapi32.lib wsock32.lib ws2_32.lib /nologo /subsystem:console /machine:I386
  +# ADD LINK32 kernel32.lib advapi32.lib wsock32.lib ws2_32.lib /nologo /subsystem:console /map /machine:I386
   # SUBTRACT LINK32 /pdb:none
   
   !ELSEIF  "$(CFG)" == "ab - Win32 Debug"
  @@ -75,7 +75,8 @@
   # 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 /subsystem:console /debug /machine:I386 /pdbtype:sept
  -# ADD LINK32 kernel32.lib advapi32.lib wsock32.lib ws2_32.lib /nologo /subsystem:console /incremental:no /debug /machine:I386 /pdbtype:sept
  +# ADD LINK32 kernel32.lib advapi32.lib wsock32.lib ws2_32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
  +# SUBTRACT LINK32 /incremental:no /map
   
   !ENDIF 
   
  
  
  
  1.6       +3 -2      apache-2.0/src/support/htdigest.dsp
  
  Index: htdigest.dsp
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/support/htdigest.dsp,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- htdigest.dsp	2000/05/06 15:44:40	1.5
  +++ htdigest.dsp	2000/05/19 05:09:19	1.6
  @@ -50,7 +50,7 @@
   # 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 /subsystem:console /machine:I386
  -# ADD LINK32 kernel32.lib advapi32.lib wsock32.lib ws2_32.lib /nologo /subsystem:console /machine:I386
  +# ADD LINK32 kernel32.lib advapi32.lib wsock32.lib ws2_32.lib /nologo /subsystem:console /map /machine:I386
   # SUBTRACT LINK32 /pdb:none
   
   !ELSEIF  "$(CFG)" == "htdigest - Win32 Debug"
  @@ -76,7 +76,8 @@
   # 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 /subsystem:console /debug /machine:I386 /pdbtype:sept
  -# ADD LINK32 kernel32.lib advapi32.lib wsock32.lib ws2_32.lib /nologo /subsystem:console /incremental:no /debug /machine:I386 /pdbtype:sept
  +# ADD LINK32 kernel32.lib advapi32.lib wsock32.lib ws2_32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
  +# SUBTRACT LINK32 /incremental:no /map
   
   !ENDIF 
   
  
  
  
  1.6       +5 -4      apache-2.0/src/support/htpasswd.dsp
  
  Index: htpasswd.dsp
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/support/htpasswd.dsp,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- htpasswd.dsp	2000/05/17 23:30:20	1.5
  +++ htpasswd.dsp	2000/05/19 05:09:19	1.6
  @@ -17,7 +17,8 @@
   !MESSAGE 
   !MESSAGE Possible choices for configuration are:
   !MESSAGE 
  -!MESSAGE "htpasswd - Win32 Release" (based on "Win32 (x86) Console Application")
  +!MESSAGE "htpasswd - Win32 Release" (based on\
  + "Win32 (x86) Console Application")
   !MESSAGE "htpasswd - Win32 Debug" (based on "Win32 (x86) Console Application")
   !MESSAGE 
   
  @@ -50,7 +51,7 @@
   # 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 /subsystem:console /machine:I386
  -# ADD LINK32 aprlib.lib ap.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ws2_32.lib /nologo /subsystem:console /machine:I386 /libpath:"../lib/apr/release" /libpath:"../ap/release"
  +# ADD LINK32 aprlib.lib ap.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ws2_32.lib /nologo /subsystem:console /map /machine:I386 /libpath:"../lib/apr/release" /libpath:"../ap/release"
   
   !ELSEIF  "$(CFG)" == "htpasswd - Win32 Debug"
   
  @@ -66,7 +67,7 @@
   # PROP Ignore_Export_Lib 0
   # PROP Target_Dir ""
   # ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
  -# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\include" /I "..\lib\apr\include" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "WIN32_LEAN_AND_MEAN" /FD /c
  +# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\include" /I "..\lib\apr\include" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "WIN32_LEAN_AND_MEAN" /FD /c
   # SUBTRACT CPP /YX
   # ADD BASE RSC /l 0x409 /d "_DEBUG"
   # ADD RSC /l 0x409 /d "_DEBUG"
  @@ -76,7 +77,7 @@
   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 /subsystem:console /debug /machine:I386 /pdbtype:sept
   # ADD LINK32 aprlib.lib ap.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ws2_32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"../lib/apr/debug" /libpath:"../ap/debug"
  -# SUBTRACT LINK32 /pdb:none
  +# SUBTRACT LINK32 /pdb:none /incremental:no /map
   
   !ENDIF 
   
  
  
  
  1.4       +7 -5      apache-2.0/src/support/logresolve.dsp
  
  Index: logresolve.dsp
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/support/logresolve.dsp,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- logresolve.dsp	2000/05/17 23:30:21	1.3
  +++ logresolve.dsp	2000/05/19 05:09:20	1.4
  @@ -17,8 +17,10 @@
   !MESSAGE 
   !MESSAGE Possible choices for configuration are:
   !MESSAGE 
  -!MESSAGE "logresolve - Win32 Release" (based on "Win32 (x86) Console Application")
  -!MESSAGE "logresolve - Win32 Debug" (based on "Win32 (x86) Console Application")
  +!MESSAGE "logresolve - Win32 Release" (based on\
  + "Win32 (x86) Console Application")
  +!MESSAGE "logresolve - Win32 Debug" (based on\
  + "Win32 (x86) Console Application")
   !MESSAGE 
   
   # Begin Project
  @@ -66,7 +68,7 @@
   # PROP Ignore_Export_Lib 0
   # PROP Target_Dir ""
   # ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
  -# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "../include" /I "../lib/apr/include" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "WIN32_LEAN_AND_MEAN" /FD /c
  +# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../include" /I "../lib/apr/include" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "WIN32_LEAN_AND_MEAN" /FD /c
   # SUBTRACT CPP /Fr
   # ADD BASE RSC /l 0x409 /d "_DEBUG"
   # ADD RSC /l 0x409 /d "_DEBUG"
  @@ -75,8 +77,8 @@
   # 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 /subsystem:console /debug /machine:I386 /pdbtype:sept
  -# ADD LINK32 kernel32.lib wsock32.lib ws2_32.lib /nologo /subsystem:console /map /debug /machine:I386
  -# SUBTRACT LINK32 /pdb:none /nodefaultlib
  +# ADD LINK32 kernel32.lib wsock32.lib ws2_32.lib /nologo /subsystem:console /debug /machine:I386
  +# SUBTRACT LINK32 /pdb:none /incremental:no /map /nodefaultlib
   
   !ENDIF 
   
  
  
  
  1.5       +9 -4      apache-2.0/src/support/rotatelogs.dsp
  
  Index: rotatelogs.dsp
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/support/rotatelogs.dsp,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- rotatelogs.dsp	2000/05/17 23:30:21	1.4
  +++ rotatelogs.dsp	2000/05/19 05:09:20	1.5
  @@ -17,8 +17,10 @@
   !MESSAGE 
   !MESSAGE Possible choices for configuration are:
   !MESSAGE 
  -!MESSAGE "rotatelogs - Win32 Release" (based on "Win32 (x86) Console Application")
  -!MESSAGE "rotatelogs - Win32 Debug" (based on "Win32 (x86) Console Application")
  +!MESSAGE "rotatelogs - Win32 Release" (based on\
  + "Win32 (x86) Console Application")
  +!MESSAGE "rotatelogs - Win32 Debug" (based on\
  + "Win32 (x86) Console Application")
   !MESSAGE 
   
   # Begin Project
  @@ -38,6 +40,7 @@
   # 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 /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
   # ADD CPP /nologo /MD /W3 /GX /O2 /I "../include" /I "../lib/apr/include" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
  @@ -49,7 +52,7 @@
   # 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 /subsystem:console /machine:I386
  -# 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 /nologo /subsystem:console /machine:I386
  +# 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 /nologo /subsystem:console /map /machine:I386
   
   !ELSEIF  "$(CFG)" == "rotatelogs - Win32 Debug"
   
  @@ -62,9 +65,10 @@
   # 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 /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
  -# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "../include" /I "../lib/apr/include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
  +# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../include" /I "../lib/apr/include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
   # SUBTRACT CPP /YX
   # ADD BASE RSC /l 0x409 /d "_DEBUG"
   # ADD RSC /l 0x409 /d "_DEBUG"
  @@ -74,6 +78,7 @@
   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 /subsystem:console /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 /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
  +# SUBTRACT LINK32 /incremental:no /map
   
   !ENDIF 
   
  
  
  
  1.1                  apache-2.0/src/support/cvstodsp6.pl
  
  Index: cvstodsp6.pl
  ===================================================================
  use IO::File;
  use File::Find;
  
  chdir '..';
  find(\&tovc6, '.');
  
  sub tovc6 { 
  
      if (m|.dsp$|) {
  	$tname = '.#' . $_;
  	print "Convert project " . $_ . " to VC6 in " . $File::Find::dir . "\n"; 
  	$srcfl = new IO::File $_, "r" || die;
  	$dstfl = new IO::File $tname, "w" || die;
  	while ($src = <$srcfl>) {
  	    $src =~ s|Format Version 5\.00|Format Version 6\.00|;
  #           This is BUCK UGLY... and I know there is a way to do it right... would someone fix?
  	    $src =~ s|^(# ADD CPP .*) /Zi (.*)|$1 /ZI $2|;
  	    $src =~ s|^(# ADD BASE CPP .*) /Zi (.*)|$1 /ZI $2|;
              print $dstfl $src; 
  	    if ($src =~ m|^# Begin Project|) {
  		print $dstfl "# PROP AllowPerConfigDependencies 0\n"; }
  	}
  	undef $srcfl;
  	undef $dstfl;
  	unlink $_;
  	rename $tname, $_;
      }
  }
  
  
  
  1.1                  apache-2.0/src/support/dsp6tocvs.pl
  
  Index: dsp6tocvs.pl
  ===================================================================
  use IO::File;
  use File::Find;
  
  chdir '..';
  find(\&tovc5, '.');
  
  sub tovc5 { 
  
      if (m|.dsp$|) {
  	$tname = '.#' . $_;
  	print "Convert project " . $_ . " to CVS standard VC5 in " . $File::Find::dir . "\n"; 
  	$srcfl = new IO::File $_, "r" || die;
  	$dstfl = new IO::File $tname, "w" || die;
  	while ($src = <$srcfl>) {
  	    $src =~ s|Format Version 6\.00|Format Version 5\.00|;
  #           This is BUCK UGLY... and I know there is a way to do it right... would someone fix?
  	    $src =~ s|^(# ADD CPP .*) /ZI (.*)|$1 /Zi $2|;
  	    $src =~ s|^(# ADD BASE CPP .*) /ZI (.*)|$1 /Zi $2|;
  	    if ($src !~ m|^# PROP AllowPerConfigDependencies|) {
  		print $dstfl $src; }
  	}
  	undef $srcfl;
  	undef $dstfl;
  	unlink $_;
  	rename $tname, $_;
      }
  }
  
  

Mime
View raw message