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/ap ap.dsp
Date Sun, 28 May 2000 04:03:32 GMT
wrowe       00/05/27 21:03:32

  Modified:    src      Apache.dsp Apache.dsw ApacheCore.dsp
  Removed:     src/ap   ap.dsp
  Log:
    Kill the Win32 library project ap.dsp and slide http_main.c from the
    ApacheCore.dsp into Apache.dsp - this is in prepartion of the real
    services update, which will move registry.c and service.c back into
    ApacheCore.dsp, kill both headers and incorporate their symbols into
    the mpm/winnt/winnt.h file.  main_win32.c will die as well, with it's
    few remaining functions moving into the mpm.
  
  Revision  Changes    Path
  1.10      +13 -2     apache-2.0/src/Apache.dsp
  
  Index: Apache.dsp
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/Apache.dsp,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- Apache.dsp	2000/05/26 05:09:09	1.9
  +++ Apache.dsp	2000/05/28 04:03:21	1.10
  @@ -42,7 +42,7 @@
   # PROP Ignore_Export_Lib 0
   # PROP Target_Dir ""
   # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
  -# ADD CPP /nologo /MD /W3 /GX /O2 /I "./include" /I "./lib/apr/include" /D "NDEBUG" /D
"WIN32" /D "_CONSOLE" /D "WIN32_LEAN_AND_MEAN" /FD /c
  +# ADD CPP /nologo /MD /W3 /GX /O2 /I "./include" /I "./os/win32" /I "./lib/apr/include"
/D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "SHARED_MODULE" /FD /c
   # SUBTRACT CPP /YX
   # ADD BASE RSC /l 0x809 /d "NDEBUG"
   # ADD RSC /l 0x809 /d "NDEBUG"
  @@ -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" /YX /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 "./os/win32" /I "./lib/apr/include"
/D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "SHARED_MODULE" /FD /c
   # SUBTRACT CPP /YX
   # ADD BASE RSC /l 0x809 /d "_DEBUG"
   # ADD RSC /l 0x809 /d "_DEBUG"
  @@ -90,6 +90,10 @@
   # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"
   # Begin Source File
   
  +SOURCE=.\main\http_main.c
  +# End Source File
  +# Begin Source File
  +
   SOURCE=.\os\win32\main_win32.c
   # End Source File
   # Begin Source File
  @@ -127,6 +131,13 @@
   # Begin Source File
   
   SOURCE=.\os\win32\apache.rc
  +
  +!IF  "$(CFG)" == "Apache - Win32 Release"
  +
  +!ELSEIF  "$(CFG)" == "Apache - Win32 Debug"
  +
  +!ENDIF 
  +
   # End Source File
   # End Group
   # End Target
  
  
  
  1.14      +3 -21     apache-2.0/src/Apache.dsw
  
  Index: Apache.dsw
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/Apache.dsw,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- Apache.dsw	2000/05/17 23:30:03	1.13
  +++ Apache.dsw	2000/05/28 04:03:22	1.14
  @@ -1,4 +1,4 @@
  -Microsoft Developer Studio Workspace File, Format Version 6.00
  +Microsoft Developer Studio Workspace File, Format Version 5.00
   # WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
   
   ###############################################################################
  @@ -33,9 +33,6 @@
       Project_Dep_Name aprlibdll
       End Project Dependency
       Begin Project Dependency
  -    Project_Dep_Name ap
  -    End Project Dependency
  -    Begin Project Dependency
       Project_Dep_Name gen_test_char
       End Project Dependency
       Begin Project Dependency
  @@ -344,23 +341,8 @@
       Begin Project Dependency
       Project_Dep_Name aprlib
       End Project Dependency
  -    Begin Project Dependency
  -    Project_Dep_Name ap
  -    End Project Dependency
  -}}}
  -
  -###############################################################################
  -
  -Project: "ap"=".\ap\ap.dsp" - Package Owner=<4>
  -
  -Package=<5>
  -{{{
  -}}}
  -
  -Package=<4>
  -{{{
       Begin Project Dependency
  -    Project_Dep_Name aprlib
  +    Project_Dep_Name ApacheCore
       End Project Dependency
   }}}
   
  @@ -456,7 +438,7 @@
       Project_Dep_Name aprlib
       End Project Dependency
       Begin Project Dependency
  -    Project_Dep_Name ap
  +    Project_Dep_Name ApacheCore
       End Project Dependency
   }}}
   
  
  
  
  1.26      +39 -7     apache-2.0/src/ApacheCore.dsp
  
  Index: ApacheCore.dsp
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/ApacheCore.dsp,v
  retrieving revision 1.25
  retrieving revision 1.26
  diff -u -r1.25 -r1.26
  --- ApacheCore.dsp	2000/05/27 05:27:31	1.25
  +++ ApacheCore.dsp	2000/05/28 04:03:22	1.26
  @@ -43,7 +43,7 @@
   # PROP Ignore_Export_Lib 0
   # PROP Target_Dir ""
   # ADD BASE CPP /nologo /MD /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /c
  -# ADD CPP /nologo /MD /W3 /GX /O2 /I ".\include" /I ".\lib\apr\include" /I ".\os\win32"
/D "NDEBUG" /D "API_EXPORT_SYMBOLS" /D "AP_EXPORT_SYMBOLS" /D "WIN32" /D "_WINDOWS" /D "WIN32_LEAN_AND_MEAN"
/FD /c
  +# ADD CPP /nologo /MD /W3 /GX /O2 /I "include" /I "os/win32" /I "lib/apr/include" /D "NDEBUG"
/D "WIN32" /D "_WINDOWS" /D "API_EXPORT_SYMBOLS" /FD /c
   # SUBTRACT CPP /YX
   # ADD BASE MTL /nologo /D "NDEBUG" /win32
   # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
  @@ -54,7 +54,7 @@
   # ADD BSC32 /nologo
   LINK32=link.exe
   # ADD BASE LINK32 aprlib.lib ap.lib pcreposix.lib pcre.lib kernel32.lib advapi32.lib ws2_32.lib
mswsock.lib /nologo /subsystem:windows /dll /map /machine:I386 /libpath:"lib\apr\Release"
/libpath:"regex\release" /libpath:"ap\Release" /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 /machine:I386 /libpath:"lib\apr\Release"
/libpath:"lib\pcre\LibR" /libpath:"ap\Release" /base:@"os\win32\BaseAddr.ref",ApacheCore
  +# ADD LINK32 kernel32.lib advapi32.lib ws2_32.lib mswsock.lib /nologo /subsystem:windows
/dll /map /machine:I386 /base:@"os\win32\BaseAddr.ref",ApacheCore
   
   !ELSEIF  "$(CFG)" == "ApacheCore - Win32 Debug"
   
  @@ -70,7 +70,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 "API_EXPORT_SYMBOLS" /D "AP_EXPORT_SYMBOLS" /D "WIN32" /D "_WINDOWS" /D "WIN32_LEAN_AND_MEAN"
/FD /c
  +# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "include" /I "os/win32" /I "lib/apr/include"
/D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "API_EXPORT_SYMBOLS" /FD /c
   # SUBTRACT CPP /YX
   # ADD BASE MTL /nologo /D "_DEBUG" /win32
   # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
  @@ -95,6 +95,18 @@
   # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"
   # Begin Source File
   
  +SOURCE=.\ap\ap_base64.c
  +# End Source File
  +# Begin Source File
  +
  +SOURCE=.\ap\ap_hooks.c
  +# End Source File
  +# Begin Source File
  +
  +SOURCE=.\ap\ap_sha1.c
  +# End Source File
  +# Begin Source File
  +
   SOURCE=.\ApacheCore.def
   # End Source File
   # Begin Source File
  @@ -123,10 +135,6 @@
   # End Source File
   # Begin Source File
   
  -SOURCE=.\main\http_main.c
  -# End Source File
  -# Begin Source File
  -
   SOURCE=.\main\http_protocol.c
   # End Source File
   # Begin Source File
  @@ -267,6 +275,18 @@
   # PROP Default_Filter "h;hpp;hxx;hm;inl;fi;fd"
   # Begin Source File
   
  +SOURCE=.\include\ap_base64.h
  +# End Source File
  +# Begin Source File
  +
  +SOURCE=.\include\ap_config.h
  +# End Source File
  +# Begin Source File
  +
  +SOURCE=.\include\ap_ctype.h
  +# End Source File
  +# Begin Source File
  +
   SOURCE=.\include\ap_hooks.h
   # End Source File
   # Begin Source File
  @@ -280,6 +300,18 @@
   # Begin Source File
   
   SOURCE=.\include\ap_md5.h
  +# End Source File
  +# Begin Source File
  +
  +SOURCE=.\include\ap_mmn.h
  +# End Source File
  +# Begin Source File
  +
  +SOURCE=.\include\ap_mpm.h
  +# End Source File
  +# Begin Source File
  +
  +SOURCE=.\include\ap_sha1.h
   # End Source File
   # Begin Source File
   
  
  
  

Mime
View raw message