Author: jfrederic.clere(a)jboss.com Date: 2014-08-28 12:12:42 -0400 (Thu, 28 Aug 2014) New Revision: 3361 Added: trunk/httpd/httpd-2.4/modules/bmx/ trunk/httpd/httpd-2.4/modules/bmx/NMAKEbmx trunk/httpd/httpd-2.4/modules/bmx/NMAKEbmx_status trunk/httpd/httpd-2.4/modules/bmx/NMAKEbmx_vhost trunk/httpd/httpd-2.4/modules/bmx/NMAKEmakefile Modified: trunk/httpd/httpd-2.4/modules/NMAKEmakefile Log: Add bmx modules. Modified: trunk/httpd/httpd-2.4/modules/NMAKEmakefile =================================================================== --- trunk/httpd/httpd-2.4/modules/NMAKEmakefile 2014-08-28 12:38:37 UTC (rev 3360) +++ trunk/httpd/httpd-2.4/modules/NMAKEmakefile 2014-08-28 16:12:42 UTC (rev 3361) @@ -53,7 +53,8 @@ advertise\~ \ mod_cluster_slotmem\~ \ mod_manager\~ \ - jk\~ + jk\~ \ + bmx\~ all: $(SUBDIRS) Added: trunk/httpd/httpd-2.4/modules/bmx/NMAKEbmx =================================================================== --- trunk/httpd/httpd-2.4/modules/bmx/NMAKEbmx (rev 0) +++ trunk/httpd/httpd-2.4/modules/bmx/NMAKEbmx 2014-08-28 16:12:42 UTC (rev 3361) @@ -0,0 +1,62 @@ +# 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 bmx module makefile. +# +# Originally contributed by Mladen Turk <mturk redhat.com> +# +# ==================================================================== +# + +TARGET=DLL +PROJECT = mod_bmx + +!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) + +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="bmx_module for Apache" + +OBJECTS = \ + $(WORKDIR)\mod_bmx.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/bmx/NMAKEbmx_status =================================================================== --- trunk/httpd/httpd-2.4/modules/bmx/NMAKEbmx_status (rev 0) +++ trunk/httpd/httpd-2.4/modules/bmx/NMAKEbmx_status 2014-08-28 16:12:42 UTC (rev 3361) @@ -0,0 +1,62 @@ +# 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 bmx status module makefile. +# +# Originally contributed by Mladen Turk <mturk redhat.com> +# +# ==================================================================== +# + +TARGET=DLL +PROJECT = mod_bmx_status + +!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) + +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="bmx_status_module for Apache" + +OBJECTS = \ + $(WORKDIR)\mod_bmx.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/bmx/NMAKEbmx_vhost =================================================================== --- trunk/httpd/httpd-2.4/modules/bmx/NMAKEbmx_vhost (rev 0) +++ trunk/httpd/httpd-2.4/modules/bmx/NMAKEbmx_vhost 2014-08-28 16:12:42 UTC (rev 3361) @@ -0,0 +1,62 @@ +# 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 bmx vhost module makefile. +# +# Originally contributed by Mladen Turk <mturk redhat.com> +# +# ==================================================================== +# + +TARGET=DLL +PROJECT = mod_bmx_vhost + +!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) + +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="bmx_vhost_module for Apache" + +OBJECTS = \ + $(WORKDIR)\mod_bmx.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/bmx/NMAKEmakefile =================================================================== --- trunk/httpd/httpd-2.4/modules/bmx/NMAKEmakefile (rev 0) +++ trunk/httpd/httpd-2.4/modules/bmx/NMAKEmakefile 2014-08-28 16:12:42 UTC (rev 3361) @@ -0,0 +1,48 @@ +# 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 bmx modules 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)\NMAKEbmx\~ \ + $(SRCDIR)\NMAKEbmx_status\~ \ + $(SRCDIR)\NMAKEbmx_vhost\~ + +all: $(WORKDIR) $(MODULES) + @echo Building bmx modules ... + +$(MODULES): + @$(MAKE) -nologo -f $(@D) install + +$(WORKDIR): + @$(MAKEWORKDIR) + +install: all + @xcopy "$(WORKDIR)\*.so" "$(BUILDMOD)" /I /Y /Q 2>NUL