Author: jfrederic.clere(a)jboss.com Date: 2014-01-26 04:31:42 -0500 (Sun, 26 Jan 2014) New Revision: 3193 Added: trunk/httpd/httpd-2.2/modules/mod_cluster_slotmem/ trunk/httpd/httpd-2.2/modules/mod_cluster_slotmem/Makefile.in trunk/httpd/httpd-2.2/modules/mod_cluster_slotmem/NMAKEmakefile trunk/httpd/httpd-2.2/modules/mod_cluster_slotmem/NMAKEslotmem trunk/httpd/httpd-2.2/modules/mod_cluster_slotmem/config5.m4 Log: Rename the module. Added: trunk/httpd/httpd-2.2/modules/mod_cluster_slotmem/Makefile.in =================================================================== --- trunk/httpd/httpd-2.2/modules/mod_cluster_slotmem/Makefile.in (rev 0) +++ trunk/httpd/httpd-2.2/modules/mod_cluster_slotmem/Makefile.in 2014-01-26 09:31:42 UTC (rev 3193) @@ -0,0 +1,3 @@ + +include $(top_srcdir)/build/special.mk + Added: trunk/httpd/httpd-2.2/modules/mod_cluster_slotmem/NMAKEmakefile =================================================================== --- trunk/httpd/httpd-2.2/modules/mod_cluster_slotmem/NMAKEmakefile (rev 0) +++ trunk/httpd/httpd-2.2/modules/mod_cluster_slotmem/NMAKEmakefile 2014-01-26 09:31:42 UTC (rev 3193) @@ -0,0 +1,46 @@ +# Copyright 2001-2014 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 cluster module makefile. +# +# Originally contributed by Mladen Turk <mturk redhat.com> +# +# ==================================================================== +# + +TARGET=DLL +!IF !DEFINED(SRCDIR) || "$(SRCDIR)" == "" +SRCDIR = . +!ENDIF + +!include <..\..\NMAKEcommon.inc> +!include <..\..\NMAKEhttpd.inc> + +MODULES = \ + $(SRCDIR)\NMAKEslotmem\~ + +all: $(WORKDIR) $(MODULES) + @echo Building mod_cluster_slotmem module ... + +$(MODULES): + @$(MAKE) -nologo -f $(@D) install + +$(WORKDIR): + @$(MAKEWORKDIR) + +install: all + @xcopy "$(WORKDIR)\*.so" "$(BUILDMOD)" /Y /Q 2>NUL Added: trunk/httpd/httpd-2.2/modules/mod_cluster_slotmem/NMAKEslotmem =================================================================== --- trunk/httpd/httpd-2.2/modules/mod_cluster_slotmem/NMAKEslotmem (rev 0) +++ trunk/httpd/httpd-2.2/modules/mod_cluster_slotmem/NMAKEslotmem 2014-01-26 09:31:42 UTC (rev 3193) @@ -0,0 +1,69 @@ +# 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 mod_sharedmem module makefile. +# +# Originally contributed by Mladen Turk <mturk redhat.com> +# +# ==================================================================== +# + +TARGET=DLL +PROJECT = mod_cluster_slotmem + +!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) -DCLUSTER_DECLARE_EXPORT + +INCLUDES = -I$(SRCDIR) -I$(BUILDINC) -I../proxy +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="mod_cluster_slotmem module for Apache" + +OBJECTS = \ + $(WORKDIR)\sharedmem_util.obj \ + $(WORKDIR)\mod_sharedmem.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 + +!IF EXIST($(SRCDIR)\mod_sharedmem.c) +install: $(BUILDBIN) +!ELSE +install: + @echo Skipping $(PROJECT) build. +!ENDIF Added: trunk/httpd/httpd-2.2/modules/mod_cluster_slotmem/config5.m4 =================================================================== --- trunk/httpd/httpd-2.2/modules/mod_cluster_slotmem/config5.m4 (rev 0) +++ trunk/httpd/httpd-2.2/modules/mod_cluster_slotmem/config5.m4 2014-01-26 09:31:42 UTC (rev 3193) @@ -0,0 +1,17 @@ +dnl modules enabled in this directory by default + +APACHE_MODPATH_INIT(mod_cluster_slotmem) + +if test "$enable_mod_cluster_slotmem" = "shared"; then + mod_slotmem_mods_enable=shared +elif test "$enable_mod_cluster_slotmem" = "yes"; then + mod_slotmem_mods_enable=yes +else + mod_slotmem_mods_enable=no +fi + +slotmem_objects="mod_sharedmem.lo sharedmem_util.lo" + +APACHE_MODULE(cluster_slotmem, A slotmem provider for mod_cluster, $slotmem_objects, , $mod_slotmem_mods_enable) + +APACHE_MODPATH_FINISH