cvs commit: apachen/src ApacheCore.dsp ApacheCore.mak
pcs 98/01/04 05:06:11 Modified:src ApacheCore.dsp ApacheCore.mak Log: Build apache using the ap library on Win32. Revision ChangesPath 1.16 +2 -6 apachen/src/ApacheCore.dsp Index: ApacheCore.dsp === RCS file: /export/home/cvs/apachen/src/ApacheCore.dsp,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- ApacheCore.dsp1997/12/24 12:37:07 1.15 +++ ApacheCore.dsp1998/01/04 13:06:09 1.16 @@ -54,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 os\win32\ApacheOSR\ApacheOS.lib regex\release\regex.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib wsock32.lib /nologo /subsystem:windows /dll /machine:I386 +# ADD LINK32 os\win32\ApacheOSR\ApacheOS.lib regex\release\regex.lib ap\Release\ap.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib wsock32.lib /nologo /subsystem:windows /dll /machine:I386 !ELSEIF "$(CFG)" == "ApacheCore - Win32 Debug" @@ -80,7 +80,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 /debug /machine:I386 -# ADD LINK32 os\win32\ApacheOSD\ApacheOS.lib regex\debug\regex.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib wsock32.lib /nologo /subsystem:windows /dll /debug /machine:I386 +# ADD LINK32 os\win32\ApacheOSD\ApacheOS.lib regex\debug\regex.lib ap\Debug\ap.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib wsock32.lib /nologo /subsystem:windows /dll /debug /machine:I386 !ENDIF @@ -94,10 +94,6 @@ # Begin Source File SOURCE=.\main\alloc.c -# End Source File -# Begin Source File - -SOURCE=.\ap\ap_snprintf.c # End Source File # Begin Source File 1.26 +338 -920 apachen/src/ApacheCore.mak Index: ApacheCore.mak === RCS file: /export/home/cvs/apachen/src/ApacheCore.mak,v retrieving revision 1.25 retrieving revision 1.26 diff -u -r1.25 -r1.26 --- ApacheCore.mak1997/12/30 16:42:31 1.25 +++ ApacheCore.mak1998/01/04 13:06:09 1.26 @@ -52,9 +52,6 @@ CLEAN : [EMAIL PROTECTED] "$(INTDIR)\alloc.obj" - [EMAIL PROTECTED] "$(INTDIR)\ap_cpystrn.obj" - [EMAIL PROTECTED] "$(INTDIR)\ap_snprintf.obj" - [EMAIL PROTECTED] "$(INTDIR)\ap_strings.obj" [EMAIL PROTECTED] "$(INTDIR)\buff.obj" [EMAIL PROTECTED] "$(INTDIR)\buildmark.obj" [EMAIL PROTECTED] "$(INTDIR)\explain.obj" @@ -98,16 +95,14 @@ [EMAIL PROTECTED] "$(INTDIR)\util_script.obj" [EMAIL PROTECTED] "$(INTDIR)\util_win32.obj" [EMAIL PROTECTED] "$(INTDIR)\vc50.idb" - [EMAIL PROTECTED] "$(INTDIR)\vc50.pdb" [EMAIL PROTECTED] "$(OUTDIR)\ApacheCore.dll" [EMAIL PROTECTED] "$(OUTDIR)\ApacheCore.exp" [EMAIL PROTECTED] "$(OUTDIR)\ApacheCore.lib" - [EMAIL PROTECTED] "$(OUTDIR)\ApacheCore.pdb" "$(OUTDIR)" : if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" -CPP_PROJ=/nologo /MD /W3 /GX /Zi /O2 /I ".\regex" /I ".\main" /D "WIN32" /D\ +CPP_PROJ=/nologo /MD /W3 /GX /O2 /I ".\regex" /I ".\main" /D "WIN32" /D\ "NDEBUG" /D "_WINDOWS" /Fp"$(INTDIR)\ApacheCore.pch" /YX /Fo"$(INTDIR)\\"\ /Fd"$(INTDIR)\\" /FD /c CPP_OBJS=.\CoreR/ @@ -119,17 +114,15 @@ LINK32=link.exe LINK32_FLAGS=os\win32\ApacheOSR\ApacheOS.lib regex\release\regex.lib\ - kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib\ - shell32.lib wsock32.lib /nologo /subsystem:windows /dll /incremental:no\ - /pdb:"$(OUTDIR)\ApacheCore.pdb" /debug /machine:I386 /def:".\ApacheCore.def"\ - /out:"$(OUTDIR)\ApacheCore.dll" /implib:"$(OUTDIR)\ApacheCore.lib" + ap\Release\ap.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib\ + advapi32.lib shell32.lib wsock32.lib /nologo /subsystem:windows /dll\ + /incremental:no /pdb:"$(OUTDIR)\ApacheCore.pdb" /machine:I386\ + /def:".\ApacheCore.def" /out:"$(OUTDIR)\ApacheCore.dll"\ + /implib:"$(OUTDIR)\ApacheCore.lib" DEF_FILE= \ ".\ApacheCore.def" LINK32_OBJS= \ "$(INTDIR)\alloc.obj" \ - "$(INTDIR)\ap_cpystrn.obj" \ - "$(INTDIR)\ap_snprintf.obj" \ - "$(INTDIR)\ap_strings.obj" \ "$(INTDIR)\buff.obj" \ "$(INTDIR)\buildmark.obj" \ "$(INTDIR)\explain.obj" \ @@ -199,12 +192,6 @@ CLEAN :
cvs commit: apachen/src ApacheCore.dsp ApacheCore.mak
ben 97/12/24 04:37:08 Modified:src ApacheCore.dsp ApacheCore.mak Log: Deal with util_snprintf.c -> ap_snprintf.c move. Revision ChangesPath 1.15 +4 -4 apachen/src/ApacheCore.dsp Index: ApacheCore.dsp === RCS file: /export/home/cvs/apachen/src/ApacheCore.dsp,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- ApacheCore.dsp1997/11/23 18:10:01 1.14 +++ ApacheCore.dsp1997/12/24 12:37:07 1.15 @@ -97,6 +97,10 @@ # End Source File # Begin Source File +SOURCE=.\ap\ap_snprintf.c +# End Source File +# Begin Source File + SOURCE=.\ApacheCore.def # End Source File # Begin Source File @@ -262,10 +266,6 @@ # Begin Source File SOURCE=.\main\util_script.c -# End Source File -# Begin Source File - -SOURCE=.\main\util_snprintf.c # End Source File # Begin Source File 1.22 +34 -35apachen/src/ApacheCore.mak Index: ApacheCore.mak === RCS file: /export/home/cvs/apachen/src/ApacheCore.mak,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- ApacheCore.mak1997/11/16 15:43:11 1.21 +++ ApacheCore.mak1997/12/24 12:37:07 1.22 @@ -48,6 +48,7 @@ CLEAN : [EMAIL PROTECTED] "$(INTDIR)\alloc.obj" + [EMAIL PROTECTED] "$(INTDIR)\ap_snprintf.obj" [EMAIL PROTECTED] "$(INTDIR)\buff.obj" [EMAIL PROTECTED] "$(INTDIR)\buildmark.obj" [EMAIL PROTECTED] "$(INTDIR)\explain.obj" @@ -89,7 +90,6 @@ [EMAIL PROTECTED] "$(INTDIR)\util_date.obj" [EMAIL PROTECTED] "$(INTDIR)\util_md5.obj" [EMAIL PROTECTED] "$(INTDIR)\util_script.obj" - [EMAIL PROTECTED] "$(INTDIR)\util_snprintf.obj" [EMAIL PROTECTED] "$(INTDIR)\util_win32.obj" [EMAIL PROTECTED] "$(INTDIR)\vc50.idb" [EMAIL PROTECTED] "$(OUTDIR)\ApacheCore.dll" @@ -153,6 +153,7 @@ ".\ApacheCore.def" LINK32_OBJS= \ "$(INTDIR)\alloc.obj" \ + "$(INTDIR)\ap_snprintf.obj" \ "$(INTDIR)\buff.obj" \ "$(INTDIR)\buildmark.obj" \ "$(INTDIR)\explain.obj" \ @@ -194,7 +195,6 @@ "$(INTDIR)\util_date.obj" \ "$(INTDIR)\util_md5.obj" \ "$(INTDIR)\util_script.obj" \ - "$(INTDIR)\util_snprintf.obj" \ "$(INTDIR)\util_win32.obj" "$(OUTDIR)\ApacheCore.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS) @@ -223,6 +223,8 @@ CLEAN : [EMAIL PROTECTED] "$(INTDIR)\alloc.obj" [EMAIL PROTECTED] "$(INTDIR)\alloc.sbr" + [EMAIL PROTECTED] "$(INTDIR)\ap_snprintf.obj" + [EMAIL PROTECTED] "$(INTDIR)\ap_snprintf.sbr" [EMAIL PROTECTED] "$(INTDIR)\buff.obj" [EMAIL PROTECTED] "$(INTDIR)\buff.sbr" [EMAIL PROTECTED] "$(INTDIR)\buildmark.obj" @@ -305,8 +307,6 @@ [EMAIL PROTECTED] "$(INTDIR)\util_md5.sbr" [EMAIL PROTECTED] "$(INTDIR)\util_script.obj" [EMAIL PROTECTED] "$(INTDIR)\util_script.sbr" - [EMAIL PROTECTED] "$(INTDIR)\util_snprintf.obj" - [EMAIL PROTECTED] "$(INTDIR)\util_snprintf.sbr" [EMAIL PROTECTED] "$(INTDIR)\util_win32.obj" [EMAIL PROTECTED] "$(INTDIR)\util_win32.sbr" [EMAIL PROTECTED] "$(INTDIR)\vc50.idb" @@ -365,6 +365,7 @@ BSC32_FLAGS=/nologo /o"$(OUTDIR)\ApacheCore.bsc" BSC32_SBRS= \ "$(INTDIR)\alloc.sbr" \ + "$(INTDIR)\ap_snprintf.sbr" \ "$(INTDIR)\buff.sbr" \ "$(INTDIR)\buildmark.sbr" \ "$(INTDIR)\explain.sbr" \ @@ -406,7 +407,6 @@ "$(INTDIR)\util_date.sbr" \ "$(INTDIR)\util_md5.sbr" \ "$(INTDIR)\util_script.sbr" \ - "$(INTDIR)\util_snprintf.sbr" \ "$(INTDIR)\util_win32.sbr" "$(OUTDIR)\ApacheCore.bsc" : "$(OUTDIR)" $(BSC32_SBRS) @@ -424,6 +424,7 @@ ".\ApacheCore.def" LINK32_OBJS= \ "$(INTDIR)\alloc.obj" \ + "$(INTDIR)\ap_snprintf.obj" \ "$(INTDIR)\buff.obj" \ "$(INTDIR)\buildmark.obj" \ "$(INTDIR)\explain.obj" \ @@ -465,7 +466,6 @@ "$(INTDIR)\util_date.obj" \ "$(INTDIR)\util_md5.obj" \ "$(INTDIR)\util_script.obj" \ - "$(INTDIR)\util_snprintf.obj" \ "$(INTDIR)\util_win32.obj" "$(OUTDIR)\ApacheCore.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS) @@ -519,6 +519,34 @@ !ENDIF +SOURCE=.\ap\ap_snprintf.c + +!IF "$(CFG)" == "ApacheCore - Win32 Release" + +DEP_CPP_AP_SN=\ + ".\main\conf.h"\ + ".\os\win32\os.h"\ + ".\regex\regex.h"\ + {$(INCLUDE)}"sys\stat.h"\ + {$(INCLUDE)}"sys\types.h"\ + +NODEP_CPP_AP_SN=\ + ".\main\os.h"\ + + +"$(INTDIR)\ap_snprintf.obj" : $(SOURCE) $(DEP_CPP_AP_SN) "$(INTDIR)" + $(CPP) $(CPP_PROJ) $(SOURCE) + + +!ELSEIF "$(CFG)" == "ApacheCore - Win32 Debug" + + +"
cvs commit: apachen/src ApacheCore.dsp ApacheCore.mak
pcs 97/09/12 01:05:45 Modified:src ApacheCore.dsp ApacheCore.mak Log: Link with ApacheOS import lib Revision ChangesPath 1.9 +2 -2 apachen/src/ApacheCore.dsp Index: ApacheCore.dsp === RCS file: /export/home/cvs/apachen/src/ApacheCore.dsp,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- ApacheCore.dsp1997/08/23 04:10:09 1.8 +++ ApacheCore.dsp1997/09/12 08:05:41 1.9 @@ -54,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 regex\release\regex.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib /nologo /subsystem:windows /dll /machine:I386 +# ADD LINK32 os\win32\ApacheOSD\ApacheOS.lib regex\release\regex.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib /nologo /subsystem:windows /dll /machine:I386 !ELSEIF "$(CFG)" == "ApacheCore - Win32 Debug" @@ -80,7 +80,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 /debug /machine:I386 -# ADD LINK32 regex\debug\regex.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib /nologo /subsystem:windows /dll /debug /machine:I386 +# ADD LINK32 os\win32\ApacheOSD\ApacheOS.lib regex\debug\regex.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib /nologo /subsystem:windows /dll /debug /machine:I386 !ENDIF 1.15 +301 -28 apachen/src/ApacheCore.mak Index: ApacheCore.mak === RCS file: /export/home/cvs/apachen/src/ApacheCore.mak,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- ApacheCore.mak1997/08/23 04:00:18 1.14 +++ ApacheCore.mak1997/09/12 08:05:42 1.15 @@ -112,11 +112,11 @@ BSC32_SBRS= \ LINK32=link.exe -LINK32_FLAGS=regex\release\regex.lib kernel32.lib user32.lib gdi32.lib\ - winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib\ - uuid.lib odbc32.lib odbccp32.lib wsock32.lib /nologo /subsystem:windows /dll\ - /incremental:no /pdb:"$(OUTDIR)\ApacheCore.pdb" /machine:I386\ - /def:".\ApacheCore.def" /out:"$(OUTDIR)\ApacheCore.dll"\ +LINK32_FLAGS=os\win32\ApacheOSD\ApacheOS.lib regex\release\regex.lib\ + kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib\ + shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib\ + /nologo /subsystem:windows /dll /incremental:no /pdb:"$(OUTDIR)\ApacheCore.pdb"\ + /machine:I386 /def:".\ApacheCore.def" /out:"$(OUTDIR)\ApacheCore.dll"\ /implib:"$(OUTDIR)\ApacheCore.lib" DEF_FILE= \ ".\ApacheCore.def" @@ -342,11 +342,11 @@ << LINK32=link.exe -LINK32_FLAGS=regex\debug\regex.lib kernel32.lib user32.lib gdi32.lib\ - winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib\ - uuid.lib odbc32.lib odbccp32.lib wsock32.lib /nologo /subsystem:windows /dll\ - /incremental:yes /pdb:"$(OUTDIR)\ApacheCore.pdb" /debug /machine:I386\ - /def:".\ApacheCore.def" /out:"$(OUTDIR)\ApacheCore.dll"\ +LINK32_FLAGS=os\win32\ApacheOSD\ApacheOS.lib regex\debug\regex.lib kernel32.lib\ + user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib\ + ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib /nologo\ + /subsystem:windows /dll /incremental:yes /pdb:"$(OUTDIR)\ApacheCore.pdb" /debug\ + /machine:I386 /def:".\ApacheCore.def" /out:"$(OUTDIR)\ApacheCore.dll"\ /implib:"$(OUTDIR)\ApacheCore.lib" DEF_FILE= \ ".\ApacheCore.def" @@ -444,6 +444,7 @@ ".\main\conf.h"\ ".\main\httpd.h"\ ".\main\multithread.h"\ + ".\main\os.h"\ ".\os\win32\readdir.h"\ ".\regex\regex.h"\ @@ -460,6 +461,7 @@ ".\main\conf.h"\ ".\main\httpd.h"\ ".\main\multithread.h"\ + ".\os\win32\os.h"\ ".\os\win32\readdir.h"\ ".\regex\regex.h"\ @@ -481,8 +483,14 @@ ".\main\conf.h"\ ".\main\http_main.h"\ ".\main\httpd.h"\ + ".\main\os.h"\ ".\os\win32\readdir.h"\ ".\re
cvs commit: apachen/src ApacheCore.dsp ApacheCore.mak
ben 97/08/18 04:10:20 Modified:src ApacheCore.dsp ApacheCore.mak Log: Arg! Must remember to close the workspace before checking in! Revision ChangesPath 1.7 +34 -26apachen/src/ApacheCore.dsp Index: ApacheCore.dsp === RCS file: /export/home/cvs/apachen/src/ApacheCore.dsp,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- ApacheCore.dsp1997/08/18 10:59:01 1.6 +++ ApacheCore.dsp1997/08/18 11:10:19 1.7 @@ -253,15 +253,15 @@ # End Source File # Begin Source File -SOURCE=.\os\win32\util_nt.c +SOURCE=.\core\util_script.c # End Source File # Begin Source File -SOURCE=.\core\util_script.c +SOURCE=.\core\util_snprintf.c # End Source File # Begin Source File -SOURCE=.\core\util_snprintf.c +SOURCE=.\os\win32\util_win32.c # End Source File # End Group # Begin Group "Header Files" @@ -269,95 +269,103 @@ # PROP Default_Filter "h;hpp;hxx;hm;inl;fi;fd" # Begin Source File -SOURCE=.\alloc.h +SOURCE=.\core\alloc.h +# End Source File +# Begin Source File + +SOURCE=.\core\buff.h +# End Source File +# Begin Source File + +SOURCE=.\core\conf.h # End Source File # Begin Source File -SOURCE=.\buff.h +SOURCE=.\core\explain.h # End Source File # Begin Source File -SOURCE=.\conf.h +SOURCE=.\core\fnmatch.h # End Source File # Begin Source File -SOURCE=.\explain.h +SOURCE=.\os\win32\getopt.h # End Source File # Begin Source File -SOURCE=.\nt\getopt.h +SOURCE=.\core\http_conf_globals.h # End Source File # Begin Source File -SOURCE=.\http_conf_globals.h +SOURCE=.\core\http_config.h # End Source File # Begin Source File -SOURCE=.\http_config.h +SOURCE=.\core\http_core.h # End Source File # Begin Source File -SOURCE=.\http_core.h +SOURCE=.\core\http_log.h # End Source File # Begin Source File -SOURCE=.\http_log.h +SOURCE=.\core\http_main.h # End Source File # Begin Source File -SOURCE=.\http_main.h +SOURCE=.\core\http_protocol.h # End Source File # Begin Source File -SOURCE=.\http_protocol.h +SOURCE=.\core\http_request.h # End Source File # Begin Source File -SOURCE=.\http_request.h +SOURCE=.\core\httpd.h # End Source File # Begin Source File -SOURCE=.\httpd.h +SOURCE=.\core\md5.h # End Source File # Begin Source File -SOURCE=.\md5.h +SOURCE=.\modules\standard\mod_mime.h # End Source File # Begin Source File -SOURCE=.\mod_mime.h +SOURCE=.\core\multithread.h # End Source File # Begin Source File -SOURCE=.\multithread.h +SOURCE=.\os\win32\readdir.h # End Source File # Begin Source File -SOURCE=.\nt\readdir.h +SOURCE=.\regex\regex.h # End Source File # Begin Source File -SOURCE=.\rfc1413.h +SOURCE=.\core\rfc1413.h # End Source File # Begin Source File -SOURCE=.\scoreboard.h +SOURCE=.\core\scoreboard.h # End Source File # Begin Source File -SOURCE=.\nt\service.h +SOURCE=.\os\win32\service.h # End Source File # Begin Source File -SOURCE=.\util_date.h +SOURCE=.\core\util_date.h # End Source File # Begin Source File -SOURCE=.\util_md5.h +SOURCE=.\core\util_md5.h # End Source File # Begin Source File -SOURCE=.\util_script.h +SOURCE=.\core\util_script.h # End Source File # End Group # Begin Group "Resource Files" 1.13 +1 -0 apachen/src/ApacheCore.mak Index: ApacheCore.mak === RCS file: /export/home/cvs/apachen/src/ApacheCore.mak,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- ApacheCore.mak1997/08/18 10:59:02 1.12 +++ ApacheCore.mak1997/08/18 11:10:19 1.13 @@ -845,6 +845,7 @@ ".\core\http_log.h"\ ".\core\http_main.h"\ ".\core\http_protocol.h"\ + ".\core\http_request.h"\ ".\core\httpd.h"\ ".\core\util_date.h"\ ".\os\win32\readdir.h"\