From: William A. Rowe Jr Date: Mon, 9 May 2011 03:02:00 +0000 (+0000) Subject: Noted these win32 build files were missing from -win32-src on unix X-Git-Tag: 2.2.19~20 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=9dc86e28cf0f07ddcbfdcdda4422ceae095aa1cc;p=thirdparty%2Fapache%2Fhttpd.git Noted these win32 build files were missing from -win32-src on unix git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@1100868 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/srclib/pcre/dftables.dep b/srclib/pcre/dftables.dep new file mode 100644 index 00000000000..3e1d6ce7db1 --- /dev/null +++ b/srclib/pcre/dftables.dep @@ -0,0 +1,21 @@ +# Microsoft Developer Studio Generated Dependency File, included by dftables.mak + +.\dftables.c : \ + ".\config.h"\ + ".\internal.h"\ + ".\maketables.c"\ + ".\pcre.h"\ + + +!IF "$(CFG)" == "dftables - Win32 Release" + +!ELSEIF "$(CFG)" == "dftables - Win32 Debug" + +!ENDIF + +!IF "$(CFG)" == "dftables - Win32 Release" + +!ELSEIF "$(CFG)" == "dftables - Win32 Debug" + +!ENDIF + diff --git a/srclib/pcre/dftables.mak b/srclib/pcre/dftables.mak new file mode 100644 index 00000000000..d5af5ab1118 --- /dev/null +++ b/srclib/pcre/dftables.mak @@ -0,0 +1,238 @@ +# Microsoft Developer Studio Generated NMAKE File, Based on dftables.dsp +!IF "$(CFG)" == "" +CFG=dftables - Win32 Debug +!MESSAGE No configuration specified. Defaulting to dftables - Win32 Debug. +!ENDIF + +!IF "$(CFG)" != "dftables - Win32 Release" && "$(CFG)" != "dftables - 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 "dftables.mak" CFG="dftables - Win32 Debug" +!MESSAGE +!MESSAGE Possible choices for configuration are: +!MESSAGE +!MESSAGE "dftables - Win32 Release" (based on "Win32 (x86) Console Application") +!MESSAGE "dftables - 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 + +!IF "$(CFG)" == "dftables - Win32 Release" + +OUTDIR=. +INTDIR=.\Release +# Begin Custom Macros +OutDir=. +# End Custom Macros + +ALL : "$(OUTDIR)\dftables.exe" + + +CLEAN : + -@erase "$(INTDIR)\dftables.idb" + -@erase "$(INTDIR)\dftables.obj" + -@erase "$(OUTDIR)\dftables.exe" + +"$(INTDIR)" : + if not exist "$(INTDIR)/$(NULL)" mkdir "$(INTDIR)" + +CPP=cl.exe +CPP_PROJ=/nologo /MD /W3 /O2 /D "_WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\dftables" /FD /c + +.c{$(INTDIR)}.obj:: + $(CPP) @<< + $(CPP_PROJ) $< +<< + +.cpp{$(INTDIR)}.obj:: + $(CPP) @<< + $(CPP_PROJ) $< +<< + +.cxx{$(INTDIR)}.obj:: + $(CPP) @<< + $(CPP_PROJ) $< +<< + +.c{$(INTDIR)}.sbr:: + $(CPP) @<< + $(CPP_PROJ) $< +<< + +.cpp{$(INTDIR)}.sbr:: + $(CPP) @<< + $(CPP_PROJ) $< +<< + +.cxx{$(INTDIR)}.sbr:: + $(CPP) @<< + $(CPP_PROJ) $< +<< + +RSC=rc.exe +BSC32=bscmake.exe +BSC32_FLAGS=/nologo /o"$(OUTDIR)\dftables.bsc" +BSC32_SBRS= \ + +LINK32=link.exe +LINK32_FLAGS=kernel32.lib /nologo /subsystem:console /incremental:no /pdb:"$(OUTDIR)\Release\dftables.pdb" /out:"$(OUTDIR)\dftables.exe" /opt:ref +LINK32_OBJS= \ + "$(INTDIR)\dftables.obj" + +"$(OUTDIR)\dftables.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS) + $(LINK32) @<< + $(LINK32_FLAGS) $(LINK32_OBJS) +<< + +!ELSEIF "$(CFG)" == "dftables - Win32 Debug" + +OUTDIR=. +INTDIR=.\Debug +# Begin Custom Macros +OutDir=. +# End Custom Macros + +ALL : ".\pcre.h" ".\config.h" "$(OUTDIR)\dftables.exe" + + +CLEAN : + -@erase "$(INTDIR)\dftables.idb" + -@erase "$(INTDIR)\dftables.obj" + -@erase "$(OUTDIR)\Debug\dftables.pdb" + -@erase "$(OUTDIR)\dftables.exe" + -@erase ".\config.h" + -@erase ".\pcre.h" + +"$(INTDIR)" : + if not exist "$(INTDIR)/$(NULL)" mkdir "$(INTDIR)" + +CPP=cl.exe +CPP_PROJ=/nologo /MDd /W3 /Zi /Od /D "_WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\dftables" /FD /EHsc /c + +.c{$(INTDIR)}.obj:: + $(CPP) @<< + $(CPP_PROJ) $< +<< + +.cpp{$(INTDIR)}.obj:: + $(CPP) @<< + $(CPP_PROJ) $< +<< + +.cxx{$(INTDIR)}.obj:: + $(CPP) @<< + $(CPP_PROJ) $< +<< + +.c{$(INTDIR)}.sbr:: + $(CPP) @<< + $(CPP_PROJ) $< +<< + +.cpp{$(INTDIR)}.sbr:: + $(CPP) @<< + $(CPP_PROJ) $< +<< + +.cxx{$(INTDIR)}.sbr:: + $(CPP) @<< + $(CPP_PROJ) $< +<< + +RSC=rc.exe +BSC32=bscmake.exe +BSC32_FLAGS=/nologo /o"$(OUTDIR)\dftables.bsc" +BSC32_SBRS= \ + +LINK32=link.exe +LINK32_FLAGS=kernel32.lib /nologo /subsystem:console /incremental:no /pdb:"$(OUTDIR)\Debug\dftables.pdb" /debug /out:"$(OUTDIR)\dftables.exe" +LINK32_OBJS= \ + "$(INTDIR)\dftables.obj" + +"$(OUTDIR)\dftables.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS) + $(LINK32) @<< + $(LINK32_FLAGS) $(LINK32_OBJS) +<< + +!ENDIF + + +!IF "$(NO_EXTERNAL_DEPS)" != "1" +!IF EXISTS("dftables.dep") +!INCLUDE "dftables.dep" +!ELSE +!MESSAGE Warning: cannot find "dftables.dep" +!ENDIF +!ENDIF + + +!IF "$(CFG)" == "dftables - Win32 Release" || "$(CFG)" == "dftables - Win32 Debug" +SOURCE=.\dftables.c + +"$(INTDIR)\dftables.obj" : $(SOURCE) "$(INTDIR)" ".\config.h" ".\pcre.h" + + +SOURCE=.\config.hw + +!IF "$(CFG)" == "dftables - Win32 Release" + +InputPath=.\config.hw + +".\config.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + < .\config.h +<< + + +!ELSEIF "$(CFG)" == "dftables - Win32 Debug" + +InputPath=.\config.hw + +".\config.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + < .\config.h +<< + + +!ENDIF + +SOURCE=.\maketables.c +SOURCE=.\pcre.hw + +!IF "$(CFG)" == "dftables - Win32 Release" + +InputPath=.\pcre.hw + +".\pcre.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + < .\pcre.h +<< + + +!ELSEIF "$(CFG)" == "dftables - Win32 Debug" + +InputPath=.\pcre.hw + +".\pcre.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + < .\pcre.h +<< + + +!ENDIF + + +!ENDIF + diff --git a/srclib/pcre/pcre.dep b/srclib/pcre/pcre.dep new file mode 100644 index 00000000000..a9eb3c1ce4b --- /dev/null +++ b/srclib/pcre/pcre.dep @@ -0,0 +1,51 @@ +# Microsoft Developer Studio Generated Dependency File, included by pcre.mak + +!IF "$(CFG)" == "pcre - Win32 Release" + +!ELSEIF "$(CFG)" == "pcre - Win32 Debug" + +!ENDIF + +.\get.c : \ + ".\config.h"\ + ".\internal.h"\ + ".\pcre.h"\ + + +.\maketables.c : \ + ".\config.h"\ + ".\internal.h"\ + ".\pcre.h"\ + + +.\pcre.c : \ + ".\chartables.c"\ + ".\config.h"\ + ".\internal.h"\ + ".\pcre.h"\ + ".\printint.c"\ + ".\ucp.c"\ + ".\ucp.h"\ + ".\ucpinternal.h"\ + ".\ucptable.c"\ + ".\ucptypetable.c"\ + + +.\study.c : \ + ".\config.h"\ + ".\internal.h"\ + ".\pcre.h"\ + + +!IF "$(CFG)" == "pcre - Win32 Release" + +!ELSEIF "$(CFG)" == "pcre - Win32 Debug" + +!ENDIF + +!IF "$(CFG)" == "pcre - Win32 Release" + +!ELSEIF "$(CFG)" == "pcre - Win32 Debug" + +!ENDIF + diff --git a/srclib/pcre/pcre.mak b/srclib/pcre/pcre.mak new file mode 100644 index 00000000000..a094408f340 --- /dev/null +++ b/srclib/pcre/pcre.mak @@ -0,0 +1,340 @@ +# Microsoft Developer Studio Generated NMAKE File, Based on pcre.dsp +!IF "$(CFG)" == "" +CFG=pcre - Win32 Debug +!MESSAGE No configuration specified. Defaulting to pcre - Win32 Debug. +!ENDIF + +!IF "$(CFG)" != "pcre - Win32 Release" && "$(CFG)" != "pcre - 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 "pcre.mak" CFG="pcre - Win32 Debug" +!MESSAGE +!MESSAGE Possible choices for configuration are: +!MESSAGE +!MESSAGE "pcre - Win32 Release" (based on "Win32 (x86) Static Library") +!MESSAGE "pcre - Win32 Debug" (based on "Win32 (x86) Static Library") +!MESSAGE +!ERROR An invalid configuration is specified. +!ENDIF + +!IF "$(OS)" == "Windows_NT" +NULL= +!ELSE +NULL=nul +!ENDIF + +!IF "$(CFG)" == "pcre - Win32 Release" + +OUTDIR=.\LibR +INTDIR=.\LibR +# Begin Custom Macros +OutDir=.\LibR +# End Custom Macros + +!IF "$(RECURSE)" == "0" + +ALL : "$(OUTDIR)\pcre.lib" + +!ELSE + +ALL : "dftables - Win32 Release" "$(OUTDIR)\pcre.lib" + +!ENDIF + +!IF "$(RECURSE)" == "1" +CLEAN :"dftables - Win32 ReleaseCLEAN" +!ELSE +CLEAN : +!ENDIF + -@erase "$(INTDIR)\get.obj" + -@erase "$(INTDIR)\maketables.obj" + -@erase "$(INTDIR)\pcre.obj" + -@erase "$(INTDIR)\pcre_src.idb" + -@erase "$(INTDIR)\pcre_src.pdb" + -@erase "$(INTDIR)\study.obj" + -@erase "$(OUTDIR)\pcre.lib" + +"$(OUTDIR)" : + if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" + +CPP=cl.exe +CPP_PROJ=/nologo /MD /W3 /Zi /O2 /D "_WIN32" /D "NDEBUG" /D "_WINDOWS" /D "PCRE_STATIC" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\pcre_src" /FD /c + +.c{$(INTDIR)}.obj:: + $(CPP) @<< + $(CPP_PROJ) $< +<< + +.cpp{$(INTDIR)}.obj:: + $(CPP) @<< + $(CPP_PROJ) $< +<< + +.cxx{$(INTDIR)}.obj:: + $(CPP) @<< + $(CPP_PROJ) $< +<< + +.c{$(INTDIR)}.sbr:: + $(CPP) @<< + $(CPP_PROJ) $< +<< + +.cpp{$(INTDIR)}.sbr:: + $(CPP) @<< + $(CPP_PROJ) $< +<< + +.cxx{$(INTDIR)}.sbr:: + $(CPP) @<< + $(CPP_PROJ) $< +<< + +RSC=rc.exe +BSC32=bscmake.exe +BSC32_FLAGS=/nologo /o"$(OUTDIR)\pcre.bsc" +BSC32_SBRS= \ + +LIB32=link.exe -lib +LIB32_FLAGS=/nologo /out:"$(OUTDIR)\pcre.lib" +LIB32_OBJS= \ + "$(INTDIR)\get.obj" \ + "$(INTDIR)\maketables.obj" \ + "$(INTDIR)\pcre.obj" \ + "$(INTDIR)\study.obj" + +"$(OUTDIR)\pcre.lib" : "$(OUTDIR)" $(DEF_FILE) $(LIB32_OBJS) + $(LIB32) @<< + $(LIB32_FLAGS) $(DEF_FLAGS) $(LIB32_OBJS) +<< + +!ELSEIF "$(CFG)" == "pcre - Win32 Debug" + +OUTDIR=.\LibD +INTDIR=.\LibD +# Begin Custom Macros +OutDir=.\LibD +# End Custom Macros + +!IF "$(RECURSE)" == "0" + +ALL : ".\pcre.h" ".\config.h" ".\chartables.c" "$(OUTDIR)\pcre.lib" + +!ELSE + +ALL : "dftables - Win32 Debug" ".\pcre.h" ".\config.h" ".\chartables.c" "$(OUTDIR)\pcre.lib" + +!ENDIF + +!IF "$(RECURSE)" == "1" +CLEAN :"dftables - Win32 DebugCLEAN" +!ELSE +CLEAN : +!ENDIF + -@erase "$(INTDIR)\get.obj" + -@erase "$(INTDIR)\maketables.obj" + -@erase "$(INTDIR)\pcre.obj" + -@erase "$(INTDIR)\pcre_src.idb" + -@erase "$(INTDIR)\pcre_src.pdb" + -@erase "$(INTDIR)\study.obj" + -@erase "$(OUTDIR)\pcre.lib" + -@erase ".\chartables.c" + -@erase ".\config.h" + -@erase ".\pcre.h" + +"$(OUTDIR)" : + if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" + +CPP=cl.exe +CPP_PROJ=/nologo /MDd /W3 /Zi /Od /D "_WIN32" /D "_DEBUG" /D "_WINDOWS" /D "PCRE_STATIC" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\pcre_src" /FD /EHsc /c + +.c{$(INTDIR)}.obj:: + $(CPP) @<< + $(CPP_PROJ) $< +<< + +.cpp{$(INTDIR)}.obj:: + $(CPP) @<< + $(CPP_PROJ) $< +<< + +.cxx{$(INTDIR)}.obj:: + $(CPP) @<< + $(CPP_PROJ) $< +<< + +.c{$(INTDIR)}.sbr:: + $(CPP) @<< + $(CPP_PROJ) $< +<< + +.cpp{$(INTDIR)}.sbr:: + $(CPP) @<< + $(CPP_PROJ) $< +<< + +.cxx{$(INTDIR)}.sbr:: + $(CPP) @<< + $(CPP_PROJ) $< +<< + +RSC=rc.exe +BSC32=bscmake.exe +BSC32_FLAGS=/nologo /o"$(OUTDIR)\pcre.bsc" +BSC32_SBRS= \ + +LIB32=link.exe -lib +LIB32_FLAGS=/nologo /out:"$(OUTDIR)\pcre.lib" +LIB32_OBJS= \ + "$(INTDIR)\get.obj" \ + "$(INTDIR)\maketables.obj" \ + "$(INTDIR)\pcre.obj" \ + "$(INTDIR)\study.obj" + +"$(OUTDIR)\pcre.lib" : "$(OUTDIR)" $(DEF_FILE) $(LIB32_OBJS) + $(LIB32) @<< + $(LIB32_FLAGS) $(DEF_FLAGS) $(LIB32_OBJS) +<< + +!ENDIF + + +!IF "$(NO_EXTERNAL_DEPS)" != "1" +!IF EXISTS("pcre.dep") +!INCLUDE "pcre.dep" +!ELSE +!MESSAGE Warning: cannot find "pcre.dep" +!ENDIF +!ENDIF + + +!IF "$(CFG)" == "pcre - Win32 Release" || "$(CFG)" == "pcre - Win32 Debug" +SOURCE=.\dftables.exe + +!IF "$(CFG)" == "pcre - Win32 Release" + +InputPath=.\dftables.exe + +".\chartables.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + < .\config.h +<< + + +!ELSEIF "$(CFG)" == "pcre - Win32 Debug" + +InputPath=.\config.hw + +".\config.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + < .\config.h +<< + + +!ENDIF + +SOURCE=.\pcre.hw + +!IF "$(CFG)" == "pcre - Win32 Release" + +InputPath=.\pcre.hw + +".\pcre.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + < .\pcre.h +<< + + +!ELSEIF "$(CFG)" == "pcre - Win32 Debug" + +InputPath=.\pcre.hw + +".\pcre.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + < .\pcre.h +<< + + +!ENDIF + +!IF "$(CFG)" == "pcre - Win32 Release" + +"dftables - Win32 Release" : + cd "." + $(MAKE) /$(MAKEFLAGS) /F ".\dftables.mak" CFG="dftables - Win32 Release" + cd "." + +"dftables - Win32 ReleaseCLEAN" : + cd "." + $(MAKE) /$(MAKEFLAGS) /F ".\dftables.mak" CFG="dftables - Win32 Release" RECURSE=1 CLEAN + cd "." + +!ELSEIF "$(CFG)" == "pcre - Win32 Debug" + +"dftables - Win32 Debug" : + cd "." + $(MAKE) /$(MAKEFLAGS) /F ".\dftables.mak" CFG="dftables - Win32 Debug" + cd "." + +"dftables - Win32 DebugCLEAN" : + cd "." + $(MAKE) /$(MAKEFLAGS) /F ".\dftables.mak" CFG="dftables - Win32 Debug" RECURSE=1 CLEAN + cd "." + +!ENDIF + + +!ENDIF +