You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by st...@locus.apache.org on 2000/02/16 19:00:22 UTC
cvs commit: apache-2.0/src/support rotatelogs.dsp rotatelogs.mak rotatelogs.c
stoddard 00/02/16 10:00:22
Modified: src Makefile.nt
src/support rotatelogs.c
Added: src/support rotatelogs.dsp rotatelogs.mak
Log:
Add rotatelogs to the Windows port
Revision Changes Path
1.6 +5 -3 apache-2.0/src/Makefile.nt
Index: Makefile.nt
===================================================================
RCS file: /home/cvs/apache-2.0/src/Makefile.nt,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- Makefile.nt 1999/10/05 04:07:51 1.5
+++ Makefile.nt 2000/02/16 18:00:22 1.6
@@ -58,10 +58,11 @@
cd ap
nmake /nologo CFG="ap - Win32 %LONG%" -f ap.mak
cd ..
-# cd support
+ cd support
# nmake /nologo CFG="htpasswd - Win32 %LONG%" -f htpasswd.mak
# nmake /nologo CFG="htdigest - Win32 %LONG%" -f htdigest.mak
-# cd ..
+ nmake /nologo CFG="rotatelogs - Win32 %LONG%" -f rotatelogs.mak
+ cd ..
cd main
nmake /nologo CFG="gen_uri_delims - Win32 %LONG%" -f gen_uri_delims.mak
nmake /nologo CFG="gen_test_char - Win32 %LONG%" -f gen_test_char.mak
@@ -108,7 +109,7 @@
# copy modules\proxy\%LONG%\ApacheModuleProxy.dll $(INSTDIR)\modules
# copy support\%LONG%\htpasswd.exe $(INSTDIR)\bin
# copy support\%LONG%\htdigest.exe $(INSTDIR)\bin
-
+ copy support\%LONG%\rotatelogs.exe $(INSTDIR)\bin
_clean:
cd lib\apr
@@ -126,6 +127,7 @@
cd support
nmake /nologo CFG="htpasswd - Win32 %LONG%" -f htpasswd.mak clean
nmake /nologo CFG="htdigest - Win32 %LONG%" -f htdigest.mak clean
+ nmake /nologo CFG="rotatelogs - Win32 %LONG%" -f rotatelogs.mak clean
cd ..
cd main
nmake /nologo CFG="gen_uri_delims - Win32 %LONG%" -f gen_uri_delims.mak clean
1.2 +4 -1 apache-2.0/src/support/rotatelogs.c
Index: rotatelogs.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/support/rotatelogs.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- rotatelogs.c 1999/08/24 06:45:56 1.1
+++ rotatelogs.c 2000/02/16 18:00:22 1.2
@@ -8,14 +8,17 @@
#define BUFSIZE 65536
+#ifdef MAX_PATH
+#undef MAX_PATH
#define MAX_PATH 1024
+#endif
#include "ap_config.h"
#include <time.h>
#include <errno.h>
#include <fcntl.h>
-int main (int argc, char **argv)
+void main (int argc, char **argv)
{
char buf[BUFSIZE], buf2[MAX_PATH];
time_t tLogEnd = 0;
1.1 apache-2.0/src/support/rotatelogs.dsp
Index: rotatelogs.dsp
===================================================================
# Microsoft Developer Studio Project File - Name="rotatelogs" - Package Owner=<4>
# Microsoft Developer Studio Generated Build File, Format Version 5.00
# ** DO NOT EDIT **
# TARGTYPE "Win32 (x86) Console Application" 0x0103
CFG=rotatelogs - Win32 Debug
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
!MESSAGE
!MESSAGE NMAKE /f "rotatelogs.mak".
!MESSAGE
!MESSAGE You can specify a configuration when running NMAKE
!MESSAGE by defining the macro CFG on the command line. For example:
!MESSAGE
!MESSAGE NMAKE /f "rotatelogs.mak" CFG="rotatelogs - Win32 Debug"
!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
# Begin Project
# PROP Scc_ProjName ""
# PROP Scc_LocalPath ""
CPP=cl.exe
RSC=rc.exe
!IF "$(CFG)" == "rotatelogs - Win32 Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
# PROP BASE Output_Dir "Release"
# PROP BASE Intermediate_Dir "Release"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
# PROP Output_Dir "Release"
# PROP Intermediate_Dir "Release"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
# ADD CPP /nologo /W3 /GX /O2 /I "../include" /I "../lib/apr/include" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib 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
!ELSEIF "$(CFG)" == "rotatelogs - Win32 Debug"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
# PROP BASE Output_Dir "Debug"
# PROP BASE Intermediate_Dir "Debug"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
# PROP Output_Dir "Debug"
# PROP Intermediate_Dir "Debug"
# PROP 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 /W3 /Gm /GX /Zi /Od /I "../include" /I "../lib/apr/include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib 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
!ENDIF
# Begin Target
# Name "rotatelogs - Win32 Release"
# Name "rotatelogs - Win32 Debug"
# Begin Source File
SOURCE=.\rotatelogs.c
# End Source File
# End Target
# End Project
1.1 apache-2.0/src/support/rotatelogs.mak
Index: rotatelogs.mak
===================================================================
# Microsoft Developer Studio Generated NMAKE File, Based on rotatelogs.dsp
!IF "$(CFG)" == ""
CFG=rotatelogs - Win32 Debug
!MESSAGE No configuration specified. Defaulting to rotatelogs - Win32 Debug.
!ENDIF
!IF "$(CFG)" != "rotatelogs - Win32 Release" && "$(CFG)" !=\
"rotatelogs - Win32 Debug"
!MESSAGE Invalid configuration "$(CFG)" specified.
!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 "rotatelogs.mak" CFG="rotatelogs - Win32 Debug"
!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
!ERROR An invalid configuration is specified.
!ENDIF
!IF "$(OS)" == "Windows_NT"
NULL=
!ELSE
NULL=nul
!ENDIF
CPP=cl.exe
RSC=rc.exe
!IF "$(CFG)" == "rotatelogs - Win32 Release"
OUTDIR=.\Release
INTDIR=.\Release
# Begin Custom Macros
OutDir=.\Release
# End Custom Macros
!IF "$(RECURSE)" == "0"
ALL : "$(OUTDIR)\rotatelogs.exe"
!ELSE
ALL : "$(OUTDIR)\rotatelogs.exe"
!ENDIF
CLEAN :
-@erase "$(INTDIR)\rotatelogs.obj"
-@erase "$(INTDIR)\vc50.idb"
-@erase "$(OUTDIR)\rotatelogs.exe"
"$(OUTDIR)" :
if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
CPP_PROJ=/nologo /ML /W3 /GX /O2 /I "../include" /I "../lib/apr/include" /D\
"WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /Fp"$(INTDIR)\rotatelogs.pch" /YX\
/Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c
CPP_OBJS=.\Release/
CPP_SBRS=.
BSC32=bscmake.exe
BSC32_FLAGS=/nologo /o"$(OUTDIR)\rotatelogs.bsc"
BSC32_SBRS= \
LINK32=link.exe
LINK32_FLAGS=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 /incremental:no\
/pdb:"$(OUTDIR)\rotatelogs.pdb" /machine:I386 /out:"$(OUTDIR)\rotatelogs.exe"
LINK32_OBJS= \
"$(INTDIR)\rotatelogs.obj"
"$(OUTDIR)\rotatelogs.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
$(LINK32) @<<
$(LINK32_FLAGS) $(LINK32_OBJS)
<<
!ELSEIF "$(CFG)" == "rotatelogs - Win32 Debug"
OUTDIR=.\Debug
INTDIR=.\Debug
# Begin Custom Macros
OutDir=.\Debug
# End Custom Macros
!IF "$(RECURSE)" == "0"
ALL : "$(OUTDIR)\rotatelogs.exe"
!ELSE
ALL : "$(OUTDIR)\rotatelogs.exe"
!ENDIF
CLEAN :
-@erase "$(INTDIR)\rotatelogs.obj"
-@erase "$(INTDIR)\vc50.idb"
-@erase "$(INTDIR)\vc50.pdb"
-@erase "$(OUTDIR)\rotatelogs.exe"
-@erase "$(OUTDIR)\rotatelogs.ilk"
-@erase "$(OUTDIR)\rotatelogs.pdb"
"$(OUTDIR)" :
if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
CPP_PROJ=/nologo /MLd /W3 /Gm /GX /Zi /Od /I "../include" /I\
"../lib/apr/include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS"\
/Fp"$(INTDIR)\rotatelogs.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c
CPP_OBJS=.\Debug/
CPP_SBRS=.
BSC32=bscmake.exe
BSC32_FLAGS=/nologo /o"$(OUTDIR)\rotatelogs.bsc"
BSC32_SBRS= \
LINK32=link.exe
LINK32_FLAGS=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 /incremental:yes\
/pdb:"$(OUTDIR)\rotatelogs.pdb" /debug /machine:I386\
/out:"$(OUTDIR)\rotatelogs.exe" /pdbtype:sept
LINK32_OBJS= \
"$(INTDIR)\rotatelogs.obj"
"$(OUTDIR)\rotatelogs.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
$(LINK32) @<<
$(LINK32_FLAGS) $(LINK32_OBJS)
<<
!ENDIF
.c{$(CPP_OBJS)}.obj::
$(CPP) @<<
$(CPP_PROJ) $<
<<
.cpp{$(CPP_OBJS)}.obj::
$(CPP) @<<
$(CPP_PROJ) $<
<<
.cxx{$(CPP_OBJS)}.obj::
$(CPP) @<<
$(CPP_PROJ) $<
<<
.c{$(CPP_SBRS)}.sbr::
$(CPP) @<<
$(CPP_PROJ) $<
<<
.cpp{$(CPP_SBRS)}.sbr::
$(CPP) @<<
$(CPP_PROJ) $<
<<
.cxx{$(CPP_SBRS)}.sbr::
$(CPP) @<<
$(CPP_PROJ) $<
<<
!IF "$(CFG)" == "rotatelogs - Win32 Release" || "$(CFG)" ==\
"rotatelogs - Win32 Debug"
SOURCE=.\rotatelogs.c
!IF "$(CFG)" == "rotatelogs - Win32 Release"
DEP_CPP_ROTAT=\
"..\include\ap_ac_config.h"\
"..\include\ap_config.h"\
"..\include\ap_ctype.h"\
"..\include\ap_mmn.h"\
"..\include\hsregex.h"\
"..\lib\apr\include\apr_errno.h"\
"..\lib\apr\include\apr_general.h"\
"..\lib\apr\include\apr_win.h"\
"..\os\win32\os.h"\
{$(INCLUDE)}"sys\stat.h"\
{$(INCLUDE)}"sys\types.h"\
NODEP_CPP_ROTAT=\
"..\include\ap_config_auto.h"\
"..\include\ap_config_win32.h"\
"..\include\apr.h"\
"..\include\os.h"\
"..\lib\apr\include\apr.h"\
"$(INTDIR)\rotatelogs.obj" : $(SOURCE) $(DEP_CPP_ROTAT) "$(INTDIR)"
!ELSEIF "$(CFG)" == "rotatelogs - Win32 Debug"
DEP_CPP_ROTAT=\
"..\include\ap_config.h"\
"..\include\ap_ctype.h"\
"..\include\ap_mmn.h"\
"..\include\hsregex.h"\
"..\lib\apr\include\apr_errno.h"\
"..\lib\apr\include\apr_general.h"\
"..\lib\apr\include\apr_win.h"\
"..\os\win32\os.h"\
"$(INTDIR)\rotatelogs.obj" : $(SOURCE) $(DEP_CPP_ROTAT) "$(INTDIR)"
!ENDIF
!ENDIF