Author: jfrederic.clere(a)jboss.com Date: 2014-01-30 02:34:01 -0500 (Thu, 30 Jan 2014) New Revision: 3229 Added: trunk/httpd/httpd-2.4/modules/cache/NMAKEcachesocache trunk/httpd/httpd-2.4/modules/cache/NMAKEsocachedbm trunk/httpd/httpd-2.4/modules/cache/NMAKEsocachedc Modified: trunk/httpd/httpd-2.4/modules/cache/NMAKEcache trunk/httpd/httpd-2.4/modules/cache/NMAKEmakefile Log: Add the caches. Modified: trunk/httpd/httpd-2.4/modules/cache/NMAKEcache =================================================================== --- trunk/httpd/httpd-2.4/modules/cache/NMAKEcache 2014-01-30 07:05:14 UTC (rev 3228) +++ trunk/httpd/httpd-2.4/modules/cache/NMAKEcache 2014-01-30 07:34:01 UTC (rev 3229) @@ -47,9 +47,6 @@ RCFLAGS = $(RCFLAGS) /d BIN_NAME="$(PROJECT).so" /d LONG_NAME="cache_module for Apache" OBJECTS = \ - $(WORKDIR)\cache_cache.obj \ - $(WORKDIR)\cache_hash.obj \ - $(WORKDIR)\cache_pqueue.obj \ $(WORKDIR)\cache_storage.obj \ $(WORKDIR)\cache_util.obj \ $(WORKDIR)\mod_cache.obj Added: trunk/httpd/httpd-2.4/modules/cache/NMAKEcachesocache =================================================================== --- trunk/httpd/httpd-2.4/modules/cache/NMAKEcachesocache (rev 0) +++ trunk/httpd/httpd-2.4/modules/cache/NMAKEcachesocache 2014-01-30 07:34:01 UTC (rev 3229) @@ -0,0 +1,63 @@ +# 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 cache module makefile. +# +# Originally contributed by Mladen Turk <mturk redhat.com> +# +# ==================================================================== +# + +TARGET=DLL +PROJECT = mod_cache_socache + +!IF !DEFINED(SRCDIR) || "$(SRCDIR)" == "" +SRCDIR = . +!ENDIF + +!include <..\..\NMAKEcommon.inc> +!include <..\..\NMAKEhttpd.inc> + +LDIRS = /libpath:"$(BUILDLIB)" +LFLAGS = $(LFLAGS) user32.lib psapi.lib gdi32.lib shlwapi.lib wldap32.lib ole32.lib $(LIBAPR) $(LIBAPU) $(LIBHTTPD) +CFLAGS = $(CFLAGS) -DCACHE_DECLARE_EXPORT -DMOD_CACHE_EXPORTS + +INCLUDES = -I$(SRCDIR) -I$(BUILDINC) +PDBFLAGS = -Fo$(WORKDIR)\ -Fd$(WORKDIR)\$(PROJECT)-src + +BUILDBIN = $(WORKDIR)\$(PROJECT).so +BUILDPDB = $(WORKDIR)\$(PROJECT).pdb +BUILDRES = $(WORKDIR)\$(PROJECT).res +BUILDMFT = $(BUILDBIN).manifest + +RCFLAGS = $(RCFLAGS) /d BIN_NAME="$(PROJECT).so" /d LONG_NAME="cache_module for Apache" + +OBJECTS = \ + $(WORKDIR)\mod_cache_socache.obj + +{$(SRCDIR)}.c{$(WORKDIR)}.obj: + $(CC) $(CFLAGS) $(INCLUDES) $(PDBFLAGS) $< + +$(BUILDRES): ..\..\build\win32\httpd.rc + $(RC) $(RCFLAGS) /i "$(BUILDINC)" /fo $(BUILDRES) ..\..\build\win32\httpd.rc + +$(BUILDBIN): $(OBJECTS) $(BUILDRES) + $(LINK) $(LFLAGS) $(OBJECTS) $(BUILDRES) $(LIBS) $(LDIRS) /pdb:$(BUILDPDB) /out:$(BUILDBIN) + IF EXIST $(BUILDMFT) \ + mt -nologo -manifest $(BUILDMFT) -outputresource:$(BUILDBIN);2 + +install: $(BUILDBIN) Modified: trunk/httpd/httpd-2.4/modules/cache/NMAKEmakefile =================================================================== --- trunk/httpd/httpd-2.4/modules/cache/NMAKEmakefile 2014-01-30 07:05:14 UTC (rev 3228) +++ trunk/httpd/httpd-2.4/modules/cache/NMAKEmakefile 2014-01-30 07:34:01 UTC (rev 3229) @@ -34,7 +34,10 @@ $(SRCDIR)\NMAKEcache\~ \ $(SRCDIR)\NMAKEdiskcache\~ \ $(SRCDIR)\NMAKEfilecache\~ \ - $(SRCDIR)\NMAKEmemcache\~ + $(SRCDIR)\NMAKEmemcache\~ \ + $(SRCDIR)\NMAKEcachesocache\~ \ + $(SRCDIR)\NMAKEsocachedbm\~ \ + $(SRCDIR)\NMAKEsocache_dc\~ all: $(WORKDIR) $(MODULES) @echo Building cache modules ... Added: trunk/httpd/httpd-2.4/modules/cache/NMAKEsocachedbm =================================================================== --- trunk/httpd/httpd-2.4/modules/cache/NMAKEsocachedbm (rev 0) +++ trunk/httpd/httpd-2.4/modules/cache/NMAKEsocachedbm 2014-01-30 07:34:01 UTC (rev 3229) @@ -0,0 +1,63 @@ +# 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 cache module makefile. +# +# Originally contributed by Mladen Turk <mturk redhat.com> +# +# ==================================================================== +# + +TARGET=DLL +PROJECT = mod_socache_dbm + +!IF !DEFINED(SRCDIR) || "$(SRCDIR)" == "" +SRCDIR = . +!ENDIF + +!include <..\..\NMAKEcommon.inc> +!include <..\..\NMAKEhttpd.inc> + +LDIRS = /libpath:"$(BUILDLIB)" +LFLAGS = $(LFLAGS) user32.lib psapi.lib gdi32.lib shlwapi.lib wldap32.lib ole32.lib $(LIBAPR) $(LIBAPU) $(LIBHTTPD) +CFLAGS = $(CFLAGS) -DCACHE_DECLARE_EXPORT -DMOD_CACHE_EXPORTS + +INCLUDES = -I$(SRCDIR) -I$(BUILDINC) +PDBFLAGS = -Fo$(WORKDIR)\ -Fd$(WORKDIR)\$(PROJECT)-src + +BUILDBIN = $(WORKDIR)\$(PROJECT).so +BUILDPDB = $(WORKDIR)\$(PROJECT).pdb +BUILDRES = $(WORKDIR)\$(PROJECT).res +BUILDMFT = $(BUILDBIN).manifest + +RCFLAGS = $(RCFLAGS) /d BIN_NAME="$(PROJECT).so" /d LONG_NAME="cache_module for Apache" + +OBJECTS = \ + $(WORKDIR)\mod_socache_dbm.obj + +{$(SRCDIR)}.c{$(WORKDIR)}.obj: + $(CC) $(CFLAGS) $(INCLUDES) $(PDBFLAGS) $< + +$(BUILDRES): ..\..\build\win32\httpd.rc + $(RC) $(RCFLAGS) /i "$(BUILDINC)" /fo $(BUILDRES) ..\..\build\win32\httpd.rc + +$(BUILDBIN): $(OBJECTS) $(BUILDRES) + $(LINK) $(LFLAGS) $(OBJECTS) $(BUILDRES) $(LIBS) $(LDIRS) /pdb:$(BUILDPDB) /out:$(BUILDBIN) + IF EXIST $(BUILDMFT) \ + mt -nologo -manifest $(BUILDMFT) -outputresource:$(BUILDBIN);2 + +install: $(BUILDBIN) Added: trunk/httpd/httpd-2.4/modules/cache/NMAKEsocachedc =================================================================== --- trunk/httpd/httpd-2.4/modules/cache/NMAKEsocachedc (rev 0) +++ trunk/httpd/httpd-2.4/modules/cache/NMAKEsocachedc 2014-01-30 07:34:01 UTC (rev 3229) @@ -0,0 +1,63 @@ +# 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 cache module makefile. +# +# Originally contributed by Mladen Turk <mturk redhat.com> +# +# ==================================================================== +# + +TARGET=DLL +PROJECT = mod_socache_dc + +!IF !DEFINED(SRCDIR) || "$(SRCDIR)" == "" +SRCDIR = . +!ENDIF + +!include <..\..\NMAKEcommon.inc> +!include <..\..\NMAKEhttpd.inc> + +LDIRS = /libpath:"$(BUILDLIB)" +LFLAGS = $(LFLAGS) user32.lib psapi.lib gdi32.lib shlwapi.lib wldap32.lib ole32.lib $(LIBAPR) $(LIBAPU) $(LIBHTTPD) +CFLAGS = $(CFLAGS) -DCACHE_DECLARE_EXPORT -DMOD_CACHE_EXPORTS + +INCLUDES = -I$(SRCDIR) -I$(BUILDINC) +PDBFLAGS = -Fo$(WORKDIR)\ -Fd$(WORKDIR)\$(PROJECT)-src + +BUILDBIN = $(WORKDIR)\$(PROJECT).so +BUILDPDB = $(WORKDIR)\$(PROJECT).pdb +BUILDRES = $(WORKDIR)\$(PROJECT).res +BUILDMFT = $(BUILDBIN).manifest + +RCFLAGS = $(RCFLAGS) /d BIN_NAME="$(PROJECT).so" /d LONG_NAME="cache_module for Apache" + +OBJECTS = \ + $(WORKDIR)\mod_socache_dc.obj + +{$(SRCDIR)}.c{$(WORKDIR)}.obj: + $(CC) $(CFLAGS) $(INCLUDES) $(PDBFLAGS) $< + +$(BUILDRES): ..\..\build\win32\httpd.rc + $(RC) $(RCFLAGS) /i "$(BUILDINC)" /fo $(BUILDRES) ..\..\build\win32\httpd.rc + +$(BUILDBIN): $(OBJECTS) $(BUILDRES) + $(LINK) $(LFLAGS) $(OBJECTS) $(BUILDRES) $(LIBS) $(LDIRS) /pdb:$(BUILDPDB) /out:$(BUILDBIN) + IF EXIST $(BUILDMFT) \ + mt -nologo -manifest $(BUILDMFT) -outputresource:$(BUILDBIN);2 + +install: $(BUILDBIN)