You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by ma...@hyperreal.org on 1998/01/24 04:42:18 UTC
cvs commit: apachen/src/os/win32 ApacheModuleSpeling.dsp ApacheModuleSpeling.mak .cvsignore
marc 98/01/23 19:42:17
Modified: src Makefile.nt
src/os/win32 .cvsignore
Added: src/os/win32 ApacheModuleSpeling.dsp ApacheModuleSpeling.mak
Log:
Add mod_speling to Win32 build. Basic functionality appears to
work, but may need more testing.
Revision Changes Path
1.22 +10 -1 apachen/src/Makefile.nt
Index: Makefile.nt
===================================================================
RCS file: /export/home/cvs/apachen/src/Makefile.nt,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- Makefile.nt 1998/01/04 14:43:46 1.21
+++ Makefile.nt 1998/01/24 03:42:15 1.22
@@ -42,6 +42,8 @@
nmake /nologo -f ApacheModuleExpires.mak
set CFG=ApacheModuleHeaders - Win32 Release
nmake /nologo -f ApacheModuleHeaders.mak
+ set CFG=ApacheModuleSpeling - Win32 Release
+ nmake /nologo -f ApacheModuleSpeling.mak
set CFG=ApacheModuleUserTrack - Win32 Release
nmake /nologo -f ApacheModuleUserTrack.mak
set CFG=ApacheModuleRewrite - Win32 Release
@@ -85,6 +87,8 @@
nmake /nologo -f ApacheModuleExpires.mak
set CFG=ApacheModuleHeaders - Win32 Debug
nmake /nologo -f ApacheModuleHeaders.mak
+ set CFG=ApacheModuleSpeling - Win32 Debug
+ nmake /nologo -f ApacheModuleSpeling.mak
set CFG=ApacheModuleUserTrack - Win32 Debug
nmake /nologo -f ApacheModuleUserTrack.mak
set CFG=ApacheModuleRewrite - Win32 Debug
@@ -109,6 +113,7 @@
copy os\win32\ApacheModuleCERNMetaR\ApacheModuleCERNMeta.dll \Apache\modules
copy os\win32\ApacheModuleExpiresR\ApacheModuleExpires.dll \Apache\modules
copy os\win32\ApacheModuleHeadersR\ApacheModuleHeaders.dll \Apache\modules
+ copy os\win32\ApacheModuleSpelingR\ApacheModuleSpeling.dll \Apache\modules
copy os\win32\ApacheModuleUserTrackR\ApacheModuleUserTrack.dll \Apache\modules
copy modules\proxy\Release\ApacheModuleProxy.dll \Apache\modules
@@ -125,7 +130,7 @@
copy os\win32\ApacheModuleDigestD\ApacheModuleDigest.dll \Apache\modules
copy os\win32\ApacheModuleCERNMetaD\ApacheModuleCERNMeta.dll \Apache\modules
copy os\win32\ApacheModuleExpiresD\ApacheModuleExpires.dll \Apache\modules
- copy os\win32\ApacheModuleHeadersD\ApacheModuleHeaders.dll \Apache\modules
+ copy os\win32\ApacheModuleSpelingD\ApacheModuleSpeling.dll \Apache\modules
copy os\win32\ApacheModuleUserTrackD\ApacheModuleUserTrack.dll \Apache\modules
copy modules\proxy\Debug\ApacheModuleProxy.dll \Apache\modules
@@ -161,6 +166,8 @@
nmake /nologo -f ApacheModuleExpires.mak clean
set CFG=ApacheModuleHeaders - Win32 Release
nmake /nologo -f ApacheModuleHeaders.mak clean
+ set CFG=ApacheModuleSpeling - Win32 Release
+ nmake /nologo -f ApacheModuleSpeling.mak clean
set CFG=ApacheModuleUserTrack - Win32 Release
nmake /nologo -f ApacheModuleUserTrack.mak clean
cd ..\..
@@ -201,6 +208,8 @@
nmake /nologo -f ApacheModuleExpires.mak clean
set CFG=ApacheModuleHeaders - Win32 Debug
nmake /nologo -f ApacheModuleHeaders.mak clean
+ set CFG=ApacheModuleSpeling - Win32 Debug
+ nmake /nologo -f ApacheModuleSpeling.mak clean
set CFG=ApacheModuleUserTrack - Win32 Debug
nmake /nologo -f ApacheModuleUserTrack.mak clean
cd ..\..
1.6 +2 -0 apachen/src/os/win32/.cvsignore
Index: .cvsignore
===================================================================
RCS file: /export/home/cvs/apachen/src/os/win32/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore 1997/12/14 15:13:26 1.5
+++ .cvsignore 1998/01/24 03:42:16 1.6
@@ -17,6 +17,8 @@
ApacheModuleInfoR
ApacheModuleRewriteD
ApacheModuleRewriteR
+ApacheModuleSpelingD
+ApacheModuleSpelingR
ApacheModuleStatusD
ApacheModuleStatusR
ApacheModuleUserTrackD
1.1 apachen/src/os/win32/ApacheModuleSpeling.dsp
Index: ApacheModuleSpeling.dsp
===================================================================
# Microsoft Developer Studio Project File - Name="ApacheModuleSpeling" - Package Owner=<4>
# Microsoft Developer Studio Generated Build File, Format Version 5.00
# ** DO NOT EDIT **
# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
CFG=ApacheModuleSpeling - Win32 Release
!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 "ApacheModuleSpeling.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 "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
# Begin Project
# PROP Scc_ProjName ""
# PROP Scc_LocalPath ""
CPP=cl.exe
MTL=midl.exe
RSC=rc.exe
!IF "$(CFG)" == "ApacheModuleSpeling - 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 ".\ApacheModuleSpelingR"
# PROP Intermediate_Dir ".\ApacheModuleSpelingR"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /c
# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\regex" /I "..\..\main" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
# ADD BASE MTL /nologo /D "NDEBUG" /win32
# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
# ADD BASE RSC /l 0x809 /d "NDEBUG"
# ADD RSC /l 0x809 /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:windows /dll /machine:I386
# ADD LINK32 ..\..\CoreR\ApacheCore.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib /nologo /subsystem:windows /dll /machine:I386
!ELSEIF "$(CFG)" == "ApacheModuleSpeling - 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 ".\ApacheModuleSpelingD"
# PROP Intermediate_Dir ".\ApacheModuleSpelingD"
# 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 "..\..\regex" /I "..\..\main" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
# ADD BASE MTL /nologo /D "_DEBUG" /win32
# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
# ADD BASE RSC /l 0x809 /d "_DEBUG"
# ADD RSC /l 0x809 /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:windows /dll /debug /machine:I386
# ADD LINK32 ..\..\CoreD\ApacheCore.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib /nologo /subsystem:windows /dll /debug /machine:I386
!ENDIF
# Begin Target
# 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.1 apachen/src/os/win32/ApacheModuleSpeling.mak
Index: ApacheModuleSpeling.mak
===================================================================
# Microsoft Developer Studio Generated NMAKE File, Based on ApacheModuleSpeling.dsp
!IF "$(CFG)" == ""
CFG=ApacheModuleSpeling - Win32 Release
!MESSAGE No configuration specified. Defaulting to ApacheModuleSpeling - Win32\
Release.
!ENDIF
!IF "$(CFG)" != "ApacheModuleSpeling - Win32 Release" && "$(CFG)" !=\
"ApacheModuleSpeling - 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 "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
!ERROR An invalid configuration is specified.
!ENDIF
!IF "$(OS)" == "Windows_NT"
NULL=
!ELSE
NULL=nul
!ENDIF
!IF "$(CFG)" == "ApacheModuleSpeling - Win32 Release"
OUTDIR=.\ApacheModuleSpelingR
INTDIR=.\ApacheModuleSpelingR
# Begin Custom Macros
OutDir=.\.\ApacheModuleSpelingR
# End Custom Macros
!IF "$(RECURSE)" == "0"
ALL : "$(OUTDIR)\ApacheModuleSpeling.dll"
!ELSE
ALL : "$(OUTDIR)\ApacheModuleSpeling.dll"
!ENDIF
CLEAN :
-@erase "$(INTDIR)\mod_speling.obj"
-@erase "$(INTDIR)\vc50.idb"
-@erase "$(OUTDIR)\ApacheModuleSpeling.dll"
-@erase "$(OUTDIR)\ApacheModuleSpeling.exp"
-@erase "$(OUTDIR)\ApacheModuleSpeling.lib"
"$(OUTDIR)" :
if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
CPP=cl.exe
CPP_PROJ=/nologo /MD /W3 /GX /O2 /I "..\..\regex" /I "..\..\main" /D "WIN32" /D\
"NDEBUG" /D "_WINDOWS" /Fp"$(INTDIR)\ApacheModuleSpeling.pch" /YX\
/Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c
CPP_OBJS=.\ApacheModuleSpelingR/
CPP_SBRS=.
.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) $<
<<
MTL=midl.exe
MTL_PROJ=/nologo /D "NDEBUG" /mktyplib203 /win32
RSC=rc.exe
BSC32=bscmake.exe
BSC32_FLAGS=/nologo /o"$(OUTDIR)\ApacheModuleSpeling.bsc"
BSC32_SBRS= \
LINK32=link.exe
LINK32_FLAGS=..\..\CoreR\ApacheCore.lib kernel32.lib user32.lib gdi32.lib\
winspool.lib comdlg32.lib advapi32.lib shell32.lib /nologo /subsystem:windows\
/dll /incremental:no /pdb:"$(OUTDIR)\ApacheModuleSpeling.pdb" /machine:I386\
/out:"$(OUTDIR)\ApacheModuleSpeling.dll"\
/implib:"$(OUTDIR)\ApacheModuleSpeling.lib"
LINK32_OBJS= \
"$(INTDIR)\mod_speling.obj"
"$(OUTDIR)\ApacheModuleSpeling.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
$(LINK32) @<<
$(LINK32_FLAGS) $(LINK32_OBJS)
<<
!ELSEIF "$(CFG)" == "ApacheModuleSpeling - Win32 Debug"
OUTDIR=.\ApacheModuleSpelingD
INTDIR=.\ApacheModuleSpelingD
# Begin Custom Macros
OutDir=.\.\ApacheModuleSpelingD
# End Custom Macros
!IF "$(RECURSE)" == "0"
ALL : "$(OUTDIR)\ApacheModuleSpeling.dll"
!ELSE
ALL : "$(OUTDIR)\ApacheModuleSpeling.dll"
!ENDIF
CLEAN :
-@erase "$(INTDIR)\mod_speling.obj"
-@erase "$(INTDIR)\vc50.idb"
-@erase "$(INTDIR)\vc50.pdb"
-@erase "$(OUTDIR)\ApacheModuleSpeling.dll"
-@erase "$(OUTDIR)\ApacheModuleSpeling.exp"
-@erase "$(OUTDIR)\ApacheModuleSpeling.ilk"
-@erase "$(OUTDIR)\ApacheModuleSpeling.lib"
-@erase "$(OUTDIR)\ApacheModuleSpeling.pdb"
"$(OUTDIR)" :
if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
CPP=cl.exe
CPP_PROJ=/nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\regex" /I "..\..\main" /D\
"WIN32" /D "_DEBUG" /D "_WINDOWS" /Fp"$(INTDIR)\ApacheModuleSpeling.pch" /YX\
/Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c
CPP_OBJS=.\ApacheModuleSpelingD/
CPP_SBRS=.
.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) $<
<<
MTL=midl.exe
MTL_PROJ=/nologo /D "_DEBUG" /mktyplib203 /win32
RSC=rc.exe
BSC32=bscmake.exe
BSC32_FLAGS=/nologo /o"$(OUTDIR)\ApacheModuleSpeling.bsc"
BSC32_SBRS= \
LINK32=link.exe
LINK32_FLAGS=..\..\CoreD\ApacheCore.lib kernel32.lib user32.lib gdi32.lib\
winspool.lib comdlg32.lib advapi32.lib shell32.lib /nologo /subsystem:windows\
/dll /incremental:yes /pdb:"$(OUTDIR)\ApacheModuleSpeling.pdb" /debug\
/machine:I386 /out:"$(OUTDIR)\ApacheModuleSpeling.dll"\
/implib:"$(OUTDIR)\ApacheModuleSpeling.lib"
LINK32_OBJS= \
"$(INTDIR)\mod_speling.obj"
"$(OUTDIR)\ApacheModuleSpeling.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
$(LINK32) @<<
$(LINK32_FLAGS) $(LINK32_OBJS)
<<
!ENDIF
!IF "$(CFG)" == "ApacheModuleSpeling - Win32 Release" || "$(CFG)" ==\
"ApacheModuleSpeling - Win32 Debug"
SOURCE=..\..\modules\standard\mod_speling.c
!IF "$(CFG)" == "ApacheModuleSpeling - Win32 Release"
DEP_CPP_MOD_S=\
"..\..\main\alloc.h"\
"..\..\main\buff.h"\
"..\..\main\conf.h"\
"..\..\main\http_config.h"\
"..\..\main\http_log.h"\
"..\..\main\httpd.h"\
"..\..\regex\regex.h"\
".\os.h"\
".\readdir.h"\
"$(INTDIR)\mod_speling.obj" : $(SOURCE) $(DEP_CPP_MOD_S) "$(INTDIR)"
$(CPP) $(CPP_PROJ) $(SOURCE)
!ELSEIF "$(CFG)" == "ApacheModuleSpeling - Win32 Debug"
DEP_CPP_MOD_S=\
"..\..\main\alloc.h"\
"..\..\main\buff.h"\
"..\..\main\conf.h"\
"..\..\main\http_config.h"\
"..\..\main\http_log.h"\
"..\..\main\httpd.h"\
"..\..\regex\regex.h"\
".\os.h"\
".\readdir.h"\
"$(INTDIR)\mod_speling.obj" : $(SOURCE) $(DEP_CPP_MOD_S) "$(INTDIR)"
$(CPP) $(CPP_PROJ) $(SOURCE)
!ENDIF
!ENDIF