Author: mladen.turk(a)jboss.com Date: 2007-12-13 12:05:23 -0500 (Thu, 13 Dec 2007) New Revision: 1205 Added: trunk/httpd/ trunk/httpd/NMAKEcommon.inc trunk/httpd/NMAKEhttpd trunk/httpd/NMAKEmakefile trunk/httpd/srclib/ trunk/httpd/srclib/apr-iconv/ trunk/httpd/srclib/apr-iconv/NMAKEmakefile trunk/httpd/srclib/apr-util/ trunk/httpd/srclib/apr-util/NMAKEmakefile trunk/httpd/srclib/apr/ trunk/httpd/srclib/apr/NMAKEmakefile trunk/httpd/srclib/pcre/ trunk/httpd/srclib/pcre/NMAKEmakefile trunk/httpd/srclib/pcre/chartables.c trunk/httpd/srclib/zlib/ trunk/httpd/srclib/zlib/NMAKEmakefile Log: Windows build files. Just the tip of the ice berg :) Added: trunk/httpd/NMAKEcommon.inc =================================================================== --- trunk/httpd/NMAKEcommon.inc (rev 0) +++ trunk/httpd/NMAKEcommon.inc 2007-12-13 17:05:23 UTC (rev 1205) @@ -0,0 +1,312 @@ +# Copyright 2001-2006 The Apache Software Foundation or its licensors, as +# applicable. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +# ==================================================================== +# +# NMAKEcommon.inc Master makefile definitions. +# This file defines CPU architecture and basic compiler +# and linker parameters. +# Common params: +# CPU Compile for specified CPU. Supported CPU's are: +# i386 +# AMD64 +# IA64 +# If not specified it will default to the +# PROCESSOR_ARCHITECTURE environment variable +# or to the i386 if not specified. +# WINVER Compile for specified Windows version +# WINNT for Windows 2000 and up(default) +# WINXP for Windows XP and up +# WIN2003 for Windows 2003 and up +# VSITA for Windows Vista and up +# Deprecated targets (may not even compile): +# NT4 for Windows NT4 and up +# WIN9X for Windows 95, 98 and Me +# BUILD Build version +# RETAIL or RELEASE (default) +# DEBUG +# TARGET Build application target +# EXE Console executable (default) +# GUI Windows GUI executable +# DLL Dynamic Link Library +# LIB Static library +# Environment variables used: +# CFLAGS Added to the common CFLAGS +# CPPFLAGS Added to the common CPPFLAGS +# LIBS Added to the common LIBS +# INCLUDES Added to the common INCLUDES +# LFLAGS Added to the common LFLAGS +# RCFLAGS Added to the common RCFLAGS +# +# Originally contributed by Mladen Turk <mturk jboss.com> +# +# ==================================================================== +# + +!IF !DEFINED(CC) || "$(CC)" == "" +CC = cl.exe +!ENDIF + +!IF !DEFINED(LINK) || "$(LINK)" == "" +LINK = link.exe +!ENDIF + +!IF !DEFINED(RC) || "$(RC)" == "" +RC = rc.exe +!ENDIF + +# Read the PROCESSOR_ARCHITECTURE environment value for a CPU type + +!IF "$(BUILDCPU)" == "i386" || "$(BUILDCPU)" == "x86" || "$(BUILDCPU)" == "i686" +CPU=I386 +!ENDIF +!IF "$(BUILDCPU)" == "amd64" || "$(BUILDCPU)" == "x86_64" +CPU=AMD64 +!ENDIF +!IF "$(BUILDCPU)" == "ia64" +CPU=IA64 +!ENDIF + +!IF !DEFINED(CPU) || "$(CPU)" == "" +!IF "$(PROCESSOR_ARCHITECTURE)" == "" +CPU=I386 +!ELSE +CPU=$(PROCESSOR_ARCHITECTURE) +!ENDIF +!ENDIF + +!IF "$(CPU)" != "I386" +!IF "$(CPU)" != "AMD64" +!IF "$(CPU)" != "IA64" +!ERROR Must specify CPU environment variable (I386, AMD64, IA64) $(CPU) +!ENDIF +!ENDIF +!ENDIF + +!IF !DEFINED(TARGET) || "$(TARGET)" == "" +TARGET=EXE +!ENDIF + +!IF "$(TARGET)" != "EXE" +!IF "$(TARGET)" != "GUI" +!IF "$(TARGET)" != "DLL" +!IF "$(TARGET)" != "LIB" +!ERROR Must specify TARGET environment variable (EXE, GUI, DLL, LIB) +!ENDIF +!ENDIF +!ENDIF +!ENDIF + +!IF !DEFINED(WINVER) || "$(WINVER)" == "" +WINVER=WINXP +!ENDIF + + +!IF "$(WINVER)" != "WINNT" +!IF "$(WINVER)" != "WINXP" +!IF "$(WINVER)" != "WIN2003" +!IF "$(WINVER)" != "NT4" +!IF "$(WINVER)" != "WIN9X" +!IF "$(WINVER)" != "WVSITA" +!ERROR Must specify WINVER environment variable (WINNT, WINXP, WIN2003, VSITA, NT4, WIN9X) +!ENDIF +!ENDIF +!ENDIF +!ENDIF +!ENDIF +!ENDIF + +!IF "$(WINVER)" == "WINNT" +NMAKE_WINVER = 0x0500 +_WIN32_IE = 0x0500 +!ELSEIF "$(WINVER)" == "WINXP" +NMAKE_WINVER = 0x0501 +_WIN32_IE = 0x0600 +!ELSEIF "$(WINVER)" == "WIN2003" +NMAKE_WINVER = 0x0502 +_WIN32_IE = 0x0600 +!ELSEIF "$(WINVER)" == "VSITA" +NMAKE_WINVER = 0x0600 +_WIN32_IE = 0x0700 +!ELSEIF "$(WINVER)" == "NT4" +NMAKE_WINVER = 0x0400 +_WIN32_IE = 0x0400 +!ELSE +!ERROR Must specify WINVER environment variable (WINNT, WINXP, WIN2003, VSITA, NT4, WIN9X) +!ENDIF + +!IF !DEFINED(NMAKE_WINVER) || "$(NMAKE_WINVER)" == "" +NMAKE_WINVER = 0x0400 +_WIN32_IE = 0x0400 +NMAKE_WINNT = -D_WIN95 -D_WIN32_WINDOWS=$(NMAKE_WINVER) -DWINVER=$(NMAKE_WINVER) -D_WIN32_IE=$(_WIN32_IE) +!ELSE +NMAKE_WINNT = -D_WINNT -D_WIN32_WINNT=$(NMAKE_WINVER) -DWINVER=$(NMAKE_WINVER) -D_WIN32_IE=$(_WIN32_IE) +!ENDIF + +!IF !DEFINED(BUILD) || "$(BUILD)" == "" +BUILD=RELEASE +!ENDIF + +!IFDEF RELEASE +BUILD=RELEASE +!ENDIF + +!IFDEF DEBUG +BUILD=DEBUG +!ENDIF + +!IFDEF NODEBUG +BUILD=RELEASE +!ENDIF + +!IF "$(BUILD)" != "RELEASE" +!IF "$(BUILD)" != "DEBUG" +!ERROR Must specify BUILD environment variable (RELEASE, DEBUG) +!ENDIF +!ENDIF + +# Common flags for all platforms +CMN_CFLAGS = -c -nologo -DWIN32 -D_WIN32 -D_WINDOWS $(NMAKE_WINNT) -W3 + +!IF "$(CPU)" == "I386" +CPU_CFLAGS = -D_X86_=1 +!ELSEIF "$(CPU)" == "AMD64" +CPU_CFLAGS = -D_AMD64_=1 -DWIN64 -D_WIN64 -Wp64 +!ELSEIF "$(CPU)" == "IA64" +CPU_CFLAGS = -D_IA64_=1 -DWIN64 -D_WIN64 -Wp64 +!ENDIF + +!IF "$(INCLUDE_PRE64PRA)" == "1" +!IF "$(CPU)" != "I386" +CPU_CFLAGS = $(CPU_CFLAGS) /FIPRE64PRA.H +!ENDIF +!ENDIF + +!IF "$(BUILD)" == "RELEASE" +!IF "$(CPU)" == "I386" +OPT_CFLAGS = -O2 -Ob2 -Oy- -Zi -DNDEBUG +!ELSE +OPT_CFLAGS = -O2 -Ob2 -Zi -DNDEBUG +!ENDIF +!ELSE +OPT_CFLAGS = -Od -Zi -DDEBUG -D_DEBUG +!ENDIF + +!IF DEFINED(STATIC_CRT) +CRT_CFLAGS = -D_MT -MT +!ELSE +CRT_CFLAGS = -D_MT -MD +!ENDIF + +!IF "$(BUILD)" == "DEBUG" +CRT_CFLAGS = $(CRT_CFLAGS)d +!ENDIF + +CFLAGS = $(CMN_CFLAGS) $(CPU_CFLAGS) $(OPT_CFLAGS) $(CRT_CFLAGS) $(CFLAGS) + +!IF DEFINED(EXTRA_CFLAGS) +CFLAGS = $(CFLAGS) $(EXTRA_CFLAGS) +!ENDIF + + +# Linker section +LIBS = kernel32.lib advapi32.lib ws2_32.lib mswsock.lib ole32.lib shell32.lib rpcrt4.lib $(LIBS) +!IF "$(INCLUDE_BUFFEROVERFLOWU)" == "1" +!IF "$(CPU)" != "I386" +LIBS = $(LIBS) bufferoverflowu.lib +!ENDIF +!ENDIF + +!IF DEFINED(EXTRA_LIBS) +LIBS = $(LIBS) $(EXTRA_LIBS) +!ENDIF + +COMMON_LFLAGS = /NOLOGO + +# Always add debugging to the linker +OPT_LFLAGS = /INCREMENTAL:NO /DEBUG +!IF "$(BUILD)" == "RELEASE" +OPT_LFLAGS = /OPT:REF +!ENDIF + +!IF "$(TARGET)" == "EXE" +LFLAGS = $(COMMON_LFLAGS) /SUBSYSTEM:CONSOLE /MACHINE:$(CPU) +!ELSEIF "$(TARGET)" == "GUI" +LFLAGS = $(COMMON_LFLAGS) /SUBSYSTEM:WINDOWS /MACHINE:$(CPU) +!ELSEIF "$(TARGET)" == "DLL" +LFLAGS = $(COMMON_LFLAGS) /DLL /SUBSYSTEM:WINDOWS /MACHINE:$(CPU) +!ELSEIF "$(TARGET)" == "LIB" +LFLAGS = -lib $(COMMON_LFLAGS) +!ENDIF + +!IF DEFINED(EXTRA_LFLAGS) +LFLAGS = $(LFLAGS) $(EXTRA_LFLAGS) +!ENDIF + +!IF "$(TARGET)" != "LIB" +LFLAGS = $(LFLAGS) $(OPT_LFLAGS) +!ENDIF + +# Resource compiler flags + +BASE_RCFLAGS=/l 0x409 +!IF "$(BUILD)" == "RELEASE" +BASE_RCFLAGS = $(BASE_RCFLAGS) /d "NDEBUG" +!ELSE +BASE_RCFLAGS = $(BASE_RCFLAGS) /d "_DEBUG" /d "DEBUG" +!ENDIF +RCFLAGS = $(BASE_RCFLAGS) $(RCFLAGS) + +# Build Target dir e.g. WINNT_I386_RELEASE_DLL +!IF !DEFINED(WORKDIR) || "$(WORKDIR)" == "" +!IF !DEFINED(WORKDIR_EXT) || "$(WORKDIR_EXT)" == "" +WORKDIR = $(WINVER)_$(CPU)_$(TARGET)_$(BUILD) +WORKDIR_DLL = $(WINVER)_$(CPU)_DLL_$(BUILD) +WORKDIR_LIB = $(WINVER)_$(CPU)_LIB_$(BUILD) +WORKDIR_EXE = $(WINVER)_$(CPU)_EXE_$(BUILD) +!ELSE +WORKDIR = $(WINVER)_$(CPU)_$(BUILDIR_EXT)_$(BUILD) +!ENDIF +!ENDIF + +!IF "$(OS)" == "Windows_NT" +CLEANTARGET=if exist "$(WORKDIR)\$(NULL)" rd /s /q $(WORKDIR) +!ELSE +CLEANTARGET=deltree /y $(BUILDIR) +!ENDIF + +MAKEWORKDIR=if not exist "$(WORKDIR)\$(NULL)" mkdir $(WORKDIR) +MAKEINSTALL=if not exist "$(INSTALLLOC)" mkdir $(INSTALLLOC) + +!IF DEFINED(JAVA_HOME) && "$(JAVA_HOME)" != "" +JAVA_INCLUDES=-I "$(JAVA_HOME)\include" +!IF "$(CPU)" != "I386" +JAVA_INCLUDES=$(JAVA_INCLUDES) -I "$(JAVA_HOME)\include\win64" +!ENDIF +JAVA_INCLUDES=$(JAVA_INCLUDES) -I "$(JAVA_HOME)\include\win32" +!ENDIF + +!IF !DEFINED(ML) || "$(ML)" == "" +!IF "$(CPU)" == "I386" +ML = ml.exe +AFLAGS = /coff /Zi /c +!ELSEIF "$(CPU)" == "AMD64" +ML = ml64.exe +AFLAGS = /Zi /c +!ELSEIF "$(CPU)" == "IA64" +ML = ml64.exe +AFLAGS = /coff /Zi /c +!ENDIF +!ENDIF Property changes on: trunk/httpd/NMAKEcommon.inc ___________________________________________________________________ Name: svn:eol-style + native Added: trunk/httpd/NMAKEhttpd =================================================================== --- trunk/httpd/NMAKEhttpd (rev 0) +++ trunk/httpd/NMAKEhttpd 2007-12-13 17:05:23 UTC (rev 1205) @@ -0,0 +1,117 @@ +# Copyright 2001-2007 The Apache Software Foundation or its licensors, as +# applicable. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +# ==================================================================== +# +# NMAKEmakefile Master HTTPD makefile. +# Usage: +# DEBUG=1 Build DEBUG version of HTTPD +# +# Originally contributed by Mladen Turk <mturk redhat.com> +# +# ==================================================================== +# + + +TARGET=EXE +PROJECT = httpd + +!IF !DEFINED(SRCDIR) || "$(SRCDIR)" == "" +SRCDIR = . +!ENDIF + +!include <NMAKEcommon.inc> + +LDIRS = /libpath:"$(SRCDIR)\srclib\apr\$(WORKDIR_DLL)" /libpath:"$(SRCDIR)\srclib\apr-iconv\$(WORKDIR_DLL)" /libpath:"$(SRCDIR)\srclib\apr-util\$(WORKDIR_DLL)" +LFLAGS = $(LFLAGS) user32.lib psapi.lib gdi32.lib shlwapi.lib wldap32.lib ole32.lib libapr-1.lib libapriconv-1.lib libaprutil-1.lib + +INCLUDES = -I$(SRCDIR)\include -I$(SRCDIR)\srclib\apr\include -I$(SRCDIR)\srclib\apr-util\include +PDBFLAGS = -Fo$(WORKDIR)\ -Fd$(WORKDIR)\$(PROJECT)-src +OBJECTS = \ + $(WORKDIR)\main.obj + +HEADERS = \ + $(SRCDIR)\include\os.h \ + $(SRCDIR)\include\mpm.h \ + $(SRCDIR)\include\mpm_default.h + +BUILDLIB = $(PREFIX)\lib + +BUILDBIN = $(WORKDIR)\$(PROJECT).exe +BUILDPDB = $(WORKDIR)\$(PROJECT).pdb +BUILDRES = $(WORKDIR)\$(PROJECT).res +BUILDMAN = $(BUILDBIN).manifest + +RCFLAGS = $(RCFLAGS) /d BIN_NAME="$(PROJECT).exe" /d LONG_NAME="Apache HTTP Server" /d ICON_FILE="apache.ico" + +BUILDAPR = $(SRCDIR)\srclib\apr\$(WORKDIR_DLL)\libapr-1.dll +BUILDAPI = $(SRCDIR)\srclib\apr-iconv\$(WORKDIR_DLL)\libapriconv-1.dll +BUILDAPU = $(SRCDIR)\srclib\apr-util\$(WORKDIR_DLL)\libaprutil-1.dll +BUILDPCRE = $(SRCDIR)\srclib\pcre\$(WORKDIR_LIB)\pcre.lib + + +all : $(WORKDIR) $(BUILDLIB) $(HEADERS) $(BUILDAPR) $(BUILDAPI) $(BUILDAPU) $(BUILDPCRE) $(BUILDBIN) + +$(BUILDLIB) : + @if not exist "$(BUILDLIB)\$(NULL)" mkdir "$(BUILDLIB)" + +$(WORKDIR) : + @$(MAKEWORKDIR) + +.SUFFIXES : .h + +$(BUILDAPR) : + cd $(SRCDIR)\srclib\apr + $(MAKE) -f NMAKEmakefile + cd ..\.. + +$(BUILDAPU) : + cd $(SRCDIR)\srclib\apr-util + $(MAKE) -f NMAKEmakefile + cd ..\.. + +$(BUILDAPI) : + cd $(SRCDIR)\srclib\apr-iconv + $(MAKE) -f NMAKEmakefile + cd ..\.. + +$(BUILDPCRE) : + cd $(SRCDIR)\srclib\pcre + $(MAKE) -f NMAKEmakefile PCRE_STATIC=1 + cd ..\.. + +{$(SRCDIR)\server}.c{$(WORKDIR)}.obj: + $(CC) $(CFLAGS) $(INCLUDES) $(PDBFLAGS) $< + +$(SRCDIR)\include\os.h: + @copy /Y $(SRCDIR)\os\win32\os.h $@ >NUL + +$(SRCDIR)\include\mpm.h: + @copy /Y $(SRCDIR)\server\mpm\winnt\mpm.h $@ >NUL + +$(SRCDIR)\include\mpm_default.h: + @copy /Y $(SRCDIR)\server\mpm\winnt\mpm_default.h $@ >NUL + +$(BUILDRES): build\win32\httpd.rc + $(RC) $(RCFLAGS) /i "$(SRCDIR)\build\win32" /i "$(SRCDIR)\include" /i "$(SRCDIR)\srclib\apr\include" /fo $(BUILDRES) build\win32\httpd.rc +$(BUILDBIN): $(WORKDIR) $(HEADERS) $(BUILDAPR) $(BUILDAPI) $(BUILDAPU) $(BUILDPCRE) $(OBJECTS) $(BUILDRES) + $(LINK) $(LFLAGS) $(OBJECTS) $(BUILDRES) $(LIBS) $(LDIRS) /pdb:$(BUILDPDB) /out:$(BUILDBIN) + IF EXIST $(BUILDMAN) \ + mt -nologo -manifest $(BUILDMAN) -outputresource:$(BUILDBIN);2 +clean: + @$(CLEANTARGET) + +install: $(BUILDLIB) $(WORKDIR) $(BUILDBIN) + @xcopy "$(WORKDIR)\*.exe" "$(BUILDLIB)" /Y /Q 2>NUL Property changes on: trunk/httpd/NMAKEhttpd ___________________________________________________________________ Name: svn:eol-style + native Added: trunk/httpd/NMAKEmakefile =================================================================== --- trunk/httpd/NMAKEmakefile (rev 0) +++ trunk/httpd/NMAKEmakefile 2007-12-13 17:05:23 UTC (rev 1205) @@ -0,0 +1,116 @@ +# Copyright 2001-2007 The Apache Software Foundation or its licensors, as +# applicable. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +# ==================================================================== +# +# NMAKEmakefile Master HTTPD makefile. +# Usage: +# DEBUG=1 Build DEBUG version of HTTPD +# +# Originally contributed by Mladen Turk <mturk redhat.com> +# +# ==================================================================== +# + + +TARGET=DLL +PROJECT = libhttpd + +!IF !DEFINED(SRCDIR) || "$(SRCDIR)" == "" +SRCDIR = . +!ENDIF + +!include <NMAKEcommon.inc> + +LDIRS = /libpath:"$(SRCDIR)\srclib\apr\$(WORKDIR)" /libpath:"$(SRCDIR)\srclib\apr-iconv\$(WORKDIR)" /libpath:"$(SRCDIR)\srclib\apr-util\$(WORKDIR)" +LFLAGS = $(LFLAGS) user32.lib psapi.lib gdi32.lib shlwapi.lib wldap32.lib ole32.lib libapr-1.lib libapriconv-1.lib libaprutil-1.lib + +INCLUDES = -I$(SRCDIR)\include -I$(SRCDIR)\srclib\apr\include -I$(SRCDIR)\srclib\apr-util\include +PDBFLAGS = -Fo$(WORKDIR)\ -Fd$(WORKDIR)\$(PROJECT)-src +OBJECTS = \ + $(WORKDIR)\main.obj + +HEADERS = \ + $(SRCDIR)\include\os.h \ + $(SRCDIR)\include\mpm.h \ + $(SRCDIR)\include\mpm_default.h + +BUILDLIB = $(PREFIX)\lib + +BUILDBIN = $(WORKDIR)\$(PROJECT).dll +BUILDPDB = $(WORKDIR)\$(PROJECT).pdb +BUILDRES = $(WORKDIR)\$(PROJECT).res +BUILDMAN = $(BUILDBIN).manifest + +RCFLAGS = $(RCFLAGS) /d BIN_NAME="$(PROJECT).dll" /d LONG_NAME="Apache HTTP Server Core" + +BUILDAPR = $(SRCDIR)\srclib\apr\$(WORKDIR)\libapr-1.dll +BUILDAPI = $(SRCDIR)\srclib\apr-iconv\$(WORKDIR)\libapriconv-1.dll +BUILDAPU = $(SRCDIR)\srclib\apr-util\$(WORKDIR)\libaprutil-1.dll +BUILDPCRE = $(SRCDIR)\srclib\pcre\$(WORKDIR_LIB)\pcre.lib + +all : $(WORKDIR) $(BUILDLIB) $(HEADERS) $(BUILDAPR) $(BUILDAPI) $(BUILDAPU) $(BUILDPCRE) $(BUILDBIN) + +$(BUILDLIB) : + @if not exist "$(BUILDLIB)\$(NULL)" mkdir "$(BUILDLIB)" + +$(WORKDIR) : + @$(MAKEWORKDIR) + +.SUFFIXES : .h + +$(BUILDAPR) : + cd $(SRCDIR)\srclib\apr + $(MAKE) -f NMAKEmakefile + cd ..\.. + +$(BUILDAPU) : + cd $(SRCDIR)\srclib\apr-util + $(MAKE) -f NMAKEmakefile + cd ..\.. + +$(BUILDAPI) : + cd $(SRCDIR)\srclib\apr-iconv + $(MAKE) -f NMAKEmakefile + cd ..\.. + +$(BUILDPCRE) : + cd $(SRCDIR)\srclib\pcre + $(MAKE) -f NMAKEmakefile PCRE_STATIC=1 + cd ..\.. + +{$(SRCDIR)\server}.c{$(WORKDIR)}.obj: + $(CC) $(CFLAGS) $(INCLUDES) $(PDBFLAGS) $< + +$(SRCDIR)\include\os.h: + @copy /Y $(SRCDIR)\os\win32\os.h $@ >NUL + +$(SRCDIR)\include\mpm.h: + @copy /Y $(SRCDIR)\server\mpm\winnt\mpm.h $@ >NUL + +$(SRCDIR)\include\mpm_default.h: + @copy /Y $(SRCDIR)\server\mpm\winnt\mpm_default.h $@ >NUL + +$(BUILDRES): build\win32\httpd.rc + $(RC) $(RCFLAGS) /i "$(SRCDIR)\build\win32" /i "$(SRCDIR)\include" /i "$(SRCDIR)\srclib\apr\include" /fo $(BUILDRES) build\win32\httpd.rc +$(BUILDBIN): $(WORKDIR) $(HEADERS) $(BUILDAPR) $(BUILDAPI) $(BUILDAPU) $(BUILDPCRE) $(OBJECTS) $(BUILDRES) + $(LINK) $(LFLAGS) $(OBJECTS) $(BUILDRES) $(LIBS) $(LDIRS) /pdb:$(BUILDPDB) /out:$(BUILDBIN) + IF EXIST $(BUILDMAN) \ + mt -nologo -manifest $(BUILDMAN) -outputresource:$(BUILDBIN);2 +clean: + @$(CLEANTARGET) + +install: $(BUILDLIB) $(WORKDIR) $(BUILDBIN) + @xcopy "$(WORKDIR)\*.dll" "$(BUILDLIB)" /Y /Q 2>NUL Property changes on: trunk/httpd/NMAKEmakefile ___________________________________________________________________ Name: svn:eol-style + native Added: trunk/httpd/srclib/apr/NMAKEmakefile =================================================================== --- trunk/httpd/srclib/apr/NMAKEmakefile (rev 0) +++ trunk/httpd/srclib/apr/NMAKEmakefile 2007-12-13 17:05:23 UTC (rev 1205) @@ -0,0 +1,228 @@ +# Copyright 2001-2007 The Apache Software Foundation or its licensors, as +# applicable. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +# ==================================================================== +# +# NMAKEmakefile Master APR makefile. +# Usage: +# DLL=1 Build DLL version +# DEBUG=1 Build DEBUG version of APR +# +# Originally contributed by Mladen Turk <mturk redhat.com> +# +# ==================================================================== +# + +!IF !DEFINED(APR_DECLARE_STATIC) || "$(APR_DECLARE_STATIC)" == "" +TARGET=DLL +CFLAGS = -DAPR_DECLARE_EXPORT $(CFLAGS) +PROJECT = libapr-1 +!ELSE +TARGET=LIB +CFLAGS = -DAPR_DECLARE_STATIC $(CFLAGS) +PROJECT = apr-1 +!ENDIF + +!IF !DEFINED(SRCDIR) || "$(SRCDIR)" == "" +SRCDIR = . +!ENDIF + +!include <..\..\NMAKEcommon.inc> + +INCLUDES = -I$(SRCDIR)\include -I$(SRCDIR)\include\arch -I$(SRCDIR)\include\arch\win32 -I$(SRCDIR)\include\arch\unix +PDBFLAGS = -Fo$(WORKDIR)\ -Fd$(WORKDIR)\$(PROJECT)-src +OBJECTS = \ + $(WORKDIR)\apr_atomic.obj \ + $(WORKDIR)\dso.obj \ + $(WORKDIR)\copy.obj \ + $(WORKDIR)\dir.obj \ + $(WORKDIR)\fileacc.obj \ + $(WORKDIR)\filedup.obj \ + $(WORKDIR)\filepath.obj \ + $(WORKDIR)\filepath_util.obj \ + $(WORKDIR)\filestat.obj \ + $(WORKDIR)\filesys.obj \ + $(WORKDIR)\flock.obj \ + $(WORKDIR)\fullrw.obj \ + $(WORKDIR)\mktemp.obj \ + $(WORKDIR)\open.obj \ + $(WORKDIR)\pipe.obj \ + $(WORKDIR)\readwrite.obj \ + $(WORKDIR)\seek.obj \ + $(WORKDIR)\tempdir.obj \ + $(WORKDIR)\proc_mutex.obj \ + $(WORKDIR)\thread_cond.obj \ + $(WORKDIR)\thread_mutex.obj \ + $(WORKDIR)\thread_rwlock.obj \ + $(WORKDIR)\apr_pools.obj \ + $(WORKDIR)\charset.obj \ + $(WORKDIR)\env.obj \ + $(WORKDIR)\errorcodes.obj \ + $(WORKDIR)\getopt.obj \ + $(WORKDIR)\internal.obj \ + $(WORKDIR)\misc.obj \ + $(WORKDIR)\otherchild.obj \ + $(WORKDIR)\rand.obj \ + $(WORKDIR)\start.obj \ + $(WORKDIR)\utf8.obj \ + $(WORKDIR)\version.obj \ + $(WORKDIR)\common.obj \ + $(WORKDIR)\mmap.obj \ + $(WORKDIR)\inet_ntop.obj \ + $(WORKDIR)\inet_pton.obj \ + $(WORKDIR)\select.obj \ + $(WORKDIR)\multicast.obj \ + $(WORKDIR)\sendrecv.obj \ + $(WORKDIR)\sockaddr.obj \ + $(WORKDIR)\sockets.obj \ + $(WORKDIR)\sockopt.obj \ + $(WORKDIR)\apr_getpass.obj \ + $(WORKDIR)\apr_random.obj \ + $(WORKDIR)\sha2.obj \ + $(WORKDIR)\sha2_glue.obj \ + $(WORKDIR)\shm.obj \ + $(WORKDIR)\apr_cpystrn.obj \ + $(WORKDIR)\apr_fnmatch.obj \ + $(WORKDIR)\apr_snprintf.obj \ + $(WORKDIR)\apr_strings.obj \ + $(WORKDIR)\apr_strnatcmp.obj \ + $(WORKDIR)\apr_strtok.obj \ + $(WORKDIR)\apr_hash.obj \ + $(WORKDIR)\apr_tables.obj \ + $(WORKDIR)\proc.obj \ + $(WORKDIR)\signals.obj \ + $(WORKDIR)\thread.obj \ + $(WORKDIR)\threadpriv.obj \ + $(WORKDIR)\access.obj \ + $(WORKDIR)\time.obj \ + $(WORKDIR)\timestr.obj \ + $(WORKDIR)\groupinfo.obj \ + $(WORKDIR)\userinfo.obj + +HEADERS = $(SRCDIR)\include\apr.h + +BUILDINC = $(PREFIX)\include +BUILDLIB = $(PREFIX)\lib +!IF "$(TARGET)" == "DLL" +BUILDBIN = $(WORKDIR)\$(PROJECT).dll +BUILDPDB = $(WORKDIR)\$(PROJECT).pdb +BUILDRES = $(WORKDIR)\$(PROJECT).res +BUILDMAN = $(BUILDBIN).manifest +!ELSE +BUILDBIN = $(WORKDIR)\$(PROJECT).lib +!ENDIF + +all : $(BUILDINC) $(BUILDLIB) $(WORKDIR) $(HEADERS) $(BUILDBIN) + +$(BUILDINC) : + @if not exist "$(BUILDINC)\arch\win32\$(NULL)" mkdir "$(BUILDINC)\arch\win32" + +$(BUILDLIB) : + @if not exist "$(BUILDLIB)\$(NULL)" mkdir "$(BUILDLIB)" + +$(WORKDIR) : + @$(MAKEWORKDIR) + +.SUFFIXES : .hw + +{$(SRCDIR)\include}.hw{$(SRCDIR)\include}.h: + @copy /Y $< $@ >NUL + +{$(SRCDIR)\atomic\win32}.c{$(WORKDIR)}.obj: + $(CC) $(CFLAGS) $(INCLUDES) $(PDBFLAGS) $< + +{$(SRCDIR)\dso\win32}.c{$(WORKDIR)}.obj: + $(CC) $(CFLAGS) $(INCLUDES) $(PDBFLAGS) $< + +{$(SRCDIR)\file_io\unix}.c{$(WORKDIR)}.obj: + $(CC) $(CFLAGS) $(INCLUDES) $(PDBFLAGS) $< + +{$(SRCDIR)\file_io\win32}.c{$(WORKDIR)}.obj: + $(CC) $(CFLAGS) $(INCLUDES) $(PDBFLAGS) $< + +{$(SRCDIR)\locks\win32}.c{$(WORKDIR)}.obj: + $(CC) $(CFLAGS) $(INCLUDES) $(PDBFLAGS) $< + +{$(SRCDIR)\memory\unix}.c{$(WORKDIR)}.obj: + $(CC) $(CFLAGS) $(INCLUDES) $(PDBFLAGS) $< + +{$(SRCDIR)\misc\unix}.c{$(WORKDIR)}.obj: + $(CC) $(CFLAGS) $(INCLUDES) $(PDBFLAGS) $< + +{$(SRCDIR)\misc\win32}.c{$(WORKDIR)}.obj: + $(CC) $(CFLAGS) $(INCLUDES) $(PDBFLAGS) $< + +{$(SRCDIR)\mmap\unix}.c{$(WORKDIR)}.obj: + $(CC) $(CFLAGS) $(INCLUDES) $(PDBFLAGS) $< + +{$(SRCDIR)\mmap\win32}.c{$(WORKDIR)}.obj: + $(CC) $(CFLAGS) $(INCLUDES) $(PDBFLAGS) $< + +{$(SRCDIR)\network_io\unix}.c{$(WORKDIR)}.obj: + $(CC) $(CFLAGS) $(INCLUDES) $(PDBFLAGS) $< + +{$(SRCDIR)\network_io\win32}.c{$(WORKDIR)}.obj: + $(CC) $(CFLAGS) $(INCLUDES) $(PDBFLAGS) $< + +{$(SRCDIR)\passwd}.c{$(WORKDIR)}.obj: + $(CC) $(CFLAGS) $(INCLUDES) $(PDBFLAGS) $< + +{$(SRCDIR)\poll\unix}.c{$(WORKDIR)}.obj: + $(CC) $(CFLAGS) $(INCLUDES) $(PDBFLAGS) $< + +{$(SRCDIR)\random\unix}.c{$(WORKDIR)}.obj: + $(CC) $(CFLAGS) $(INCLUDES) $(PDBFLAGS) $< + +{$(SRCDIR)\shmem\win32}.c{$(WORKDIR)}.obj: + $(CC) $(CFLAGS) $(INCLUDES) $(PDBFLAGS) $< + +{$(SRCDIR)\strings}.c{$(WORKDIR)}.obj: + $(CC) $(CFLAGS) $(INCLUDES) $(PDBFLAGS) $< + +{$(SRCDIR)\tables}.c{$(WORKDIR)}.obj: + $(CC) $(CFLAGS) $(INCLUDES) $(PDBFLAGS) $< + +{$(SRCDIR)\threadproc\win32}.c{$(WORKDIR)}.obj: + $(CC) $(CFLAGS) $(INCLUDES) $(PDBFLAGS) $< + +{$(SRCDIR)\time\win32}.c{$(WORKDIR)}.obj: + $(CC) $(CFLAGS) $(INCLUDES) $(PDBFLAGS) $< + +{$(SRCDIR)\user\win32}.c{$(WORKDIR)}.obj: + $(CC) $(CFLAGS) $(INCLUDES) $(PDBFLAGS) $< + +$(OBJECTS): $(SRCDIR)\include\*.h $(SRCDIR)\include\arch\*.h $(SRCDIR)\include\arch\win32\*.h $(SRCDIR)\include\arch\unix\*.h + +!IF "$(TARGET)" == "DLL" +$(BUILDRES): libapr.rc $(HEADERS) $(SRCDIR)\include\*.h + $(RC) $(RCFLAGS) /i "$(SRCDIR)\include" /d "APR_VERSION_ONLY" /fo $(BUILDRES) libapr.rc +$(BUILDBIN): $(WORKDIR) $(HEADERS) $(OBJECTS) $(BUILDRES) + $(LINK) $(LFLAGS) $(OBJECTS) $(BUILDRES) $(LIBS) /pdb:$(BUILDPDB) /out:$(BUILDBIN) + IF EXIST $(BUILDMAN) \ + mt -nologo -manifest $(BUILDMAN) -outputresource:$(BUILDBIN);2 +!ELSE +$(BUILDBIN): $(WORKDIR) $(OBJECTS) + $(LINK) $(LFLAGS) $(OBJECTS) /out:$(BUILDBIN) +!ENDIF + +clean: + @$(CLEANTARGET) + +install: $(BUILDINC) $(BUILDLIB) $(WORKDIR) $(HEADERS) $(BUILDBIN) + @xcopy "$(SRCDIR)\include\*.h" "$(BUILDINC)" /Y /Q + @xcopy "$(SRCDIR)\include\arch\apr_private_common.h" "$(BUILDINC)\arch" /Y /Q + @xcopy "$(SRCDIR)\include\arch\win32\*.h" "$(BUILDINC)\arch\win32" /Y /Q + @xcopy "$(WORKDIR)\*.lib" "$(BUILDLIB)" /Y /Q + @xcopy "$(WORKDIR)\*.dll" "$(BUILDLIB)" /Y /Q 2>NUL Property changes on: trunk/httpd/srclib/apr/NMAKEmakefile ___________________________________________________________________ Name: svn:eol-style + native Added: trunk/httpd/srclib/apr-iconv/NMAKEmakefile =================================================================== --- trunk/httpd/srclib/apr-iconv/NMAKEmakefile (rev 0) +++ trunk/httpd/srclib/apr-iconv/NMAKEmakefile 2007-12-13 17:05:23 UTC (rev 1205) @@ -0,0 +1,334 @@ +# Copyright 2001-2007 The Apache Software Foundation or its licensors, as +# applicable. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +# ==================================================================== +# +# NMAKEmakefile Master APR-ICONV makefile. +# Usage: +# DLL=1 Build DLL version +# DEBUG=1 Build DEBUG version of APR +# +# Originally contributed by Mladen Turk <mturk redhat.com> +# +# ==================================================================== +# + + +!IF !DEFINED(APR_DECLARE_STATIC) || "$(APR_DECLARE_STATIC)" == "" +TARGET=DLL +CFLAGS = -DAPR_DECLARE_EXPORT -DAPI_DECLARE_EXPORT -DAPI_MODULE_STATIC $(CFLAGS) +PROJECT = libapriconv-1 +APR_LIB = libapr-1.lib +!ELSE +CFLAGS = -DAPR_DECLARE_STATIC -DAPI_DECLARE_STATIC -DAPI_MODULE_STATIC $(CFLAGS) +PROJECT = apriconv-1 +APR_LIB = apr-1.lib +TARGET=LIB +!ENDIF + +!IF !DEFINED(SRCDIR) || "$(SRCDIR)" == "" +SRCDIR = . +!ENDIF + +!include <..\..\NMAKEcommon.inc> + +!IFNDEF WITH_APR +WITH_APR = ..\apr +!ENDIF + +LDIRS = /libpath:"$(WITH_APR)\$(WORKDIR)" + +LFLAGS = $(LFLAGS) $(APR_LIB) +!IF "$(TARGET)" == "DLL" +LFLAGS = $(LFLAGS) user32.lib psapi.lib gdi32.lib shlwapi.lib wldap32.lib ole32.lib +!ENDIF + +INCLUDES = -I$(SRCDIR)\include -I$(SRCDIR)\lib -I$(WITH_APR)\include +PDBFLAGS = -Fo$(WORKDIR)\ -Fd$(WORKDIR)\$(PROJECT)-src +OBJECTS = \ + $(WORKDIR)\adobe-stdenc.obj \ + $(WORKDIR)\adobe-symbol.obj \ + $(WORKDIR)\adobe-zdingbats.obj \ + $(WORKDIR)\big5.obj \ + $(WORKDIR)\cns11643-plane1.obj \ + $(WORKDIR)\cns11643-plane14.obj \ + $(WORKDIR)\cns11643-plane2.obj \ + $(WORKDIR)\cp037.obj \ + $(WORKDIR)\cp038.obj \ + $(WORKDIR)\cp10000.obj \ + $(WORKDIR)\cp10006.obj \ + $(WORKDIR)\cp10007.obj \ + $(WORKDIR)\cp10029.obj \ + $(WORKDIR)\cp1006.obj \ + $(WORKDIR)\cp10079.obj \ + $(WORKDIR)\cp10081.obj \ + $(WORKDIR)\cp1026.obj \ + $(WORKDIR)\cp273.obj \ + $(WORKDIR)\cp274.obj \ + $(WORKDIR)\cp275.obj \ + $(WORKDIR)\cp277.obj \ + $(WORKDIR)\cp278.obj \ + $(WORKDIR)\cp280.obj \ + $(WORKDIR)\cp281.obj \ + $(WORKDIR)\cp284.obj \ + $(WORKDIR)\cp285.obj \ + $(WORKDIR)\cp290.obj \ + $(WORKDIR)\cp297.obj \ + $(WORKDIR)\cp420.obj \ + $(WORKDIR)\cp423.obj \ + $(WORKDIR)\cp424.obj \ + $(WORKDIR)\cp437.obj \ + $(WORKDIR)\cp500.obj \ + $(WORKDIR)\cp737.obj \ + $(WORKDIR)\cp775.obj \ + $(WORKDIR)\cp850.obj \ + $(WORKDIR)\cp851.obj \ + $(WORKDIR)\cp852.obj \ + $(WORKDIR)\cp855.obj \ + $(WORKDIR)\cp856.obj \ + $(WORKDIR)\cp857.obj \ + $(WORKDIR)\cp860.obj \ + $(WORKDIR)\cp861.obj \ + $(WORKDIR)\cp862.obj \ + $(WORKDIR)\cp863.obj \ + $(WORKDIR)\cp864.obj \ + $(WORKDIR)\cp865.obj \ + $(WORKDIR)\cp866.obj \ + $(WORKDIR)\cp868.obj \ + $(WORKDIR)\cp869.obj \ + $(WORKDIR)\cp870.obj \ + $(WORKDIR)\cp871.obj \ + $(WORKDIR)\cp874.obj \ + $(WORKDIR)\cp875.obj \ + $(WORKDIR)\cp880.obj \ + $(WORKDIR)\cp891.obj \ + $(WORKDIR)\cp903.obj \ + $(WORKDIR)\cp904.obj \ + $(WORKDIR)\cp905.obj \ + $(WORKDIR)\cp918.obj \ + $(WORKDIR)\cp932.obj \ + $(WORKDIR)\cp936.obj \ + $(WORKDIR)\cp949.obj \ + $(WORKDIR)\cp950.obj \ + $(WORKDIR)\dec-mcs.obj \ + $(WORKDIR)\ebcdic-at-de-a.obj \ + $(WORKDIR)\ebcdic-at-de.obj \ + $(WORKDIR)\ebcdic-ca-fr.obj \ + $(WORKDIR)\ebcdic-dk-no-a.obj \ + $(WORKDIR)\ebcdic-dk-no.obj \ + $(WORKDIR)\ebcdic-es-a.obj \ + $(WORKDIR)\ebcdic-es-s.obj \ + $(WORKDIR)\ebcdic-es.obj \ + $(WORKDIR)\ebcdic-fi-se-a.obj \ + $(WORKDIR)\ebcdic-fi-se.obj \ + $(WORKDIR)\ebcdic-fr.obj \ + $(WORKDIR)\ebcdic-it.obj \ + $(WORKDIR)\ebcdic-pt.obj \ + $(WORKDIR)\ebcdic-uk.obj \ + $(WORKDIR)\ebcdic-us.obj \ + $(WORKDIR)\gb12345.obj \ + $(WORKDIR)\gb_2312-80.obj \ + $(WORKDIR)\hp-roman8.obj \ + $(WORKDIR)\iso-8859-1.obj \ + $(WORKDIR)\iso-8859-10.obj \ + $(WORKDIR)\iso-8859-13.obj \ + $(WORKDIR)\iso-8859-14.obj \ + $(WORKDIR)\iso-8859-15.obj \ + $(WORKDIR)\iso-8859-2.obj \ + $(WORKDIR)\iso-8859-3.obj \ + $(WORKDIR)\iso-8859-4.obj \ + $(WORKDIR)\iso-8859-5.obj \ + $(WORKDIR)\iso-8859-6.obj \ + $(WORKDIR)\iso-8859-7.obj \ + $(WORKDIR)\iso-8859-8.obj \ + $(WORKDIR)\iso-8859-9.obj \ + $(WORKDIR)\iso-ir-10.obj \ + $(WORKDIR)\iso-ir-102.obj \ + $(WORKDIR)\iso-ir-103.obj \ + $(WORKDIR)\iso-ir-11.obj \ + $(WORKDIR)\iso-ir-111.obj \ + $(WORKDIR)\iso-ir-121.obj \ + $(WORKDIR)\iso-ir-122.obj \ + $(WORKDIR)\iso-ir-123.obj \ + $(WORKDIR)\iso-ir-128.obj \ + $(WORKDIR)\iso-ir-13.obj \ + $(WORKDIR)\iso-ir-139.obj \ + $(WORKDIR)\iso-ir-14.obj \ + $(WORKDIR)\iso-ir-141.obj \ + $(WORKDIR)\iso-ir-142.obj \ + $(WORKDIR)\iso-ir-143.obj \ + $(WORKDIR)\iso-ir-146.obj \ + $(WORKDIR)\iso-ir-147.obj \ + $(WORKDIR)\iso-ir-15.obj \ + $(WORKDIR)\iso-ir-150.obj \ + $(WORKDIR)\iso-ir-151.obj \ + $(WORKDIR)\iso-ir-152.obj \ + $(WORKDIR)\iso-ir-153.obj \ + $(WORKDIR)\iso-ir-154.obj \ + $(WORKDIR)\iso-ir-155.obj \ + $(WORKDIR)\iso-ir-158.obj \ + $(WORKDIR)\iso-ir-16.obj \ + $(WORKDIR)\iso-ir-17.obj \ + $(WORKDIR)\iso-ir-18.obj \ + $(WORKDIR)\iso-ir-19.obj \ + $(WORKDIR)\iso-ir-2.obj \ + $(WORKDIR)\iso-ir-21.obj \ + $(WORKDIR)\iso-ir-25.obj \ + $(WORKDIR)\iso-ir-27.obj \ + $(WORKDIR)\iso-ir-37.obj \ + $(WORKDIR)\iso-ir-4.obj \ + $(WORKDIR)\iso-ir-47.obj \ + $(WORKDIR)\iso-ir-49.obj \ + $(WORKDIR)\iso-ir-50.obj \ + $(WORKDIR)\iso-ir-51.obj \ + $(WORKDIR)\iso-ir-54.obj \ + $(WORKDIR)\iso-ir-55.obj \ + $(WORKDIR)\iso-ir-57.obj \ + $(WORKDIR)\iso-ir-60.obj \ + $(WORKDIR)\iso-ir-61.obj \ + $(WORKDIR)\iso-ir-69.obj \ + $(WORKDIR)\iso-ir-70.obj \ + $(WORKDIR)\iso-ir-8-1.obj \ + $(WORKDIR)\iso-ir-8-2.obj \ + $(WORKDIR)\iso-ir-84.obj \ + $(WORKDIR)\iso-ir-85.obj \ + $(WORKDIR)\iso-ir-86.obj \ + $(WORKDIR)\iso-ir-88.obj \ + $(WORKDIR)\iso-ir-89.obj \ + $(WORKDIR)\iso-ir-9-1.obj \ + $(WORKDIR)\iso-ir-9-2.obj \ + $(WORKDIR)\iso-ir-90.obj \ + $(WORKDIR)\iso-ir-91.obj \ + $(WORKDIR)\iso-ir-92.obj \ + $(WORKDIR)\iso-ir-93.obj \ + $(WORKDIR)\iso-ir-94.obj \ + $(WORKDIR)\iso-ir-95.obj \ + $(WORKDIR)\iso-ir-96.obj \ + $(WORKDIR)\iso-ir-98.obj \ + $(WORKDIR)\iso-ir-99.obj \ + $(WORKDIR)\iso646-dk.obj \ + $(WORKDIR)\iso646-kr.obj \ + $(WORKDIR)\jis_x0201.obj \ + $(WORKDIR)\jis_x0208-1983.obj \ + $(WORKDIR)\jis_x0212-1990.obj \ + $(WORKDIR)\johab.obj \ + $(WORKDIR)\koi8-r.obj \ + $(WORKDIR)\koi8-ru.obj \ + $(WORKDIR)\koi8-u.obj \ + $(WORKDIR)\ksx1001.obj \ + $(WORKDIR)\mac-ce.obj \ + $(WORKDIR)\mac-croatian.obj \ + $(WORKDIR)\mac-cyrillic.obj \ + $(WORKDIR)\mac-dingbats.obj \ + $(WORKDIR)\mac-greek.obj \ + $(WORKDIR)\mac-iceland.obj \ + $(WORKDIR)\mac-japan.obj \ + $(WORKDIR)\mac-roman.obj \ + $(WORKDIR)\mac-romania.obj \ + $(WORKDIR)\mac-thai.obj \ + $(WORKDIR)\mac-turkish.obj \ + $(WORKDIR)\mac-ukraine.obj \ + $(WORKDIR)\macintosh.obj \ + $(WORKDIR)\osd_ebcdic_df04_1.obj \ + $(WORKDIR)\osd_ebcdic_df04_15.obj \ + $(WORKDIR)\shift_jis.obj \ + $(WORKDIR)\us-ascii.obj \ + $(WORKDIR)\windows-1250.obj \ + $(WORKDIR)\windows-1251.obj \ + $(WORKDIR)\windows-1252.obj \ + $(WORKDIR)\windows-1253.obj \ + $(WORKDIR)\windows-1254.obj \ + $(WORKDIR)\windows-1255.obj \ + $(WORKDIR)\windows-1256.obj \ + $(WORKDIR)\windows-1257.obj \ + $(WORKDIR)\windows-1258.obj \ + $(WORKDIR)\_tbl_simple.obj \ + $(WORKDIR)\euc-jp.obj \ + $(WORKDIR)\euc-kr.obj \ + $(WORKDIR)\euc-tw.obj \ + $(WORKDIR)\gb2312.obj \ + $(WORKDIR)\iso-10646-ucs-2.obj \ + $(WORKDIR)\iso-10646-ucs-4.obj \ + $(WORKDIR)\iso-2022-cn.obj \ + $(WORKDIR)\iso-2022-jp-2.obj \ + $(WORKDIR)\iso-2022-jp.obj \ + $(WORKDIR)\iso-2022-kr.obj \ + $(WORKDIR)\ucs2-internal.obj \ + $(WORKDIR)\ucs4-internal.obj \ + $(WORKDIR)\unicode-1-1-utf-7.obj \ + $(WORKDIR)\utf-16.obj \ + $(WORKDIR)\utf-8.obj \ + $(WORKDIR)\api_version.obj \ + $(WORKDIR)\iconv.obj \ + $(WORKDIR)\iconv_ccs.obj \ + $(WORKDIR)\iconv_ces.obj \ + $(WORKDIR)\iconv_ces_euc.obj \ + $(WORKDIR)\iconv_ces_iso2022.obj \ + $(WORKDIR)\iconv_int.obj \ + $(WORKDIR)\iconv_module.obj \ + $(WORKDIR)\iconv_uc.obj + + +BUILDLIB = $(PREFIX)\lib +BUILDINC = $(PREFIX)\include + +!IF "$(TARGET)" == "DLL" +BUILDBIN = $(WORKDIR)\$(PROJECT).dll +BUILDPDB = $(WORKDIR)\$(PROJECT).pdb +BUILDRES = $(WORKDIR)\$(PROJECT).res +BUILDMAN = $(BUILDBIN).manifest +!ELSE +BUILDBIN = $(WORKDIR)\$(PROJECT).lib +!ENDIF + +all : $(BUILDLIB) $(WORKDIR) $(BUILDBIN) + +$(BUILDLIB) : + @if not exist "$(BUILDLIB)\$(NULL)" mkdir "$(BUILDLIB)" + +$(WORKDIR) : + @$(MAKEWORKDIR) + +{$(SRCDIR)\ccs}.c{$(WORKDIR)}.obj: + $(CC) $(CFLAGS) $(INCLUDES) $(PDBFLAGS) $< + +{$(SRCDIR)\ces}.c{$(WORKDIR)}.obj: + $(CC) $(CFLAGS) $(INCLUDES) $(PDBFLAGS) $< + +{$(SRCDIR)\lib}.c{$(WORKDIR)}.obj: + $(CC) $(CFLAGS) $(INCLUDES) $(PDBFLAGS) $< + + +$(OBJECTS): $(SRCDIR)\include\*.h + +!IF "$(TARGET)" == "DLL" +$(BUILDRES): libapriconv.rc + $(RC) $(RCFLAGS) /i "$(WITH_APR)\include" /i "$(SRCDIR)\include" /d "API_VERSION_ONLY" /fo $(BUILDRES) $(SRCDIR)\libapriconv.rc +$(BUILDBIN): $(WORKDIR) $(OBJECTS) $(BUILDRES) + $(LINK) $(LFLAGS) $(OBJECTS) $(BUILDRES) $(LIBS) $(LDIRS) /pdb:$(BUILDPDB) /out:$(BUILDBIN) + IF EXIST $(BUILDMAN) \ + mt -nologo -manifest $(BUILDMAN) -outputresource:$(BUILDBIN);2 +!ELSE +$(BUILDBIN): $(WORKDIR) $(OBJECTS) + $(LINK) $(LFLAGS) $(OBJECTS) $(LDIRS) /out:$(BUILDBIN) +!ENDIF + +clean: + @$(CLEANTARGET) + +install: $(BUILDLIB) $(WORKDIR) $(BUILDBIN) + @xcopy "$(SRCDIR)\include\*.h" "$(BUILDINC)" /Y /Q + @xcopy "$(WORKDIR)\*.lib" "$(BUILDLIB)" /Y /Q + @xcopy "$(WORKDIR)\*.dll" "$(BUILDLIB)" /Y /Q 2>NUL Property changes on: trunk/httpd/srclib/apr-iconv/NMAKEmakefile ___________________________________________________________________ Name: svn:eol-style + native Added: trunk/httpd/srclib/apr-util/NMAKEmakefile =================================================================== --- trunk/httpd/srclib/apr-util/NMAKEmakefile (rev 0) +++ trunk/httpd/srclib/apr-util/NMAKEmakefile 2007-12-13 17:05:23 UTC (rev 1205) @@ -0,0 +1,223 @@ +# Copyright 2001-2007 The Apache Software Foundation or its licensors, as +# applicable. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +# ==================================================================== +# +# NMAKEmakefile Master APR-UTIL makefile. +# Usage: +# DLL=1 Build DLL version +# DEBUG=1 Build DEBUG version of APR +# +# Originally contributed by Mladen Turk <mturk redhat.com> +# +# ==================================================================== +# + + +!IF !DEFINED(APR_DECLARE_STATIC) || "$(APR_DECLARE_STATIC)" == "" +TARGET=DLL +CFLAGS = -DAPR_DECLARE_EXPORT -DAPU_DECLARE_EXPORT -DAPI_DECLARE_EXPORT $(CFLAGS) +PROJECT = libaprutil-1 +APR_LIB = libapr-1.lib +API_LIB = libapriconv-1.lib +!ELSE +CFLAGS = -DAPR_DECLARE_STATIC -DAPU_DECLARE_STATIC -DAPI_DECLARE_STATIC $(CFLAGS) +PROJECT = aprutil-1 +APR_LIB = apr-1.lib +API_LIB = apriconv-1.lib +TARGET=LIB +!ENDIF + +CFLAGS = $(CFLAGS) -DAPU_USE_SDBM -DVERSION=\"expat_1.95.2\" + +!IF !DEFINED(SRCDIR) || "$(SRCDIR)" == "" +SRCDIR = . +!ENDIF + +!include <..\..\NMAKEcommon.inc> + +!IFNDEF WITH_APR +WITH_APR=..\apr +!ENDIF + +!IFNDEF WITH_API +WITH_API=..\apr-iconv +!ENDIF + +LDIRS = /libpath:"$(WITH_APR)\$(WORKDIR)" /libpath:"$(WITH_API)\$(WORKDIR)" + +LFLAGS = $(LFLAGS) $(APR_LIB) $(API_LIB) +!IF "$(TARGET)" == "DLL" +LFLAGS = $(LFLAGS) user32.lib psapi.lib gdi32.lib shlwapi.lib wldap32.lib ole32.lib +!ENDIF + +INCLUDES = -I$(SRCDIR)\include -I$(SRCDIR)\include\private -I$(SRCDIR)\xml\expat\lib -I$(WITH_APR)\include -I$(WITH_API)\include +PDBFLAGS = -Fo$(WORKDIR)\ -Fd$(WORKDIR)\$(PROJECT)-src +OBJECTS = \ + $(WORKDIR)\apr_brigade.obj \ + $(WORKDIR)\apr_buckets.obj \ + $(WORKDIR)\apr_buckets_alloc.obj \ + $(WORKDIR)\apr_buckets_eos.obj \ + $(WORKDIR)\apr_buckets_file.obj \ + $(WORKDIR)\apr_buckets_flush.obj \ + $(WORKDIR)\apr_buckets_heap.obj \ + $(WORKDIR)\apr_buckets_mmap.obj \ + $(WORKDIR)\apr_buckets_pipe.obj \ + $(WORKDIR)\apr_buckets_pool.obj \ + $(WORKDIR)\apr_buckets_refcount.obj \ + $(WORKDIR)\apr_buckets_simple.obj \ + $(WORKDIR)\apr_buckets_socket.obj \ + $(WORKDIR)\apr_md4.obj \ + $(WORKDIR)\apr_md5.obj \ + $(WORKDIR)\apr_sha1.obj \ + $(WORKDIR)\getuuid.obj \ + $(WORKDIR)\uuid.obj \ + $(WORKDIR)\apr_dbd.obj \ + $(WORKDIR)\apr_dbd_pgsql.obj \ + $(WORKDIR)\apr_dbd_sqlite2.obj \ + $(WORKDIR)\apr_dbd_sqlite3.obj \ + $(WORKDIR)\apr_dbm.obj \ + $(WORKDIR)\apr_dbm_berkeleydb.obj \ + $(WORKDIR)\apr_dbm_gdbm.obj \ + $(WORKDIR)\apr_dbm_sdbm.obj \ + $(WORKDIR)\sdbm.obj \ + $(WORKDIR)\sdbm_hash.obj \ + $(WORKDIR)\sdbm_lock.obj \ + $(WORKDIR)\sdbm_pair.obj \ + $(WORKDIR)\apr_base64.obj \ + $(WORKDIR)\apr_hooks.obj \ + $(WORKDIR)\apr_ldap_init.obj \ + $(WORKDIR)\apr_ldap_url.obj \ + $(WORKDIR)\apr_ldap_option.obj \ + $(WORKDIR)\apr_date.obj \ + $(WORKDIR)\apr_queue.obj \ + $(WORKDIR)\apr_reslist.obj \ + $(WORKDIR)\apr_rmm.obj \ + $(WORKDIR)\apu_version.obj \ + $(WORKDIR)\apr_strmatch.obj \ + $(WORKDIR)\apr_uri.obj \ + $(WORKDIR)\xlate.obj \ + $(WORKDIR)\apr_xml.obj \ + $(WORKDIR)\xmlparse.obj \ + $(WORKDIR)\xmlrole.obj \ + $(WORKDIR)\xmltok.obj + +HEADERS = \ + $(SRCDIR)\include\apu.h \ + $(SRCDIR)\include\apu_want.h \ + $(SRCDIR)\include\apr_ldap.h \ + $(SRCDIR)\include\private\apu_config.h \ + $(SRCDIR)\include\private\apu_select_dbm.h \ + $(SRCDIR)\xml\expat\lib\config.h \ + $(SRCDIR)\xml\expat\lib\expat.h + + +BUILDLIB = $(PREFIX)\lib +BUILDINC = $(PREFIX)\include + +!IF "$(TARGET)" == "DLL" +BUILDBIN = $(WORKDIR)\$(PROJECT).dll +BUILDPDB = $(WORKDIR)\$(PROJECT).pdb +BUILDRES = $(WORKDIR)\$(PROJECT).res +BUILDMAN = $(BUILDBIN).manifest +!ELSE +BUILDBIN = $(WORKDIR)\$(PROJECT).lib +!ENDIF + +all : $(BUILDLIB) $(WORKDIR) $(HEADERS) $(BUILDBIN) + +$(BUILDLIB) : + @if not exist "$(BUILDLIB)\$(NULL)" mkdir "$(BUILDLIB)" + +$(WORKDIR) : + @$(MAKEWORKDIR) + +.SUFFIXES : .hw .h.in + +{$(SRCDIR)\include}.hw{$(SRCDIR)\include}.h: + @copy /Y $< $@ >NUL + +{$(SRCDIR)\xml\expat\lib}.h.in{$(SRCDIR)\xml\expat\lib}.h: + @copy /Y $< $@ >NUL + +{$(SRCDIR)\include\private}.hw{$(SRCDIR)\include\private}.h: + @copy /Y $< $@ >NUL + +$(SRCDIR)\xml\expat\lib\config.h : + @copy /Y $(SRCDIR)\xml\expat\lib\winconfig.h $@ >NUL + +{$(SRCDIR)\buckets}.c{$(WORKDIR)}.obj: + $(CC) $(CFLAGS) $(INCLUDES) $(PDBFLAGS) $< + +{$(SRCDIR)\crypto}.c{$(WORKDIR)}.obj: + $(CC) $(CFLAGS) $(INCLUDES) $(PDBFLAGS) $< + +{$(SRCDIR)\dbd}.c{$(WORKDIR)}.obj: + $(CC) $(CFLAGS) $(INCLUDES) $(PDBFLAGS) $< + +{$(SRCDIR)\dbm}.c{$(WORKDIR)}.obj: + $(CC) $(CFLAGS) $(INCLUDES) $(PDBFLAGS) $< + +{$(SRCDIR)\dbm\sdbm}.c{$(WORKDIR)}.obj: + $(CC) $(CFLAGS) $(INCLUDES) $(PDBFLAGS) $< + +{$(SRCDIR)\encoding}.c{$(WORKDIR)}.obj: + $(CC) $(CFLAGS) $(INCLUDES) $(PDBFLAGS) $< + +{$(SRCDIR)\hooks}.c{$(WORKDIR)}.obj: + $(CC) $(CFLAGS) $(INCLUDES) $(PDBFLAGS) $< + +{$(SRCDIR)\ldap}.c{$(WORKDIR)}.obj: + $(CC) $(CFLAGS) $(INCLUDES) $(PDBFLAGS) $< + +{$(SRCDIR)\misc}.c{$(WORKDIR)}.obj: + $(CC) $(CFLAGS) $(INCLUDES) $(PDBFLAGS) $< + +{$(SRCDIR)\strmatch}.c{$(WORKDIR)}.obj: + $(CC) $(CFLAGS) $(INCLUDES) $(PDBFLAGS) $< + +{$(SRCDIR)\uri}.c{$(WORKDIR)}.obj: + $(CC) $(CFLAGS) $(INCLUDES) $(PDBFLAGS) $< + +{$(SRCDIR)\xlate}.c{$(WORKDIR)}.obj: + $(CC) $(CFLAGS) $(INCLUDES) $(PDBFLAGS) $< + +{$(SRCDIR)\xml}.c{$(WORKDIR)}.obj: + $(CC) $(CFLAGS) $(INCLUDES) $(PDBFLAGS) $< + +{$(SRCDIR)\xml\expat\lib}.c{$(WORKDIR)}.obj: + $(CC) $(CFLAGS) $(INCLUDES) $(PDBFLAGS) $< + +$(OBJECTS): $(SRCDIR)\include\*.h $(SRCDIR)\include\private\*.h + +!IF "$(TARGET)" == "DLL" +$(BUILDRES): libaprutil.rc $(HEADERS) + $(RC) $(RCFLAGS) /i "$(WITH_APR)\include" /i "$(SRCDIR)\include" /d "APU_VERSION_ONLY" /fo $(BUILDRES) libaprutil.rc +$(BUILDBIN): $(WORKDIR) $(HEADERS) $(OBJECTS) $(BUILDRES) + $(LINK) $(LFLAGS) $(OBJECTS) $(BUILDRES) $(LIBS) $(LDIRS) /pdb:$(BUILDPDB) /out:$(BUILDBIN) + IF EXIST $(BUILDMAN) \ + mt -nologo -manifest $(BUILDMAN) -outputresource:$(BUILDBIN);2 +!ELSE +$(BUILDBIN): $(WORKDIR) $(HEADERS) $(OBJECTS) + $(LINK) $(LFLAGS) $(OBJECTS) $(LDIRS) /out:$(BUILDBIN) +!ENDIF + +clean: + @$(CLEANTARGET) + +install: $(BUILDLIB) $(WORKDIR) $(BUILDBIN) + @xcopy "$(SRCDIR)\include\*.h" "$(BUILDINC)" /Y /Q + @xcopy "$(WORKDIR)\*.lib" "$(BUILDLIB)" /Y /Q + @xcopy "$(WORKDIR)\*.dll" "$(BUILDLIB)" /Y /Q 2>NUL Property changes on: trunk/httpd/srclib/apr-util/NMAKEmakefile ___________________________________________________________________ Name: svn:eol-style + native Added: trunk/httpd/srclib/pcre/NMAKEmakefile =================================================================== --- trunk/httpd/srclib/pcre/NMAKEmakefile (rev 0) +++ trunk/httpd/srclib/pcre/NMAKEmakefile 2007-12-13 17:05:23 UTC (rev 1205) @@ -0,0 +1,107 @@ +# Copyright 2001-2007 The Apache Software Foundation or its licensors, as +# applicable. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +# ==================================================================== +# +# NMAKEmakefile Master PCRRE makefile. +# Usage: +# DLL=1 Build DLL version +# DEBUG=1 Build DEBUG version of PCRE +# +# Originally contributed by Mladen Turk <mturk redhat.com> +# +# ==================================================================== +# + + +!IF !DEFINED(PCRE_STATIC) || "$(PCRE_STATIC)" == "" +TARGET=DLL +CFLAGS = -DPCRE_DEFINITION -DDLL_EXPORT $(CFLAGS) +PROJECT = libpcre +!ELSE +CFLAGS = -DPCRE_STATIC $(CFLAGS) +PROJECT = pcre +TARGET=LIB +!ENDIF + +!IF !DEFINED(SRCDIR) || "$(SRCDIR)" == "" +SRCDIR = . +!ENDIF + +!include <..\..\NMAKEcommon.inc> + +!IF "$(TARGET)" == "DLL" +LFLAGS = $(LFLAGS) user32.lib psapi.lib gdi32.lib shlwapi.lib wldap32.lib ole32.lib +!ENDIF + +INCLUDES = -I$(SRCDIR) +PDBFLAGS = -Fo$(WORKDIR)\ -Fd$(WORKDIR)\$(PROJECT)-src +OBJECTS = \ + $(WORKDIR)\get.obj \ + $(WORKDIR)\maketables.obj \ + $(WORKDIR)\pcre.obj \ + $(WORKDIR)\study.obj + +HEADERS = \ + $(SRCDIR)\pcre.h \ + $(SRCDIR)\config.h + + +BUILDLIB = $(PREFIX)\lib +BUILDINC = $(PREFIX)\include + +!IF "$(TARGET)" == "DLL" +BUILDBIN = $(WORKDIR)\$(PROJECT).dll +BUILDPDB = $(WORKDIR)\$(PROJECT).pdb +BUILDRES = $(WORKDIR)\$(PROJECT).res +BUILDMAN = $(BUILDBIN).manifest +!ELSE +BUILDBIN = $(WORKDIR)\$(PROJECT).lib +!ENDIF + +all : $(BUILDLIB) $(WORKDIR) $(HEADERS) $(BUILDBIN) + +$(BUILDLIB) : + @if not exist "$(BUILDLIB)\$(NULL)" mkdir "$(BUILDLIB)" + +$(WORKDIR) : + @$(MAKEWORKDIR) + +.SUFFIXES : .hw + +{$(SRCDIR)}.hw{$(SRCDIR)}.h: + @copy /Y $< $@ >NUL +{$(SRCDIR)}.c{$(WORKDIR)}.obj: + $(CC) $(CFLAGS) $(INCLUDES) $(PDBFLAGS) $< + +$(OBJECTS): $(SRCDIR)\*.h + +!IF "$(TARGET)" == "DLL" +$(BUILDBIN): $(WORKDIR) $(HEADERS) $(OBJECTS) + $(LINK) $(LFLAGS) $(OBJECTS) $(BUILDRES) $(LIBS) $(LDIRS) /pdb:$(BUILDPDB) /out:$(BUILDBIN) + IF EXIST $(BUILDMAN) \ + mt -nologo -manifest $(BUILDMAN) -outputresource:$(BUILDBIN);2 +!ELSE +$(BUILDBIN): $(WORKDIR) $(HEADERS) $(OBJECTS) + $(LINK) $(LFLAGS) $(OBJECTS) $(LDIRS) /out:$(BUILDBIN) +!ENDIF + +clean: + @$(CLEANTARGET) + +install: $(BUILDLIB) $(WORKDIR) $(BUILDBIN) + @xcopy "$(SRCDIR)\pcre.h" "$(BUILDINC)" /Y /Q + @xcopy "$(WORKDIR)\*.lib" "$(BUILDLIB)" /Y /Q + @xcopy "$(WORKDIR)\*.dll" "$(BUILDLIB)" /Y /Q 2>NUL Property changes on: trunk/httpd/srclib/pcre/NMAKEmakefile ___________________________________________________________________ Name: svn:eol-style + native Added: trunk/httpd/srclib/pcre/chartables.c =================================================================== --- trunk/httpd/srclib/pcre/chartables.c (rev 0) +++ trunk/httpd/srclib/pcre/chartables.c 2007-12-13 17:05:23 UTC (rev 1205) @@ -0,0 +1,183 @@ +/************************************************* +* Perl-Compatible Regular Expressions * +*************************************************/ + +/* This file is automatically written by the dftables auxiliary +program. If you edit it by hand, you might like to edit the Makefile to +prevent its ever being regenerated. + +This file is #included in the compilation of pcre.c to build the default +character tables which are used when no tables are passed to the compile +function. */ + +static unsigned char pcre_default_tables[] = { + +/* This table is a lower casing table. */ + + 0, 1, 2, 3, 4, 5, 6, 7, + 8, 9, 10, 11, 12, 13, 14, 15, + 16, 17, 18, 19, 20, 21, 22, 23, + 24, 25, 26, 27, 28, 29, 30, 31, + 32, 33, 34, 35, 36, 37, 38, 39, + 40, 41, 42, 43, 44, 45, 46, 47, + 48, 49, 50, 51, 52, 53, 54, 55, + 56, 57, 58, 59, 60, 61, 62, 63, + 64, 97, 98, 99,100,101,102,103, + 104,105,106,107,108,109,110,111, + 112,113,114,115,116,117,118,119, + 120,121,122, 91, 92, 93, 94, 95, + 96, 97, 98, 99,100,101,102,103, + 104,105,106,107,108,109,110,111, + 112,113,114,115,116,117,118,119, + 120,121,122,123,124,125,126,127, + 128,129,130,131,132,133,134,135, + 136,137,138,139,140,141,142,143, + 144,145,146,147,148,149,150,151, + 152,153,154,155,156,157,158,159, + 160,161,162,163,164,165,166,167, + 168,169,170,171,172,173,174,175, + 176,177,178,179,180,181,182,183, + 184,185,186,187,188,189,190,191, + 192,193,194,195,196,197,198,199, + 200,201,202,203,204,205,206,207, + 208,209,210,211,212,213,214,215, + 216,217,218,219,220,221,222,223, + 224,225,226,227,228,229,230,231, + 232,233,234,235,236,237,238,239, + 240,241,242,243,244,245,246,247, + 248,249,250,251,252,253,254,255, + +/* This table is a case flipping table. */ + + 0, 1, 2, 3, 4, 5, 6, 7, + 8, 9, 10, 11, 12, 13, 14, 15, + 16, 17, 18, 19, 20, 21, 22, 23, + 24, 25, 26, 27, 28, 29, 30, 31, + 32, 33, 34, 35, 36, 37, 38, 39, + 40, 41, 42, 43, 44, 45, 46, 47, + 48, 49, 50, 51, 52, 53, 54, 55, + 56, 57, 58, 59, 60, 61, 62, 63, + 64, 97, 98, 99,100,101,102,103, + 104,105,106,107,108,109,110,111, + 112,113,114,115,116,117,118,119, + 120,121,122, 91, 92, 93, 94, 95, + 96, 65, 66, 67, 68, 69, 70, 71, + 72, 73, 74, 75, 76, 77, 78, 79, + 80, 81, 82, 83, 84, 85, 86, 87, + 88, 89, 90,123,124,125,126,127, + 128,129,130,131,132,133,134,135, + 136,137,138,139,140,141,142,143, + 144,145,146,147,148,149,150,151, + 152,153,154,155,156,157,158,159, + 160,161,162,163,164,165,166,167, + 168,169,170,171,172,173,174,175, + 176,177,178,179,180,181,182,183, + 184,185,186,187,188,189,190,191, + 192,193,194,195,196,197,198,199, + 200,201,202,203,204,205,206,207, + 208,209,210,211,212,213,214,215, + 216,217,218,219,220,221,222,223, + 224,225,226,227,228,229,230,231, + 232,233,234,235,236,237,238,239, + 240,241,242,243,244,245,246,247, + 248,249,250,251,252,253,254,255, + +/* This table contains bit maps for various character classes. +Each map is 32 bytes long and the bits run from the least +significant end of each byte. The classes that have their own +maps are: space, xdigit, digit, upper, lower, word, graph +print, punct, and cntrl. Other classes are built from combinations. */ + + 0x00,0x3e,0x00,0x00,0x01,0x00,0x00,0x00, + 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, + 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, + 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, + + 0x00,0x00,0x00,0x00,0x00,0x00,0xff,0x03, + 0x7e,0x00,0x00,0x00,0x7e,0x00,0x00,0x00, + 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, + 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, + + 0x00,0x00,0x00,0x00,0x00,0x00,0xff,0x03, + 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, + 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, + 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, + + 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, + 0xfe,0xff,0xff,0x07,0x00,0x00,0x00,0x00, + 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, + 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, + + 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, + 0x00,0x00,0x00,0x00,0xfe,0xff,0xff,0x07, + 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, + 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, + + 0x00,0x00,0x00,0x00,0x00,0x00,0xff,0x03, + 0xfe,0xff,0xff,0x87,0xfe,0xff,0xff,0x07, + 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, + 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, + + 0x00,0x00,0x00,0x00,0xfe,0xff,0xff,0xff, + 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x7f, + 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, + 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, + + 0x00,0x00,0x00,0x00,0xff,0xff,0xff,0xff, + 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x7f, + 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, + 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, + + 0x00,0x00,0x00,0x00,0xfe,0xff,0x00,0xfc, + 0x01,0x00,0x00,0xf8,0x01,0x00,0x00,0x78, + 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, + 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, + + 0xff,0xff,0xff,0xff,0x00,0x00,0x00,0x00, + 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x80, + 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, + 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, + +/* This table identifies various classes of character by individual bits: + 0x01 white space character + 0x02 letter + 0x04 decimal digit + 0x08 hexadecimal digit + 0x10 alphanumeric or '_' + 0x80 regular expression metacharacter or binary zero +*/ + + 0x80,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 0- 7 */ + 0x00,0x01,0x01,0x00,0x01,0x01,0x00,0x00, /* 8- 15 */ + 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 16- 23 */ + 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 24- 31 */ + 0x01,0x00,0x00,0x00,0x80,0x00,0x00,0x00, /* - ' */ + 0x80,0x80,0x80,0x80,0x00,0x00,0x80,0x00, /* ( - / */ + 0x1c,0x1c,0x1c,0x1c,0x1c,0x1c,0x1c,0x1c, /* 0 - 7 */ + 0x1c,0x1c,0x00,0x00,0x00,0x00,0x00,0x80, /* 8 - ? */ + 0x00,0x1a,0x1a,0x1a,0x1a,0x1a,0x1a,0x12, /* @ - G */ + 0x12,0x12,0x12,0x12,0x12,0x12,0x12,0x12, /* H - O */ + 0x12,0x12,0x12,0x12,0x12,0x12,0x12,0x12, /* P - W */ + 0x12,0x12,0x12,0x80,0x00,0x00,0x80,0x10, /* X - _ */ + 0x00,0x1a,0x1a,0x1a,0x1a,0x1a,0x1a,0x12, /* ` - g */ + 0x12,0x12,0x12,0x12,0x12,0x12,0x12,0x12, /* h - o */ + 0x12,0x12,0x12,0x12,0x12,0x12,0x12,0x12, /* p - w */ + 0x12,0x12,0x12,0x80,0x80,0x00,0x00,0x00, /* x -127 */ + 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 128-135 */ + 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 136-143 */ + 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 144-151 */ + 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 152-159 */ + 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 160-167 */ + 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 168-175 */ + 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 176-183 */ + 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 184-191 */ + 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 192-199 */ + 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 200-207 */ + 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 208-215 */ + 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 216-223 */ + 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 224-231 */ + 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 232-239 */ + 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 240-247 */ + 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00};/* 248-255 */ + +/* End of chartables.c */ Property changes on: trunk/httpd/srclib/pcre/chartables.c ___________________________________________________________________ Name: svn:eol-style + native Added: trunk/httpd/srclib/zlib/NMAKEmakefile =================================================================== --- trunk/httpd/srclib/zlib/NMAKEmakefile (rev 0) +++ trunk/httpd/srclib/zlib/NMAKEmakefile 2007-12-13 17:05:23 UTC (rev 1205) @@ -0,0 +1,150 @@ +# Copyright 2001-2006 The Apache Software Foundation or its licensors, as +# applicable. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +# ==================================================================== +# +# NMAKEmakefile Master Zlib makefile. +# Usage: +# DLL=1 Build DLL version +# ASM=1 Use Masm +# DEBUG=1 Build DEBUG version of Zlib +# +# Originally contributed by Mladen Turk <mturk jboss.com> +# +# ==================================================================== +# + +!IF !DEFINED(ZLIB_DECLARE_STATIC) || "$(ZLIB_DECLARE_STATIC)" == "" +TARGET=DLL +PROJECT = libzlib-1 +CFLAGS = -DZLIB_DLL -D_CRT_SECURE_NO_DEPRECATE $(CFLAGS) +!ELSE +TARGET=LIB +PROJECT = zlib-1 +CFLAGS = -DZLIB_WINAPI -D_CRT_SECURE_NO_DEPRECATE $(CFLAGS) +!ENDIF + +!IF "$(CPU)" != "I386" +CFLAGS = -GS- $(CFLAGS) +!ENDIF + +# CFLAGS = -wd4996 $(CFLAGS) + +!IF !DEFINED(SRCDIR) || "$(SRCDIR)" == "" +SRCDIR = . +!ENDIF + +!include <..\..\NMAKEcommon.inc> + +INCLUDES = -I$(SRCDIR) +PDBFLAGS = -Fo$(WORKDIR)\ -Fd$(WORKDIR)\$(PROJECT)-src +OBJECTS = \ + $(WORKDIR)\adler32.obj \ + $(WORKDIR)\compress.obj \ + $(WORKDIR)\crc32.obj \ + $(WORKDIR)\deflate.obj \ + $(WORKDIR)\gzio.obj \ + $(WORKDIR)\infback.obj \ + $(WORKDIR)\inffast.obj \ + $(WORKDIR)\inflate.obj \ + $(WORKDIR)\inftrees.obj \ + $(WORKDIR)\trees.obj \ + $(WORKDIR)\uncompr.obj \ + $(WORKDIR)\zutil.obj + +!IFDEF ZLIB_ASM +CFLAGS = -DASMV -DASMINF $(CFLAGS) +!IF "$(CPU)" == "AMD64" +ASM_OBJECTS = \ + $(WORKDIR)\inffas8664.obj \ + $(WORKDIR)\gvmat64.obj \ + $(WORKDIR)\inffas64.obj + +!ELSE +ASM_OBJECTS = \ + $(WORKDIR)\gvmat32c.obj \ + $(WORKDIR)\gvmat32.obj \ + $(WORKDIR)\inffas32.obj + +!ENDIF +!ELSE +ASM_OBJECTS = +!ENDIF + +BUILDINC = $(PREFIX)\include\apr-1 +BUILDLIB = $(PREFIX)\lib +!IF "$(TARGET)" == "DLL" +BUILDBIN = $(WORKDIR)\$(PROJECT).dll +BUILDPDB = $(WORKDIR)\$(PROJECT).pdb +BUILDRES = $(WORKDIR)\$(PROJECT).res +BUILDMAN = $(BUILDBIN).manifest +!ELSE +BUILDBIN = $(WORKDIR)\$(PROJECT).lib +!ENDIF + +all : $(WORKDIR) $(BUILDBIN) + +$(BUILDINC) : + @if not exist "$(BUILDINC)\arch\win32\$(NULL)" mkdir "$(BUILDINC)\arch\win32" + +$(BUILDLIB) : + @if not exist "$(BUILDLIB)\$(NULL)" mkdir "$(BUILDLIB)" + +$(WORKDIR) : + @$(MAKEWORKDIR) + +{$(SRCDIR)}.c{$(WORKDIR)}.obj: + $(CC) $(CFLAGS) $(INCLUDES) $(PDBFLAGS) $< + +!IF "$(CPU)" == "AMD64" +{$(SRCDIR)/contrib/masmx64}.c{$(WORKDIR)}.obj: + $(CC) $(CFLAGS) $(INCLUDES) $(PDBFLAGS) $< + +{$(SRCDIR)/contrib/masmx64}.asm{$(WORKDIR)}.obj: + $(ML) $(AFLAGS) /Fo$@ $< + +!ELSE +{$(SRCDIR)/contrib/masmx86}.c{$(WORKDIR)}.obj: + $(CC) $(CFLAGS) $(INCLUDES) $(PDBFLAGS) $< + +{$(SRCDIR)/contrib/masmx86}.asm{$(WORKDIR)}.obj: + $(ML) $(AFLAGS) /Fo$@ $< + +!ENDIF + + +$(OBJECTS): $(SRCDIR)/*.h + +!IFDEF DLL +$(BUILDRES): win32/zlib1.rc + $(RC) $(RCFLAGS) /fo $(BUILDRES) win32/zlib1.rc +$(BUILDBIN): $(WORKDIR) $(OBJECTS) $(ASM_OBJECTS) $(BUILDRES) + $(LINK) $(LFLAGS) $(OBJECTS) $(ASM_OBJECTS) $(BUILDRES) $(LIBS) /def:win32/zlib.def /pdb:$(BUILDPDB) /out:$(BUILDBIN) + IF EXIST $(BUILDMAN) \ + mt -nologo -manifest $(BUILDMAN) -outputresource:$(BUILDBIN);2 +!ELSE +$(BUILDBIN): $(WORKDIR) $(OBJECTS) $(ASM_OBJECTS) + $(LINK) $(LFLAGS) $(OBJECTS) $(ASM_OBJECTS) /out:$(BUILDBIN) +!ENDIF + +clean: + @$(CLEANTARGET) + +install: $(BUILDINC) $(BUILDLIB) $(WORKDIR) $(BUILDBIN) + @xcopy "$(SRCDIR)\zlib.h" "$(BUILDINC)" /Y /Q + @xcopy "$(SRCDIR)\zconf.h" "$(BUILDINC)" /Y /Q + @xcopy "$(SRCDIR)\zutil.h" "$(BUILDINC)" /Y /Q + @xcopy "$(WORKDIR)\*.lib" "$(BUILDLIB)" /Y /Q + @xcopy "$(WORKDIR)\*.dll" "$(BUILDLIB)" /Y /Q 2>NUL