diff options
-rw-r--r-- | Apache.dsw | 34 | ||||
-rw-r--r-- | ApacheCore.dsp | 12 | ||||
-rw-r--r-- | Makefile.win | 8 | ||||
-rw-r--r-- | httpd.dsp | 12 | ||||
-rw-r--r-- | include/ap_config.h | 8 | ||||
-rw-r--r-- | server/gen_test_char.dsp | 9 | ||||
-rw-r--r-- | server/gen_uri_delims.dsp | 8 | ||||
-rw-r--r-- | srclib/pcre/.cvsignore | 6 | ||||
-rw-r--r-- | srclib/pcre/config.hw | 28 | ||||
-rw-r--r-- | srclib/pcre/dftables.dsp | 160 | ||||
-rw-r--r-- | srclib/pcre/pcre.dsp | 193 | ||||
-rw-r--r-- | srclib/pcre/pcre.hw | 105 | ||||
-rw-r--r-- | srclib/pcre/pcreposix.dsp | 152 |
13 files changed, 695 insertions, 40 deletions
diff --git a/Apache.dsw b/Apache.dsw index a0ff012b1a..96d9bf9056 100644 --- a/Apache.dsw +++ b/Apache.dsw @@ -36,14 +36,14 @@ Package=<4> Project_Dep_Name ap End Project Dependency Begin Project Dependency - Project_Dep_Name regex - End Project Dependency - Begin Project Dependency Project_Dep_Name gen_test_char End Project Dependency Begin Project Dependency Project_Dep_Name gen_uri_delims End Project Dependency + Begin Project Dependency + Project_Dep_Name pcreposix + End Project Dependency }}} ############################################################################### @@ -390,6 +390,18 @@ Package=<4> ############################################################################### +Project: "dftables"=".\lib\pcre\dftables.dsp" - Package Owner=<4> + +Package=<5> +{{{ +}}} + +Package=<4> +{{{ +}}} + +############################################################################### + Project: "gen_test_char"=".\main\gen_test_char.dsp" - Package Owner=<4> Package=<5> @@ -477,7 +489,7 @@ Package=<4> ############################################################################### -Project: "regex"=".\regex\regex.dsp" - Package Owner=<4> +Project: "pcre"=".\lib\pcre\pcre.dsp" - Package Owner=<4> Package=<5> {{{ @@ -486,12 +498,24 @@ Package=<5> Package=<4> {{{ Begin Project Dependency - Project_Dep_Name aprlib + Project_Dep_Name dftables End Project Dependency }}} ############################################################################### +Project: "pcreposix"=".\lib\pcre\pcreposix.dsp" - Package Owner=<4> + +Package=<5> +{{{ +}}} + +Package=<4> +{{{ +}}} + +############################################################################### + Project: "rotatelogs"=".\support\rotatelogs.dsp" - Package Owner=<4> Package=<5> diff --git a/ApacheCore.dsp b/ApacheCore.dsp index 34f82dc18f..087da21fbf 100644 --- a/ApacheCore.dsp +++ b/ApacheCore.dsp @@ -54,8 +54,8 @@ BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe -# ADD BASE LINK32 aprlib.lib regex.lib ap.lib kernel32.lib advapi32.lib ws2_32.lib mswsock.lib /nologo /base:@"os\win32\BaseAddr.ref",ApacheCore /subsystem:windows /dll /map /machine:I386 /libpath:"lib\apr\Release" /libpath:"regex\release" /libpath:"ap\Release" -# ADD LINK32 aprlib.lib regex.lib ap.lib kernel32.lib advapi32.lib ws2_32.lib mswsock.lib /nologo /base:@"os\win32\BaseAddr.ref",ApacheCore /subsystem:windows /dll /map /machine:I386 /libpath:"lib\apr\Release" /libpath:"regex\release" /libpath:"ap\Release" +# ADD BASE LINK32 aprlib.lib ap.lib pcreposix.lib pcre.lib kernel32.lib advapi32.lib ws2_32.lib mswsock.lib /nologo /subsystem:windows /dll /map /machine:I386 /libpath:"lib\apr\Release" /libpath:"regex\release" /libpath:"ap\Release" /base:@"os\win32\BaseAddr.ref",ApacheCore +# ADD LINK32 aprlib.lib ap.lib pcreposix.lib pcre.lib kernel32.lib advapi32.lib ws2_32.lib mswsock.lib /nologo /subsystem:windows /dll /map /machine:I386 /libpath:"lib\apr\Release" /libpath:"lib\pcre\release" /libpath:"ap\Release" /base:@"os\win32\BaseAddr.ref",ApacheCore !ELSEIF "$(CFG)" == "ApacheCore - Win32 Debug" @@ -81,8 +81,8 @@ BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe -# ADD BASE LINK32 aprlib.lib regex.lib ap.lib kernel32.lib advapi32.lib ws2_32.lib mswsock.lib /nologo /base:@"os\win32\BaseAddr.ref",ApacheCore /subsystem:windows /dll /map /debug /machine:I386 /libpath:"lib\apr\debug" /libpath:"regex\debug" /libpath:"ap\Debug" -# ADD LINK32 aprlib.lib regex.lib ap.lib kernel32.lib advapi32.lib ws2_32.lib mswsock.lib /nologo /base:@"os\win32\BaseAddr.ref",ApacheCore /subsystem:windows /dll /map /debug /machine:I386 /libpath:"lib\apr\debug" /libpath:"regex\debug" /libpath:"ap\Debug" +# ADD BASE LINK32 aprlib.lib regex.lib ap.lib pcreposix.lib pcre.lib kernel32.lib advapi32.lib ws2_32.lib mswsock.lib /nologo /subsystem:windows /dll /map /debug /machine:I386 /libpath:"lib\apr\debug" /libpath:"regex\debug" /libpath:"ap\Debug" /base:@"os\win32\BaseAddr.ref",ApacheCore +# ADD LINK32 aprlib.lib ap.lib kernel32.lib advapi32.lib ws2_32.lib mswsock.lib /nologo /subsystem:windows /dll /map /debug /machine:I386 /libpath:"lib\apr\debug" /libpath:"lib\pcre\debug" /libpath:"ap\Debug" /base:@"os\win32\BaseAddr.ref",ApacheCore !ENDIF @@ -307,10 +307,6 @@ SOURCE=.\include\fnmatch.h # End Source File # Begin Source File -SOURCE=.\include\hsregex.h -# End Source File -# Begin Source File - SOURCE=.\include\http_conf_globals.h # End Source File # Begin Source File diff --git a/Makefile.win b/Makefile.win index 1be8461c2f..9933b5b536 100644 --- a/Makefile.win +++ b/Makefile.win @@ -68,9 +68,11 @@ _build: $(MAKE) $(MAKEOPT) -f aprlib.mak CFG="aprlib - Win32 $(LONG)" RECURSE=0 $(CTARGET) $(MAKE) $(MAKEOPT) -f aprlibdll.mak CFG="aprlibdll - Win32 $(LONG)" RECURSE=0 $(CTARGET) cd ..\.. - cd regex - $(MAKE) $(MAKEOPT) -f regex.mak CFG="regex - Win32 $(LONG)" RECURSE=0 $(CTARGET) - cd .. + cd lib\pcre + $(MAKE) $(MAKEOPT) -f dftables.mak CFG="dftables - Win32 $(LONG)" RECURSE=0 $(CTARGET) + $(MAKE) $(MAKEOPT) -f pcre.mak CFG="pcre - Win32 $(LONG)" RECURSE=0 $(CTARGET) + $(MAKE) $(MAKEOPT) -f pcreposix.mak CFG="pcreposix - Win32 $(LONG)" RECURSE=0 $(CTARGET) + cd ..\.. cd ap $(MAKE) $(MAKEOPT) -f ap.mak CFG="ap - Win32 $(LONG)" RECURSE=0 $(CTARGET) cd .. @@ -54,8 +54,8 @@ BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe -# ADD BASE LINK32 aprlib.lib regex.lib ap.lib kernel32.lib advapi32.lib ws2_32.lib mswsock.lib /nologo /base:@"os\win32\BaseAddr.ref",ApacheCore /subsystem:windows /dll /map /machine:I386 /libpath:"lib\apr\Release" /libpath:"regex\release" /libpath:"ap\Release" -# ADD LINK32 aprlib.lib regex.lib ap.lib kernel32.lib advapi32.lib ws2_32.lib mswsock.lib /nologo /base:@"os\win32\BaseAddr.ref",ApacheCore /subsystem:windows /dll /map /machine:I386 /libpath:"lib\apr\Release" /libpath:"regex\release" /libpath:"ap\Release" +# ADD BASE LINK32 aprlib.lib ap.lib pcreposix.lib pcre.lib kernel32.lib advapi32.lib ws2_32.lib mswsock.lib /nologo /subsystem:windows /dll /map /machine:I386 /libpath:"lib\apr\Release" /libpath:"regex\release" /libpath:"ap\Release" /base:@"os\win32\BaseAddr.ref",ApacheCore +# ADD LINK32 aprlib.lib ap.lib pcreposix.lib pcre.lib kernel32.lib advapi32.lib ws2_32.lib mswsock.lib /nologo /subsystem:windows /dll /map /machine:I386 /libpath:"lib\apr\Release" /libpath:"lib\pcre\release" /libpath:"ap\Release" /base:@"os\win32\BaseAddr.ref",ApacheCore !ELSEIF "$(CFG)" == "ApacheCore - Win32 Debug" @@ -81,8 +81,8 @@ BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe -# ADD BASE LINK32 aprlib.lib regex.lib ap.lib kernel32.lib advapi32.lib ws2_32.lib mswsock.lib /nologo /base:@"os\win32\BaseAddr.ref",ApacheCore /subsystem:windows /dll /map /debug /machine:I386 /libpath:"lib\apr\debug" /libpath:"regex\debug" /libpath:"ap\Debug" -# ADD LINK32 aprlib.lib regex.lib ap.lib kernel32.lib advapi32.lib ws2_32.lib mswsock.lib /nologo /base:@"os\win32\BaseAddr.ref",ApacheCore /subsystem:windows /dll /map /debug /machine:I386 /libpath:"lib\apr\debug" /libpath:"regex\debug" /libpath:"ap\Debug" +# ADD BASE LINK32 aprlib.lib regex.lib ap.lib pcreposix.lib pcre.lib kernel32.lib advapi32.lib ws2_32.lib mswsock.lib /nologo /subsystem:windows /dll /map /debug /machine:I386 /libpath:"lib\apr\debug" /libpath:"regex\debug" /libpath:"ap\Debug" /base:@"os\win32\BaseAddr.ref",ApacheCore +# ADD LINK32 aprlib.lib ap.lib kernel32.lib advapi32.lib ws2_32.lib mswsock.lib /nologo /subsystem:windows /dll /map /debug /machine:I386 /libpath:"lib\apr\debug" /libpath:"lib\pcre\debug" /libpath:"ap\Debug" /base:@"os\win32\BaseAddr.ref",ApacheCore !ENDIF @@ -307,10 +307,6 @@ SOURCE=.\include\fnmatch.h # End Source File # Begin Source File -SOURCE=.\include\hsregex.h -# End Source File -# Begin Source File - SOURCE=.\include\http_conf_globals.h # End Source File # Begin Source File diff --git a/include/ap_config.h b/include/ap_config.h index 8a5c7fca29..5232bbb602 100644 --- a/include/ap_config.h +++ b/include/ap_config.h @@ -1089,14 +1089,6 @@ typedef int rlim_t; #include <process.h> #endif -#ifdef WIN32 -#include "../include/hsregex.h" -#elif defined(AP_USE_HSREGEX) -#include "hsregex.h" -#else -#include <regex.h> -#endif - #ifdef HAVE_SYS_RESOURCE_H #include <sys/resource.h> #ifdef SUNOS4 diff --git a/server/gen_test_char.dsp b/server/gen_test_char.dsp index f139722e91..5ef888a0bc 100644 --- a/server/gen_test_char.dsp +++ b/server/gen_test_char.dsp @@ -43,7 +43,7 @@ RSC=rc.exe # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c -# ADD CPP /nologo /W3 /GX /O2 /I "..\include" /I "..\lib\apr\include" /I "..\os\win32" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c +# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\include" /I "..\lib\apr\include" /I "..\os\win32" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c # ADD BASE RSC /l 0x809 /d "NDEBUG" # ADD RSC /l 0x809 /d "NDEBUG" BSC32=bscmake.exe @@ -51,7 +51,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib /nologo /subsystem:console /machine:I386 -# ADD LINK32 kernel32.lib /nologo /subsystem:console /machine:I386 +# ADD LINK32 kernel32.lib /nologo /subsystem:console /pdb:none /machine:I386 !ELSEIF "$(CFG)" == "gen_test_char - Win32 Debug" @@ -67,7 +67,8 @@ LINK32=link.exe # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c -# ADD CPP /nologo /W3 /Gm /GX /Zi /Od /I "..\include" /I "..\lib\apr\include" /I "..\os\win32" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c +# ADD CPP /nologo /MDd /W3 /Gm /GX- /Zi /Od /I "..\include" /I "..\lib\apr\include" /I "..\os\win32" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c +# SUBTRACT CPP /Fr # ADD BASE RSC /l 0x809 /d "_DEBUG" # ADD RSC /l 0x809 /d "_DEBUG" BSC32=bscmake.exe @@ -75,7 +76,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept -# ADD LINK32 kernel32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept +# ADD LINK32 kernel32.lib /nologo /subsystem:console /pdb:none /debug /machine:I386 !ENDIF diff --git a/server/gen_uri_delims.dsp b/server/gen_uri_delims.dsp index 07a9e1748e..9da3241aed 100644 --- a/server/gen_uri_delims.dsp +++ b/server/gen_uri_delims.dsp @@ -43,7 +43,7 @@ RSC=rc.exe # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c -# ADD CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c +# ADD CPP /nologo /MD /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c # ADD BASE RSC /l 0x809 /d "NDEBUG" # ADD RSC /l 0x809 /d "NDEBUG" BSC32=bscmake.exe @@ -51,7 +51,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib /nologo /subsystem:console /machine:I386 -# ADD LINK32 kernel32.lib /nologo /subsystem:console /machine:I386 +# ADD LINK32 kernel32.lib /nologo /subsystem:console /pdb:none /machine:I386 !ELSEIF "$(CFG)" == "gen_uri_delims - Win32 Debug" @@ -67,7 +67,7 @@ LINK32=link.exe # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c -# ADD CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c +# ADD CPP /nologo /MDd /W3 /Gm /GX- /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c # ADD BASE RSC /l 0x809 /d "_DEBUG" # ADD RSC /l 0x809 /d "_DEBUG" BSC32=bscmake.exe @@ -75,7 +75,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept -# ADD LINK32 kernel32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept +# ADD LINK32 kernel32.lib /nologo /subsystem:console /pdb:none /debug /machine:I386 !ENDIF diff --git a/srclib/pcre/.cvsignore b/srclib/pcre/.cvsignore index ba115cc749..67e2e169df 100644 --- a/srclib/pcre/.cvsignore +++ b/srclib/pcre/.cvsignore @@ -2,13 +2,19 @@ *.lo .libs Makefile +*.mak chartables.c config.h config.log config.status dftables +dftables.exe +dftables_D +dftables_R libtool pcre-config pcre.h pcretest pgrep +LibD +LibR diff --git a/srclib/pcre/config.hw b/srclib/pcre/config.hw new file mode 100644 index 0000000000..124f5de2ce --- /dev/null +++ b/srclib/pcre/config.hw @@ -0,0 +1,28 @@ + +/* On Unix systems config.in is converted by configure into config.h. PCRE is +written in Standard C, but there are a few non-standard things it can cope +with, allowing it to run on SunOS4 and other "close to standard" systems. + +On a non-Unix system you should just copy this file into config.h and change +the definitions of HAVE_STRERROR and HAVE_MEMMOVE to 1. Unfortunately, because +of the way autoconf works, these cannot be made the defaults. */ + +/* Define to empty if the keyword does not work. */ + +#undef const + +/* Define to `unsigned' if <stddef.h> doesn't define size_t. */ + +#undef size_t + +/* The following two definitions are mainly for the benefit of SunOS4, which +doesn't have the strerror() or memmove() functions that should be present in +all Standard C libraries. The macros should normally be defined with the value +1 for other systems, but unfortunately we can't make this the default because +"configure" files generated by autoconf will only change 0 to 1; they won't +change 1 to 0 if the functions are not found. */ + +#define HAVE_STRERROR 1 +#define HAVE_MEMMOVE 1 + +/* End */ diff --git a/srclib/pcre/dftables.dsp b/srclib/pcre/dftables.dsp new file mode 100644 index 0000000000..c2955cbf08 --- /dev/null +++ b/srclib/pcre/dftables.dsp @@ -0,0 +1,160 @@ +# Microsoft Developer Studio Project File - Name="dftables" - Package Owner=<4> +# Microsoft Developer Studio Generated Build File, Format Version 5.00 +# ** DO NOT EDIT ** + +# TARGTYPE "Win32 (x86) Console Application" 0x0103 + +CFG=dftables - 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 "dftables.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 "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 + +# Begin Project +# PROP Scc_ProjName "" +# PROP Scc_LocalPath "" +CPP=cl.exe +RSC=rc.exe + +!IF "$(CFG)" == "dftables - 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 "" +# PROP Intermediate_Dir "dftables_R" +# PROP Ignore_Export_Lib 0 +# PROP Target_Dir "" +# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c +# ADD CPP /nologo /MD /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c +# 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 /nologo /subsystem:console /machine:I386 +# ADD LINK32 kernel32.lib /nologo /subsystem:console /pdb:none /machine:I386 + +!ELSEIF "$(CFG)" == "dftables - 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 "" +# PROP Intermediate_Dir "dftables_D" +# PROP Ignore_Export_Lib 0 +# PROP Target_Dir "" +# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c +# ADD CPP /nologo /MDd /W3 /Gm /GX- /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c +# 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 /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept +# ADD LINK32 kernel32.lib /nologo /subsystem:console /pdb:none /debug /machine:I386 + +!ENDIF + +# Begin Target + +# Name "dftables - Win32 Release" +# Name "dftables - Win32 Debug" +# Begin Group "Source Files" + +# PROP Default_Filter "" +# Begin Source File + +SOURCE=.\dftables.c +# End Source File +# End Group +# Begin Group "Header Files" + +# PROP Default_Filter "h;hw" +# Begin Source File + +SOURCE=.\config.hw + +!IF "$(CFG)" == "dftables - Win32 Release" + +# Begin Custom Build +InputPath=.\config.hw + +".\config.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + echo Creating pcre config.h from config.hw + copy .\config.hw .\config.h + +# End Custom Build + +!ELSEIF "$(CFG)" == "dftables - Win32 Debug" + +# Begin Custom Build +InputPath=.\config.hw + +".\config.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + echo Creating pcre config.h from config.hw + copy .\config.hw .\config.h + +# End Custom Build + +!ENDIF + +# End Source File +# Begin Source File + +SOURCE=.\internal.h +# End Source File +# Begin Source File + +SOURCE=.\pcre.hw + +!IF "$(CFG)" == "dftables - Win32 Release" + +# Begin Custom Build +InputPath=.\pcre.hw + +".\pcre.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + echo Creating pcre.h from pcre.hw + copy .\pcre.hw .\pcre.h + +# End Custom Build + +!ELSEIF "$(CFG)" == "dftables - Win32 Debug" + +# Begin Custom Build +InputPath=.\pcre.hw + +".\pcre.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + echo Creating pcre.h from pcre.hw + copy .\pcre.hw .\pcre.h + +# End Custom Build + +!ENDIF + +# End Source File +# End Group +# End Target +# End Project diff --git a/srclib/pcre/pcre.dsp b/srclib/pcre/pcre.dsp new file mode 100644 index 0000000000..bb6781503a --- /dev/null +++ b/srclib/pcre/pcre.dsp @@ -0,0 +1,193 @@ +# Microsoft Developer Studio Project File - Name="pcre" - Package Owner=<4> +# Microsoft Developer Studio Generated Build File, Format Version 5.00 +# ** DO NOT EDIT ** + +# TARGTYPE "Win32 (x86) Static Library" 0x0104 + +CFG=pcre - 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 "pcre.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 "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 + +# Begin Project +# PROP Scc_ProjName "" +# PROP Scc_LocalPath "" +CPP=cl.exe + +!IF "$(CFG)" == "pcre - 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 "LibR" +# PROP Intermediate_Dir "LibR" +# PROP Target_Dir "" +# ADD BASE CPP /nologo /MD /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /FD /c +# ADD CPP /nologo /MD /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /FD /c +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LIB32=link.exe -lib +# ADD BASE LIB32 /nologo +# ADD LIB32 /nologo + +!ELSEIF "$(CFG)" == "pcre - 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 "LibD" +# PROP Intermediate_Dir "LibD" +# PROP Target_Dir "" +# ADD BASE CPP /nologo /MDd /W3 /GX /Z7 /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /FD /c +# ADD CPP /nologo /MDd /W3 /GX /Z7 /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /FD /c +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LIB32=link.exe -lib +# ADD BASE LIB32 /nologo +# ADD LIB32 /nologo + +!ENDIF + +# Begin Target + +# Name "pcre - Win32 Release" +# Name "pcre - Win32 Debug" +# Begin Group "Source Files" + +# PROP Default_Filter "*.c" +# Begin Source File + +SOURCE=.\dftables.exe + +!IF "$(CFG)" == "pcre - Win32 Release" + +# Begin Custom Build +InputPath=.\dftables.exe + +".\chartables.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + .\dftables.exe >.\chartables.c + Echo Creating pcre chartables.c from dftables + +# End Custom Build + +!ELSEIF "$(CFG)" == "pcre - Win32 Debug" + +# Begin Custom Build +InputPath=.\dftables.exe + +".\chartables.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + .\dftables.exe >.\chartables.c + Echo Creating pcre chartables.c from dftables + +# End Custom Build + +!ENDIF + +# End Source File +# Begin Source File + +SOURCE=.\get.c +# End Source File +# Begin Source File + +SOURCE=.\maketables.c +# End Source File +# Begin Source File + +SOURCE=.\pcre.c +# End Source File +# Begin Source File + +SOURCE=.\study.c +# End Source File +# End Group +# Begin Group "Header Files" + +# PROP Default_Filter "*.h" +# Begin Source File + +SOURCE=.\config.hw + +!IF "$(CFG)" == "pcre - Win32 Release" + +# Begin Custom Build +InputPath=.\config.hw + +".\config.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + echo Creating pcre config.h from config.hw + copy .\config.hw .\config.h + +# End Custom Build + +!ELSEIF "$(CFG)" == "pcre - Win32 Debug" + +# Begin Custom Build +InputPath=.\config.hw + +".\config.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + echo Creating pcre config.h from config.hw + copy .\config.hw .\config.h + +# End Custom Build + +!ENDIF + +# End Source File +# Begin Source File + +SOURCE=.\pcre.hw + +!IF "$(CFG)" == "pcre - Win32 Release" + +# Begin Custom Build +InputPath=.\pcre.hw + +".\pcre.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + echo Creating pcre.h from pcre.hw + copy .\pcre.hw .\pcre.h + +# End Custom Build + +!ELSEIF "$(CFG)" == "pcre - Win32 Debug" + +# Begin Custom Build +InputPath=.\pcre.hw + +".\pcre.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + echo Creating pcre.h from pcre.hw + copy .\pcre.hw .\pcre.h + +# End Custom Build + +!ENDIF + +# End Source File +# Begin Source File + +SOURCE=..\..\include\pcreposix.h +# End Source File +# End Group +# End Target +# End Project diff --git a/srclib/pcre/pcre.hw b/srclib/pcre/pcre.hw new file mode 100644 index 0000000000..b66e2de953 --- /dev/null +++ b/srclib/pcre/pcre.hw @@ -0,0 +1,105 @@ +/************************************************* +* Perl-Compatible Regular Expressions * +*************************************************/ + +/* Copyright (c) 1997-2000 University of Cambridge */ + +#ifndef _PCRE_H +#define _PCRE_H + +#define PCRE_MAJOR 3 +#define PCRE_MINOR 1 +#define PCRE_DATE 09-Feb-2000 + +/* Win32 uses DLL by default */ + +#ifdef _WIN32 +# ifdef STATIC +# define PCRE_DL_IMPORT +# else +# define PCRE_DL_IMPORT __declspec(dllimport) +# endif +#else +# define PCRE_DL_IMPORT +#endif + +/* Have to include stdlib.h in order to ensure that size_t is defined; +it is needed here for malloc. */ + +#include <sys/types.h> +#include <stdlib.h> + +/* Allow for C++ users */ + +#ifdef __cplusplus +extern "C" { +#endif + +/* Options */ + +#define PCRE_CASELESS 0x0001 +#define PCRE_MULTILINE 0x0002 +#define PCRE_DOTALL 0x0004 +#define PCRE_EXTENDED 0x0008 +#define PCRE_ANCHORED 0x0010 +#define PCRE_DOLLAR_ENDONLY 0x0020 +#define PCRE_EXTRA 0x0040 +#define PCRE_NOTBOL 0x0080 +#define PCRE_NOTEOL 0x0100 +#define PCRE_UNGREEDY 0x0200 +#define PCRE_NOTEMPTY 0x0400 + +/* Exec-time and get-time error codes */ + +#define PCRE_ERROR_NOMATCH (-1) +#define PCRE_ERROR_NULL (-2) +#define PCRE_ERROR_BADOPTION (-3) +#define PCRE_ERROR_BADMAGIC (-4) +#define PCRE_ERROR_UNKNOWN_NODE (-5) +#define PCRE_ERROR_NOMEMORY (-6) +#define PCRE_ERROR_NOSUBSTRING (-7) + +/* Request types for pcre_fullinfo() */ + +#define PCRE_INFO_OPTIONS 0 +#define PCRE_INFO_SIZE 1 +#define PCRE_INFO_CAPTURECOUNT 2 +#define PCRE_INFO_BACKREFMAX 3 +#define PCRE_INFO_FIRSTCHAR 4 +#define PCRE_INFO_FIRSTTABLE 5 +#define PCRE_INFO_LASTLITERAL 6 + +/* Types */ + +typedef void pcre; +typedef void pcre_extra; + +/* Store get and free functions. These can be set to alternative malloc/free +functions if required. Some magic is required for Win32 DLL; it is null on +other OS. */ + +PCRE_DL_IMPORT extern void *(*pcre_malloc)(size_t); +PCRE_DL_IMPORT extern void (*pcre_free)(void *); + +#undef PCRE_DL_IMPORT + +/* Functions */ + +extern pcre *pcre_compile(const char *, int, const char **, int *, + const unsigned char *); +extern int pcre_copy_substring(const char *, int *, int, int, char *, int); +extern int pcre_exec(const pcre *, const pcre_extra *, const char *, + int, int, int, int *, int); +extern int pcre_get_substring(const char *, int *, int, int, const char **); +extern int pcre_get_substring_list(const char *, int *, int, const char ***); +extern int pcre_info(const pcre *, int *, int *); +extern int pcre_fullinfo(const pcre *, const pcre_extra *, int, void *); +extern unsigned const char *pcre_maketables(void); +extern pcre_extra *pcre_study(const pcre *, int, const char **); +extern const char *pcre_version(void); + +#ifdef __cplusplus +} /* extern "C" */ +#endif + +#endif /* End of pcre.h */ diff --git a/srclib/pcre/pcreposix.dsp b/srclib/pcre/pcreposix.dsp new file mode 100644 index 0000000000..651e4a19d7 --- /dev/null +++ b/srclib/pcre/pcreposix.dsp @@ -0,0 +1,152 @@ +# Microsoft Developer Studio Project File - Name="pcreposix" - Package Owner=<4> +# Microsoft Developer Studio Generated Build File, Format Version 5.00 +# ** DO NOT EDIT ** + +# TARGTYPE "Win32 (x86) Static Library" 0x0104 + +CFG=pcreposix - 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 "pcreposix.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 "pcreposix.mak" CFG="pcreposix - Win32 Debug" +!MESSAGE +!MESSAGE Possible choices for configuration are: +!MESSAGE +!MESSAGE "pcreposix - Win32 Release" (based on "Win32 (x86) Static Library") +!MESSAGE "pcreposix - Win32 Debug" (based on "Win32 (x86) Static Library") +!MESSAGE + +# Begin Project +# PROP Scc_ProjName "" +# PROP Scc_LocalPath "" +CPP=cl.exe + +!IF "$(CFG)" == "pcreposix - 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 "LibR" +# PROP Intermediate_Dir "LibR/posix" +# PROP Target_Dir "" +# ADD BASE CPP /nologo /MD /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /FD /c +# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /FD /c +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LIB32=link.exe -lib +# ADD BASE LIB32 /nologo +# ADD LIB32 /nologo + +!ELSEIF "$(CFG)" == "pcreposix - 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 "LibD" +# PROP Intermediate_Dir "LibD/posix" +# PROP Target_Dir "" +# ADD BASE CPP /nologo /MDd /W3 /GX /Z7 /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /FD /c +# ADD CPP /nologo /MDd /W3 /GX /Z7 /Od /I "..\include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /FD /c +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LIB32=link.exe -lib +# ADD BASE LIB32 /nologo +# ADD LIB32 /nologo + +!ENDIF + +# Begin Target + +# Name "pcreposix - Win32 Release" +# Name "pcreposix - Win32 Debug" +# Begin Group "Source Files" + +# PROP Default_Filter "*.c" +# Begin Source File + +SOURCE=.\pcreposix.c +# End Source File +# End Group +# Begin Group "Header Files" + +# PROP Default_Filter "*.h" +# Begin Source File + +SOURCE=.\config.hw + +!IF "$(CFG)" == "pcreposix - Win32 Release" + +# Begin Custom Build +InputPath=.\config.hw + +".\config.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + echo Creating pcre config.h from config.hw + copy .\config.hw .\config.h + +# End Custom Build + +!ELSEIF "$(CFG)" == "pcreposix - Win32 Debug" + +# Begin Custom Build +InputPath=.\config.hw + +".\config.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + echo Creating pcre config.h from config.hw + copy .\config.hw .\config.h + +# End Custom Build + +!ENDIF + +# End Source File +# Begin Source File + +SOURCE=..\..\include\pcre.h +# End Source File +# Begin Source File + +SOURCE=.\pcre.hw + +!IF "$(CFG)" == "pcreposix - Win32 Release" + +# Begin Custom Build +InputPath=.\pcre.hw + +".\pcre.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + echo Creating pcre.h from pcre.hw + copy .\pcre.hw .\pcre.h + +# End Custom Build + +!ELSEIF "$(CFG)" == "pcreposix - Win32 Debug" + +# Begin Custom Build +InputPath=.\pcre.hw + +".\pcre.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + echo Creating pcre.h from pcre.hw + copy .\pcre.hw .\pcre.h + +# End Custom Build + +!ENDIF + +# End Source File +# End Group +# End Target +# End Project |