diff options
author | William A. Rowe Jr <wrowe@apache.org> | 2001-02-28 17:19:47 +0100 |
---|---|---|
committer | William A. Rowe Jr <wrowe@apache.org> | 2001-02-28 17:19:47 +0100 |
commit | baa40ff8e05a7c0d0c83f642e10809a5313c1e89 (patch) | |
tree | 2b1c4ecd2674e3bab8d7ba540acd24609f12889d /os/win32 | |
parent | Moved to modules/arch/win32/ (diff) | |
download | apache2-baa40ff8e05a7c0d0c83f642e10809a5313c1e89.tar.xz apache2-baa40ff8e05a7c0d0c83f642e10809a5313c1e89.zip |
Crufty stuff now gone [Ben indicated this was a first hack that was
never pursued.]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88394 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'os/win32')
-rw-r--r-- | os/win32/MakeModuleMak.cpp | 59 | ||||
-rw-r--r-- | os/win32/Module.mak.tmpl | 230 | ||||
-rw-r--r-- | os/win32/main_win32.h | 80 |
3 files changed, 0 insertions, 369 deletions
diff --git a/os/win32/MakeModuleMak.cpp b/os/win32/MakeModuleMak.cpp deleted file mode 100644 index 9ab9f27221..0000000000 --- a/os/win32/MakeModuleMak.cpp +++ /dev/null @@ -1,59 +0,0 @@ -#include <fstream.h> -#include <assert.h> -#include <stdio.h> -#include <string.h> -#include <stdlib.h> - -void MakeMake(const char *szModule,const char *szSource) - { - ifstream ifs("Module.mak.tmpl",ios::nocreate); - assert(ifs.good()); - - char buf[1024]; - sprintf(buf,"%s.mak",szModule); - ofstream ofs(buf,ios::trunc); - for( ; ; ) - { - ifs.getline(buf,sizeof buf); - if(ifs.eof()) - break; - for(char *s=buf ; *s ; ) - { - char *p=strchr(s,'%'); - if(!p) - { - ofs << s << '\n'; - break; - } - if(!strncmp(p,"%Module%",8)) - { - ofs.write(s,p-s); - ofs << szModule; - s=p+8; - } - else if(!strncmp(p,"%Source%",8)) - { - ofs.write(s,p-s); - ofs << szSource; - s=p+8; - } - else - { - ofs.write(s,p-s+1); - s=p+1; - } - } - } - } - -void main(int argc,char **argv) - { - if(argc < 2 || (argc%2) != 1) - { - cerr << argv[0] << " [<module name> <source file>]+\n"; - exit(1); - } - for(int n=1 ; n < argc ; n+=2) - MakeMake(argv[n],argv[n+1]); - } - diff --git a/os/win32/Module.mak.tmpl b/os/win32/Module.mak.tmpl deleted file mode 100644 index 162456f064..0000000000 --- a/os/win32/Module.mak.tmpl +++ /dev/null @@ -1,230 +0,0 @@ -# Microsoft Developer Studio Generated NMAKE File, Format Version 4.20 -# ** DO NOT EDIT ** - -# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102 - -!IF "$(CFG)" == "" -CFG=%Module% - Win32 Debug -!MESSAGE No configuration specified. Defaulting to %Module% - Win32\ - Debug. -!ENDIF - -!IF "$(CFG)" != "%Module% - Win32 Release" && "$(CFG)" !=\ - "%Module% - Win32 Debug" -!MESSAGE Invalid configuration "$(CFG)" specified. -!MESSAGE You can specify a configuration when running NMAKE on this makefile -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "%Module%.mak"\ - CFG="%Module% - Win32 Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "%Module% - Win32 Release" (based on\ - "Win32 (x86) Dynamic-Link Library") -!MESSAGE "%Module% - 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 -################################################################################ -# Begin Project -# PROP Target_Last_Scanned "%Module% - Win32 Debug" -MTL=mktyplib.exe -CPP=cl.exe -RSC=rc.exe - -!IF "$(CFG)" == "%Module% - 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 "%Module%R" -# PROP Intermediate_Dir "%Module%R" -# PROP Target_Dir "" -OUTDIR=.\%Module%R -INTDIR=.\%Module%R - -ALL : "$(OUTDIR)\%Module%.dll" - -CLEAN : - -@erase "$(INTDIR)\%Source%.obj" - -@erase "$(OUTDIR)\%Module%.dll" - -@erase "$(OUTDIR)\%Module%.exp" - -@erase "$(OUTDIR)\%Module%.lib" - -"$(OUTDIR)" : - if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" - -# 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" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /c -CPP_PROJ=/nologo /MD /W3 /GX /O2 /I "..\regex" /D "WIN32" /D "NDEBUG" /D\ - "_WINDOWS" /Fp"$(INTDIR)/%Module%.pch" /YX /Fo"$(INTDIR)/" /c -CPP_OBJS=.\%Module%R/ -CPP_SBRS=.\. -# ADD BASE MTL /nologo /D "NDEBUG" /win32 -# ADD MTL /nologo /D "NDEBUG" /win32 -MTL_PROJ=/nologo /D "NDEBUG" /win32 -# ADD BASE RSC /l 0x809 /d "NDEBUG" -# ADD RSC /l 0x809 /d "NDEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -BSC32_FLAGS=/nologo /o"$(OUTDIR)/%Module%.bsc" -BSC32_SBRS= \ - -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 ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /machine:I386 -LINK32_FLAGS=..\CoreR\ApacheCore.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 /nologo /subsystem:windows /dll\ - /incremental:no /pdb:"$(OUTDIR)/%Module%.pdb" /machine:I386\ - /out:"$(OUTDIR)/%Module%.dll"\ - /implib:"$(OUTDIR)/%Module%.lib" -LINK32_OBJS= \ - "$(INTDIR)\%Source%.obj" - -"$(OUTDIR)\%Module%.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS) - $(LINK32) @<< - $(LINK32_FLAGS) $(LINK32_OBJS) -<< - -!ELSEIF "$(CFG)" == "%Module% - 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 "%Module%D" -# PROP Intermediate_Dir "%Module%D" -# PROP Target_Dir "" -OUTDIR=.\%Module%D -INTDIR=.\%Module%D - -ALL : "$(OUTDIR)\%Module%.dll" - -CLEAN : - -@erase "$(INTDIR)\%Source%.obj" - -@erase "$(INTDIR)\vc40.idb" - -@erase "$(INTDIR)\vc40.pdb" - -@erase "$(OUTDIR)\%Module%.dll" - -@erase "$(OUTDIR)\%Module%.exp" - -@erase "$(OUTDIR)\%Module%.ilk" - -@erase "$(OUTDIR)\%Module%.lib" - -@erase "$(OUTDIR)\%Module%.pdb" - -"$(OUTDIR)" : - if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" - -# 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" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /c -CPP_PROJ=/nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\regex" /D "WIN32" /D "_DEBUG"\ - /D "_WINDOWS" /Fp"$(INTDIR)/%Module%.pch" /YX /Fo"$(INTDIR)/"\ - /Fd"$(INTDIR)/" /c -CPP_OBJS=.\%Module%D/ -CPP_SBRS=.\. -# ADD BASE MTL /nologo /D "_DEBUG" /win32 -# ADD MTL /nologo /D "_DEBUG" /win32 -MTL_PROJ=/nologo /D "_DEBUG" /win32 -# ADD BASE RSC /l 0x809 /d "_DEBUG" -# ADD RSC /l 0x809 /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -BSC32_FLAGS=/nologo /o"$(OUTDIR)/%Module%.bsc" -BSC32_SBRS= \ - -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 ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /debug /machine:I386 -LINK32_FLAGS=..\CoreD\ApacheCore.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 /nologo /subsystem:windows /dll\ - /incremental:yes /pdb:"$(OUTDIR)/%Module%.pdb" /debug /machine:I386\ - /out:"$(OUTDIR)/%Module%.dll"\ - /implib:"$(OUTDIR)/%Module%.lib" -LINK32_OBJS= \ - "$(INTDIR)\%Source%.obj" - -"$(OUTDIR)\%Module%.dll" : "$(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) $< - -################################################################################ -# Begin Target - -# Name "%Module% - Win32 Release" -# Name "%Module% - Win32 Debug" - -!IF "$(CFG)" == "%Module% - Win32 Release" - -!ELSEIF "$(CFG)" == "%Module% - Win32 Debug" - -!ENDIF - -################################################################################ -# Begin Source File - -SOURCE=\work\apache\src\%Source%.c -DEP_CPP_MOD_A=\ - "..\alloc.h"\ - "..\buff.h"\ - "..\conf.h"\ - "..\http_config.h"\ - "..\http_core.h"\ - "..\http_log.h"\ - "..\http_request.h"\ - "..\httpd.h"\ - "..\regex\regex.h"\ - "..\ap_mmn.h"\ - ".\readdir.h"\ - {$(INCLUDE)}"\sys\stat.h"\ - {$(INCLUDE)}"\sys\types.h"\ - -NODEP_CPP_MOD_A=\ - "..\sfio.h"\ - - -"$(INTDIR)\%Source%.obj" : $(SOURCE) $(DEP_CPP_MOD_A) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -# End Source File -# End Target -# End Project -################################################################################ diff --git a/os/win32/main_win32.h b/os/win32/main_win32.h deleted file mode 100644 index 7256f7f6b3..0000000000 --- a/os/win32/main_win32.h +++ /dev/null @@ -1,80 +0,0 @@ -/* ==================================================================== - * The Apache Software License, Version 1.1 - * - * Copyright (c) 2000-2001 The Apache Software Foundation. All rights - * reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * - * 3. The end-user documentation included with the redistribution, - * if any, must include the following acknowledgment: - * "This product includes software developed by the - * Apache Software Foundation (http://www.apache.org/)." - * Alternately, this acknowledgment may appear in the software itself, - * if and wherever such third-party acknowledgments normally appear. - * - * 4. The names "Apache" and "Apache Software Foundation" must - * not be used to endorse or promote products derived from this - * software without prior written permission. For written - * permission, please contact apache@apache.org. - * - * 5. Products derived from this software may not be called "Apache", - * nor may "Apache" appear in their name, without prior written - * permission of the Apache Software Foundation. - * - * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED - * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES - * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR - * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF - * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, - * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT - * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - * ==================================================================== - * - * This software consists of voluntary contributions made by many - * individuals on behalf of the Apache Software Foundation. For more - * information on the Apache Software Foundation, please see - * <http://www.apache.org/>. - * - * Portions of this software are based upon public domain software - * originally written at the National Center for Supercomputing Applications, - * University of Illinois, Urbana-Champaign. - */ - -/* - * Declarations for users of the functions defined in registry.c - */ - -#ifndef _WIN32_WINNT -#define _WIN32_WINNT 0x0400 -#endif -#ifndef NOGDI -#define NOGDI -#endif -#ifndef NONLS -#define NONLS -#endif -#ifndef NOMCX -#define NOMCX -#endif -#ifndef NOIME -#define NOIME -#endif -#include <windows.h> -#include <winsock2.h> -#include <mswsock.h> |