JBoss Native SVN: r3209 - trunk/build/patch.
by jbossnative-commits＠lists.jboss.org
Author: jfrederic.clere(a)jboss.com
Date: 2014-01-27 11:55:32 -0500 (Mon, 27 Jan 2014)
New Revision: 3209
Added:
trunk/build/patch/apr-util-1.5.3.patch
Log:
Add patch for apr-util 1.5.3
Added: trunk/build/patch/apr-util-1.5.3.patch
===================================================================
--- trunk/build/patch/apr-util-1.5.3.patch (rev 0)
+++ trunk/build/patch/apr-util-1.5.3.patch 2014-01-27 16:55:32 UTC (rev 3209)
@@ -0,0 +1,33 @@
+Index: include/apu.hw
+===================================================================
+--- include/apu.hw (revision 1561739)
++++ include/apu.hw (working copy)
+@@ -105,7 +105,7 @@
+ /*
+ * we always have SDBM (it's in our codebase)
+ */
+-#define APU_HAVE_SDBM 1
++#define APU_HAVE_SDBM 0
+
+ #ifndef APU_DSO_MODULE_BUILD
+ #define APU_HAVE_GDBM 0
+@@ -128,7 +128,7 @@
+ #define APU_HAVE_SQLITE2 0
+ #define APU_HAVE_ORACLE 0
+ #define APU_HAVE_FREETDS 0
+-#define APU_HAVE_ODBC 1
++#define APU_HAVE_ODBC 0
+ #endif
+
+ #define APU_HAVE_CRYPTO 0
+@@ -138,8 +138,8 @@
+ #define APU_HAVE_NSS 0
+ #endif
+
+-#define APU_HAVE_APR_ICONV 1
+-#define APU_HAVE_ICONV 0
++#define APU_HAVE_APR_ICONV 0
++#define APU_HAVE_ICONV 1
+ #define APR_HAS_XLATE (APU_HAVE_APR_ICONV || APU_HAVE_ICONV)
+
+ #endif /* APU_H */
10 years, 11 months
- 1
- 0
JBoss Native SVN: r3208 - trunk/srclib/apr/apr-1.5.
by jbossnative-commits＠lists.jboss.org
Author: jfrederic.clere(a)jboss.com
Date: 2014-01-27 11:02:37 -0500 (Mon, 27 Jan 2014)
New Revision: 3208
Modified:
trunk/srclib/apr/apr-1.5/NMAKEmakefile
Log:
the 1.4 will probably do better.
Modified: trunk/srclib/apr/apr-1.5/NMAKEmakefile
===================================================================
--- trunk/srclib/apr/apr-1.5/NMAKEmakefile 2014-01-27 15:46:40 UTC (rev 3207)
+++ trunk/srclib/apr/apr-1.5/NMAKEmakefile 2014-01-27 16:02:37 UTC (rev 3208)
@@ -1,4 +1,4 @@
-# Copyright 2001-2007 The Apache Software Foundation or its licensors, as
+# Copyright 2001-2009 The Apache Software Foundation or its licensors, as
# applicable.
#
# Licensed under the Apache License, Version 2.0 (the "License");
@@ -39,57 +39,60 @@
SRCDIR = .
!ENDIF
-!include <..\..\NMAKEcommon.inc>
-!include <..\..\NMAKEhttpd.inc>
+!include <..\common\NMAKEcommon.inc>
+!IF "$(TARGET)" != "LIB"
+LFLAGS = $(LFLAGS) /version:1.4
+!ENDIF
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)\fileacc.obj \
+ $(WORKDIR)\filepath_util.obj \
+ $(WORKDIR)\fullrw.obj \
+ $(WORKDIR)\mktemp.obj \
+ $(WORKDIR)\tempdir.obj \
+ $(WORKDIR)\buffer.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)\errorcodes.obj \
+ $(WORKDIR)\getopt.obj \
+ $(WORKDIR)\otherchild.obj \
+ $(WORKDIR)\version.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)\sockaddr.obj \
$(WORKDIR)\sendrecv.obj \
- $(WORKDIR)\sockaddr.obj \
$(WORKDIR)\sockets.obj \
$(WORKDIR)\sockopt.obj \
$(WORKDIR)\apr_getpass.obj \
+ $(WORKDIR)\select.obj \
$(WORKDIR)\apr_random.obj \
$(WORKDIR)\sha2.obj \
$(WORKDIR)\sha2_glue.obj \
@@ -109,34 +112,32 @@
$(WORKDIR)\time.obj \
$(WORKDIR)\timestr.obj \
$(WORKDIR)\groupinfo.obj \
- $(WORKDIR)\userinfo.obj
+ $(WORKDIR)\userinfo.obj \
+ $(WORKDIR)\poll.obj \
+ $(WORKDIR)\pollset.obj
-!IF EXIST($(SRCDIR)\file_io\win32\buffer.c)
-OBJECTS = $(OBJECTS) \
- $(WORKDIR)\buffer.obj
-!ENDIF
-
-HEADERS = $(SRCDIR)\include\apr.h
-
+BUILDINC = $(PREFIX)\include\apr-1
+BUILDLIB = $(PREFIX)\lib
!IF "$(TARGET)" == "DLL"
BUILDBIN = $(WORKDIR)\$(PROJECT).dll
BUILDPDB = $(WORKDIR)\$(PROJECT).pdb
BUILDRES = $(WORKDIR)\$(PROJECT).res
-BUILDMFT = $(BUILDBIN).manifest
+BUILDMAN = $(BUILDBIN).manifest
!ELSE
BUILDBIN = $(WORKDIR)\$(PROJECT).lib
!ENDIF
-all : $(BUILDINS) $(WORKDIR) $(HEADERS) $(BUILDBIN)
+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)
-.SUFFIXES : .hw
-
-{$(SRCDIR)\include}.hw{$(SRCDIR)\include}.h:
- @copy /Y $< $@ >NUL
-
{$(SRCDIR)\atomic\win32}.c{$(WORKDIR)}.obj:
$(CC) $(CFLAGS) $(INCLUDES) $(PDBFLAGS) $<
@@ -203,12 +204,12 @@
$(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
+$(BUILDRES): libapr.rc $(SRCDIR)\include\*.h
$(RC) $(RCFLAGS) /i "$(SRCDIR)\include" /d "APR_VERSION_ONLY" /fo $(BUILDRES) libapr.rc
-$(BUILDBIN): $(WORKDIR) $(HEADERS) $(OBJECTS) $(BUILDRES)
+$(BUILDBIN): $(WORKDIR) $(OBJECTS) $(BUILDRES)
$(LINK) $(LFLAGS) $(OBJECTS) $(BUILDRES) $(LIBS) /pdb:$(BUILDPDB) /out:$(BUILDBIN)
- IF EXIST $(BUILDMFT) \
- mt -nologo -manifest $(BUILDMFT) -outputresource:$(BUILDBIN);2
+ IF EXIST $(BUILDMAN) \
+ mt -nologo -manifest $(BUILDMAN) -outputresource:$(BUILDBIN);2
!ELSE
$(BUILDBIN): $(WORKDIR) $(OBJECTS)
$(LINK) $(LFLAGS) $(OBJECTS) /out:$(BUILDBIN)
@@ -217,9 +218,9 @@
clean:
@$(CLEANTARGET)
-install: $(BUILDINS) $(WORKDIR) $(HEADERS) $(BUILDBIN)
+install: $(BUILDINC) $(BUILDLIB) $(WORKDIR) $(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" "$(BUILDOUT)" /Y /Q 2>NUL
+ @xcopy "$(WORKDIR)\*.dll" "$(BUILDLIB)" /Y /Q 2>NUL
10 years, 11 months
- 1
- 0
JBoss Native SVN: r3207 - in trunk/srclib/apr: apr-1.5 and 1 other directory.
by jbossnative-commits＠lists.jboss.org
Author: jfrederic.clere(a)jboss.com
Date: 2014-01-27 10:46:40 -0500 (Mon, 27 Jan 2014)
New Revision: 3207
Added:
trunk/srclib/apr/apr-1.5/
trunk/srclib/apr/apr-1.5/NMAKEmakefile
Log:
Add the NMAKEmakefile (from jbossnative/httpd/httpd-2.4/srclib/apr)
Added: trunk/srclib/apr/apr-1.5/NMAKEmakefile
===================================================================
--- trunk/srclib/apr/apr-1.5/NMAKEmakefile (rev 0)
+++ trunk/srclib/apr/apr-1.5/NMAKEmakefile 2014-01-27 15:46:40 UTC (rev 3207)
@@ -0,0 +1,225 @@
+# 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>
+!include <..\..\NMAKEhttpd.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)\time.obj \
+ $(WORKDIR)\timestr.obj \
+ $(WORKDIR)\groupinfo.obj \
+ $(WORKDIR)\userinfo.obj
+
+!IF EXIST($(SRCDIR)\file_io\win32\buffer.c)
+OBJECTS = $(OBJECTS) \
+ $(WORKDIR)\buffer.obj
+!ENDIF
+
+HEADERS = $(SRCDIR)\include\apr.h
+
+!IF "$(TARGET)" == "DLL"
+BUILDBIN = $(WORKDIR)\$(PROJECT).dll
+BUILDPDB = $(WORKDIR)\$(PROJECT).pdb
+BUILDRES = $(WORKDIR)\$(PROJECT).res
+BUILDMFT = $(BUILDBIN).manifest
+!ELSE
+BUILDBIN = $(WORKDIR)\$(PROJECT).lib
+!ENDIF
+
+all : $(BUILDINS) $(WORKDIR) $(HEADERS) $(BUILDBIN)
+
+$(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 $(BUILDMFT) \
+ mt -nologo -manifest $(BUILDMFT) -outputresource:$(BUILDBIN);2
+!ELSE
+$(BUILDBIN): $(WORKDIR) $(OBJECTS)
+ $(LINK) $(LFLAGS) $(OBJECTS) /out:$(BUILDBIN)
+!ENDIF
+
+clean:
+ @$(CLEANTARGET)
+
+install: $(BUILDINS) $(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" "$(BUILDOUT)" /Y /Q 2>NUL
10 years, 11 months
- 1
- 0
JBoss Native SVN: r3206 - trunk/httpd/httpd-2.4/srclib/apr.
by jbossnative-commits＠lists.jboss.org
Author: jfrederic.clere(a)jboss.com
Date: 2014-01-27 10:07:19 -0500 (Mon, 27 Jan 2014)
New Revision: 3206
Modified:
trunk/httpd/httpd-2.4/srclib/apr/NMAKEmakefile
Log:
the source is gone in that version.
Modified: trunk/httpd/httpd-2.4/srclib/apr/NMAKEmakefile
===================================================================
--- trunk/httpd/httpd-2.4/srclib/apr/NMAKEmakefile 2014-01-27 14:32:17 UTC (rev 3205)
+++ trunk/httpd/httpd-2.4/srclib/apr/NMAKEmakefile 2014-01-27 15:07:19 UTC (rev 3206)
@@ -106,7 +106,6 @@
$(WORKDIR)\signals.obj \
$(WORKDIR)\thread.obj \
$(WORKDIR)\threadpriv.obj \
- $(WORKDIR)\access.obj \
$(WORKDIR)\time.obj \
$(WORKDIR)\timestr.obj \
$(WORKDIR)\groupinfo.obj \
10 years, 11 months
- 1
- 0
JBoss Native SVN: r3205 - trunk/build/unix/util.
by jbossnative-commits＠lists.jboss.org
Author: jfrederic.clere(a)jboss.com
Date: 2014-01-27 09:32:17 -0500 (Mon, 27 Jan 2014)
New Revision: 3205
Modified:
trunk/build/unix/util/ckeckdownload.sh
Log:
use the right url in case the backup is used.
Modified: trunk/build/unix/util/ckeckdownload.sh
===================================================================
--- trunk/build/unix/util/ckeckdownload.sh 2014-01-27 14:17:04 UTC (rev 3204)
+++ trunk/build/unix/util/ckeckdownload.sh 2014-01-27 14:32:17 UTC (rev 3205)
@@ -40,6 +40,7 @@
echo "downloadtaredsrc $URLBACK failed"
return 1
fi
+ URL=$URLBACK
fi
fname=`basename $URL`
case ${fname} in
10 years, 11 months
- 1
- 0
JBoss Native SVN: r3204 - trunk/build/unix.
by jbossnative-commits＠lists.jboss.org
Author: jfrederic.clere(a)jboss.com
Date: 2014-01-27 09:17:04 -0500 (Mon, 27 Jan 2014)
New Revision: 3204
Modified:
trunk/build/unix/buildsrc.mod_cluster.sh
Log:
Use the unix version if no win32 one.
Modified: trunk/build/unix/buildsrc.mod_cluster.sh
===================================================================
--- trunk/build/unix/buildsrc.mod_cluster.sh 2014-01-27 13:14:15 UTC (rev 3203)
+++ trunk/build/unix/buildsrc.mod_cluster.sh 2014-01-27 14:17:04 UTC (rev 3204)
@@ -41,10 +41,12 @@
# http://archive.apache.org/dist/httpd/httpd-2.2.10.tar.gz
# http://apache.mirror.testserver.li/httpd/httpd-2.2.10-win32-src.zip
URLHTTP=http://archive.apache.org/dist/httpd/httpd-${httpd_version}.tar.gz
+URLHTTPBACK="NONE"
if [ "${BUILD_SYS}" = "windows" ]; then
URLHTTP=http://archive.apache.org/dist/httpd/httpd-${httpd_version}-win32...
+ URLHTTPBACK=http://archive.apache.org/dist/httpd/httpd-${httpd_version}.t...
fi
-util/ckeckdownload.sh $build_cache_dir $package_src_dir $build_top httpd-${httpd_version} ${URLHTTP} "NONE" false
+util/ckeckdownload.sh $build_cache_dir $package_src_dir $build_top httpd-${httpd_version} ${URLHTTP} ${URLHTTPBACK} false
if [ $? -ne 0 ]; then
echo "util/ckeckdownload httpd failed"
exit 1
10 years, 11 months
- 1
- 0
JBoss Native SVN: r3203 - trunk/build/unix.
by jbossnative-commits＠lists.jboss.org
Author: jfrederic.clere(a)jboss.com
Date: 2014-01-27 08:14:15 -0500 (Mon, 27 Jan 2014)
New Revision: 3203
Modified:
trunk/build/unix/buildbin.mod_cluster.windows.sh
trunk/build/unix/buildsrc.mod_cluster.sh
Log:
separate httpd-2.4 and httpd-2.2
Modified: trunk/build/unix/buildbin.mod_cluster.windows.sh
===================================================================
--- trunk/build/unix/buildbin.mod_cluster.windows.sh 2014-01-27 12:43:33 UTC (rev 3202)
+++ trunk/build/unix/buildbin.mod_cluster.windows.sh 2014-01-27 13:14:15 UTC (rev 3203)
@@ -60,10 +60,18 @@
add_conf="${add_conf} WITH_OPENSSL=${win_common_loc}"
fi
-mkdir -p ${output_loc}/httpd-2.2
-win_output_loc=`cygpath -w -a ${output_loc}/httpd-2.2`
+case ${httpd_version} in
+ 2.2*)
+ dirhttpd=httpd-2.2
+ ;;
+ 2.4*)
+ dirhttpd=httpd-2.4
+ ;;
+esac
+mkdir -p ${output_loc}/${dirhttpd}
+win_output_loc=`cygpath -w -a ${output_loc}/${dirhttpd}`
-native_sources=srclib/`ls srclib | grep httpd-2.2`
+native_sources=srclib/`ls srclib | grep ${dirhttpd}`
src_dir=`cygpath -w -a ${native_sources}`
(cd $native_sources
Modified: trunk/build/unix/buildsrc.mod_cluster.sh
===================================================================
--- trunk/build/unix/buildsrc.mod_cluster.sh 2014-01-27 12:43:33 UTC (rev 3202)
+++ trunk/build/unix/buildsrc.mod_cluster.sh 2014-01-27 13:14:15 UTC (rev 3203)
@@ -94,13 +94,22 @@
#
# Copy the windows NMAKE files (and additional stuff).
-dirnmake=${build_svn_root}/httpd/httpd-2.2/
+case ${httpd_version} in
+ 2.2*)
+ dirnmake=${build_svn_root}/httpd/httpd-2.2/
+ dirhttpd=httpd-2.2
+ ;;
+ 2.4*)
+ dirnmake=${build_svn_root}/httpd/httpd-2.4/
+ dirhttpd=httpd-2.4
+ ;;
+esac
if [ -d ${dirnmake} ]; then
#svn export --force ${dirnmake} ${dirsources}
- svn export --force http://anonsvn.jboss.org/repos/jbossnative/trunk/httpd/httpd-2.2 ${dirsources}
+ svn export --force http://anonsvn.jboss.org/repos/jbossnative/trunk/httpd/${dirhttpd} ${dirsources}
if [ $? -ne 0 ]; then
#echo "svn export --force ${dirnmake} ${dirsources} FAILED"
- echo "svn export --force http://anonsvn.jboss.org/repos/jbossnative/trunk/httpd/httpd-2.2 ${dirsources} FAILED"
+ echo "svn export --force http://anonsvn.jboss.org/repos/jbossnative/trunk/httpd/${dirhttpd} ${dirsources} FAILED"
exit 1
fi
# Apply patches for iconv
10 years, 11 months
- 1
- 0
JBoss Native SVN: r3202 - in trunk/httpd/httpd-2.4/modules: cluster and 3 other directories.
by jbossnative-commits＠lists.jboss.org
Author: jfrederic.clere(a)jboss.com
Date: 2014-01-27 07:43:33 -0500 (Mon, 27 Jan 2014)
New Revision: 3202
Added:
trunk/httpd/httpd-2.4/modules/cluster/
trunk/httpd/httpd-2.4/modules/cluster/NMAKEheartbeat
trunk/httpd/httpd-2.4/modules/cluster/NMAKEheartmonitor
trunk/httpd/httpd-2.4/modules/cluster/NMAKEmakefile
trunk/httpd/httpd-2.4/modules/core/
trunk/httpd/httpd-2.4/modules/core/NMAKEmacro
trunk/httpd/httpd-2.4/modules/core/NMAKEmakefile
trunk/httpd/httpd-2.4/modules/core/NMAKEso
trunk/httpd/httpd-2.4/modules/core/NMAKEwatchdog
trunk/httpd/httpd-2.4/modules/debugging/
trunk/httpd/httpd-2.4/modules/session/
trunk/httpd/httpd-2.4/modules/session/NMAKEmakefile
trunk/httpd/httpd-2.4/modules/session/NMAKEsession
trunk/httpd/httpd-2.4/modules/session/NMAKEsession_cookie
trunk/httpd/httpd-2.4/modules/session/NMAKEsession_crypto
trunk/httpd/httpd-2.4/modules/session/NMAKEsession_dbd
trunk/httpd/httpd-2.4/modules/slotmem/
trunk/httpd/httpd-2.4/modules/slotmem/NMAKEslotmem_plain
trunk/httpd/httpd-2.4/modules/slotmem/NMAKEslotmem_shm
Removed:
trunk/httpd/httpd-2.4/modules/debug/
trunk/httpd/httpd-2.4/modules/mod_slotmem/
trunk/httpd/httpd-2.4/modules/slotmem/Makefile.in
trunk/httpd/httpd-2.4/modules/slotmem/NMAKEslotmem
trunk/httpd/httpd-2.4/modules/slotmem/config5.m4
Modified:
trunk/httpd/httpd-2.4/modules/NMAKEmakefile
trunk/httpd/httpd-2.4/modules/slotmem/NMAKEmakefile
Log:
Add some modules.
Modified: trunk/httpd/httpd-2.4/modules/NMAKEmakefile
===================================================================
--- trunk/httpd/httpd-2.4/modules/NMAKEmakefile 2014-01-27 10:44:40 UTC (rev 3201)
+++ trunk/httpd/httpd-2.4/modules/NMAKEmakefile 2014-01-27 12:43:33 UTC (rev 3202)
@@ -34,6 +34,8 @@
aaa\~ \
arch\win32\~ \
cache\~ \
+ core\~ \
+ cluster\~ \
dav\main\~ \
dav\fs\~ \
echo\~ \
@@ -44,10 +46,12 @@
loggers\~ \
mappers\~ \
metadata\~ \
+ session\~ \
ssl\~ \
+ slotmem\~ \
proxy\~ \
advertise\~ \
- mod_slotmem\~ \
+ mod_cluster_slotmem\~ \
mod_manager\~ \
jk\~
Added: trunk/httpd/httpd-2.4/modules/cluster/NMAKEheartbeat
===================================================================
--- trunk/httpd/httpd-2.4/modules/cluster/NMAKEheartbeat (rev 0)
+++ trunk/httpd/httpd-2.4/modules/cluster/NMAKEheartbeat 2014-01-27 12:43:33 UTC (rev 3202)
@@ -0,0 +1,68 @@
+# 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_heartbeat module makefile.
+#
+# Originally contributed by Mladen Turk <mturk redhat.com>
+#
+# ====================================================================
+#
+
+TARGET=DLL
+PROJECT = mod_heartbeat
+
+!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_heartbeat module for Apache"
+
+OBJECTS = \
+ $(WORKDIR)\mod_heartbeat.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_heartbeat.c)
+install: $(BUILDBIN)
+!ELSE
+install:
+ @echo Skipping $(PROJECT) build.
+!ENDIF
Added: trunk/httpd/httpd-2.4/modules/cluster/NMAKEheartmonitor
===================================================================
--- trunk/httpd/httpd-2.4/modules/cluster/NMAKEheartmonitor (rev 0)
+++ trunk/httpd/httpd-2.4/modules/cluster/NMAKEheartmonitor 2014-01-27 12:43:33 UTC (rev 3202)
@@ -0,0 +1,68 @@
+# 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_heartmonitor module makefile.
+#
+# Originally contributed by Mladen Turk <mturk redhat.com>
+#
+# ====================================================================
+#
+
+TARGET=DLL
+PROJECT = mod_heartmonitor
+
+!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_heartmonitor module for Apache"
+
+OBJECTS = \
+ $(WORKDIR)\mod_heartmonitor.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_heartmonitor.c)
+install: $(BUILDBIN)
+!ELSE
+install:
+ @echo Skipping $(PROJECT) build.
+!ENDIF
Added: trunk/httpd/httpd-2.4/modules/cluster/NMAKEmakefile
===================================================================
--- trunk/httpd/httpd-2.4/modules/cluster/NMAKEmakefile (rev 0)
+++ trunk/httpd/httpd-2.4/modules/cluster/NMAKEmakefile 2014-01-27 12:43:33 UTC (rev 3202)
@@ -0,0 +1,47 @@
+# 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 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)\NMAKEheartbeat\~ \
+ $(SRCDIR)\NMAKEheartmonitor\~
+
+all: $(WORKDIR) $(MODULES)
+ @echo Building cluster module ...
+
+$(MODULES):
+ @$(MAKE) -nologo -f $(@D) install
+
+$(WORKDIR):
+ @$(MAKEWORKDIR)
+
+install: all
+ @xcopy "$(WORKDIR)\*.so" "$(BUILDMOD)" /Y /Q 2>NUL
Added: trunk/httpd/httpd-2.4/modules/core/NMAKEmacro
===================================================================
--- trunk/httpd/httpd-2.4/modules/core/NMAKEmacro (rev 0)
+++ trunk/httpd/httpd-2.4/modules/core/NMAKEmacro 2014-01-27 12:43:33 UTC (rev 3202)
@@ -0,0 +1,68 @@
+# 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_macro module makefile.
+#
+# Originally contributed by Mladen Turk <mturk redhat.com>
+#
+# ====================================================================
+#
+
+TARGET=DLL
+PROJECT = mod_macro
+
+!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_macro module for Apache"
+
+OBJECTS = \
+ $(WORKDIR)\mod_macro.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_macro.c)
+install: $(BUILDBIN)
+!ELSE
+install:
+ @echo Skipping $(PROJECT) build.
+!ENDIF
Added: trunk/httpd/httpd-2.4/modules/core/NMAKEmakefile
===================================================================
--- trunk/httpd/httpd-2.4/modules/core/NMAKEmakefile (rev 0)
+++ trunk/httpd/httpd-2.4/modules/core/NMAKEmakefile 2014-01-27 12:43:33 UTC (rev 3202)
@@ -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 HTTPD core 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)\NMAKEmacro\~ \
+ $(SRCDIR)\NMAKEso\~ \
+ $(SRCDIR)\NMAKEwatchdog\~
+
+all: $(WORKDIR) $(MODULES)
+ @echo Building core module ...
+
+$(MODULES):
+ @$(MAKE) -nologo -f $(@D) install
+
+$(WORKDIR):
+ @$(MAKEWORKDIR)
+
+install: all
+ @xcopy "$(WORKDIR)\*.so" "$(BUILDMOD)" /Y /Q 2>NUL
Added: trunk/httpd/httpd-2.4/modules/core/NMAKEso
===================================================================
--- trunk/httpd/httpd-2.4/modules/core/NMAKEso (rev 0)
+++ trunk/httpd/httpd-2.4/modules/core/NMAKEso 2014-01-27 12:43:33 UTC (rev 3202)
@@ -0,0 +1,68 @@
+# 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_so module makefile.
+#
+# Originally contributed by Mladen Turk <mturk redhat.com>
+#
+# ====================================================================
+#
+
+TARGET=DLL
+PROJECT = mod_so
+
+!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_so module for Apache"
+
+OBJECTS = \
+ $(WORKDIR)\mod_so.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_so.c)
+install: $(BUILDBIN)
+!ELSE
+install:
+ @echo Skipping $(PROJECT) build.
+!ENDIF
Added: trunk/httpd/httpd-2.4/modules/core/NMAKEwatchdog
===================================================================
--- trunk/httpd/httpd-2.4/modules/core/NMAKEwatchdog (rev 0)
+++ trunk/httpd/httpd-2.4/modules/core/NMAKEwatchdog 2014-01-27 12:43:33 UTC (rev 3202)
@@ -0,0 +1,68 @@
+# 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_watchdog module makefile.
+#
+# Originally contributed by Mladen Turk <mturk redhat.com>
+#
+# ====================================================================
+#
+
+TARGET=DLL
+PROJECT = mod_watchdog
+
+!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_watchdog module for Apache"
+
+OBJECTS = \
+ $(WORKDIR)\mod_watchdog.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_watchdog.c)
+install: $(BUILDBIN)
+!ELSE
+install:
+ @echo Skipping $(PROJECT) build.
+!ENDIF
Added: trunk/httpd/httpd-2.4/modules/session/NMAKEmakefile
===================================================================
--- trunk/httpd/httpd-2.4/modules/session/NMAKEmakefile (rev 0)
+++ trunk/httpd/httpd-2.4/modules/session/NMAKEmakefile 2014-01-27 12:43:33 UTC (rev 3202)
@@ -0,0 +1,49 @@
+# 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 session 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)\NMAKEsession\~ \
+ $(SRCDIR)\NMAKEsession_cookie\~ \
+ $(SRCDIR)\NMAKEsession_dbd\~ \
+ $(SRCDIR)\NMAKEsession_crypto\~
+
+all: $(WORKDIR) $(MODULES)
+ @echo Building core module ...
+
+$(MODULES):
+ @$(MAKE) -nologo -f $(@D) install
+
+$(WORKDIR):
+ @$(MAKEWORKDIR)
+
+install: all
+ @xcopy "$(WORKDIR)\*.so" "$(BUILDMOD)" /Y /Q 2>NUL
Added: trunk/httpd/httpd-2.4/modules/session/NMAKEsession
===================================================================
--- trunk/httpd/httpd-2.4/modules/session/NMAKEsession (rev 0)
+++ trunk/httpd/httpd-2.4/modules/session/NMAKEsession 2014-01-27 12:43:33 UTC (rev 3202)
@@ -0,0 +1,68 @@
+# 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_session module makefile.
+#
+# Originally contributed by Mladen Turk <mturk redhat.com>
+#
+# ====================================================================
+#
+
+TARGET=DLL
+PROJECT = mod_session
+
+!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_session module for Apache"
+
+OBJECTS = \
+ $(WORKDIR)\mod_session.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_session.c)
+install: $(BUILDBIN)
+!ELSE
+install:
+ @echo Skipping $(PROJECT) build.
+!ENDIF
Added: trunk/httpd/httpd-2.4/modules/session/NMAKEsession_cookie
===================================================================
--- trunk/httpd/httpd-2.4/modules/session/NMAKEsession_cookie (rev 0)
+++ trunk/httpd/httpd-2.4/modules/session/NMAKEsession_cookie 2014-01-27 12:43:33 UTC (rev 3202)
@@ -0,0 +1,68 @@
+# 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_session_cookie module makefile.
+#
+# Originally contributed by Mladen Turk <mturk redhat.com>
+#
+# ====================================================================
+#
+
+TARGET=DLL
+PROJECT = mod_session_cookie
+
+!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_session_cookie module for Apache"
+
+OBJECTS = \
+ $(WORKDIR)\mod_session_cookie.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_session_cookie.c)
+install: $(BUILDBIN)
+!ELSE
+install:
+ @echo Skipping $(PROJECT) build.
+!ENDIF
Added: trunk/httpd/httpd-2.4/modules/session/NMAKEsession_crypto
===================================================================
--- trunk/httpd/httpd-2.4/modules/session/NMAKEsession_crypto (rev 0)
+++ trunk/httpd/httpd-2.4/modules/session/NMAKEsession_crypto 2014-01-27 12:43:33 UTC (rev 3202)
@@ -0,0 +1,68 @@
+# 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_session_crypto module makefile.
+#
+# Originally contributed by Mladen Turk <mturk redhat.com>
+#
+# ====================================================================
+#
+
+TARGET=DLL
+PROJECT = mod_session_crypto
+
+!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_session_crypto module for Apache"
+
+OBJECTS = \
+ $(WORKDIR)\mod_session_crypto.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_session_crypto.c)
+install: $(BUILDBIN)
+!ELSE
+install:
+ @echo Skipping $(PROJECT) build.
+!ENDIF
Added: trunk/httpd/httpd-2.4/modules/session/NMAKEsession_dbd
===================================================================
--- trunk/httpd/httpd-2.4/modules/session/NMAKEsession_dbd (rev 0)
+++ trunk/httpd/httpd-2.4/modules/session/NMAKEsession_dbd 2014-01-27 12:43:33 UTC (rev 3202)
@@ -0,0 +1,68 @@
+# 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_session_dbd module makefile.
+#
+# Originally contributed by Mladen Turk <mturk redhat.com>
+#
+# ====================================================================
+#
+
+TARGET=DLL
+PROJECT = mod_session_dbd
+
+!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_session_dbd module for Apache"
+
+OBJECTS = \
+ $(WORKDIR)\mod_session_dbd.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_session_dbd.c)
+install: $(BUILDBIN)
+!ELSE
+install:
+ @echo Skipping $(PROJECT) build.
+!ENDIF
Deleted: trunk/httpd/httpd-2.4/modules/slotmem/Makefile.in
===================================================================
--- trunk/httpd/httpd-2.4/modules/mod_slotmem/Makefile.in 2014-01-27 10:44:40 UTC (rev 3201)
+++ trunk/httpd/httpd-2.4/modules/slotmem/Makefile.in 2014-01-27 12:43:33 UTC (rev 3202)
@@ -1,3 +0,0 @@
-
-include $(top_srcdir)/build/special.mk
-
Modified: trunk/httpd/httpd-2.4/modules/slotmem/NMAKEmakefile
===================================================================
--- trunk/httpd/httpd-2.4/modules/mod_slotmem/NMAKEmakefile 2014-01-27 10:44:40 UTC (rev 3201)
+++ trunk/httpd/httpd-2.4/modules/slotmem/NMAKEmakefile 2014-01-27 12:43:33 UTC (rev 3202)
@@ -15,7 +15,7 @@
#
# ====================================================================
#
-# NMAKEmakefile Master HTTPD cluster module makefile.
+# NMAKEmakefile Master HTTPD slotmem module makefile.
#
# Originally contributed by Mladen Turk <mturk redhat.com>
#
@@ -31,7 +31,8 @@
!include <..\..\NMAKEhttpd.inc>
MODULES = \
- $(SRCDIR)\NMAKEslotmem\~
+ $(SRCDIR)\NMAKEslotmem_plain\~ \
+ $(SRCDIR)\NMAKEslotmem_shm\~
all: $(WORKDIR) $(MODULES)
@echo Building slotmem module ...
Deleted: trunk/httpd/httpd-2.4/modules/slotmem/NMAKEslotmem
===================================================================
--- trunk/httpd/httpd-2.4/modules/mod_slotmem/NMAKEslotmem 2014-01-27 10:44:40 UTC (rev 3201)
+++ trunk/httpd/httpd-2.4/modules/slotmem/NMAKEslotmem 2014-01-27 12:43:33 UTC (rev 3202)
@@ -1,69 +0,0 @@
-# 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.4/modules/slotmem/NMAKEslotmem_plain
===================================================================
--- trunk/httpd/httpd-2.4/modules/slotmem/NMAKEslotmem_plain (rev 0)
+++ trunk/httpd/httpd-2.4/modules/slotmem/NMAKEslotmem_plain 2014-01-27 12:43:33 UTC (rev 3202)
@@ -0,0 +1,68 @@
+# 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_slotmem_plain module makefile.
+#
+# Originally contributed by Mladen Turk <mturk redhat.com>
+#
+# ====================================================================
+#
+
+TARGET=DLL
+PROJECT = mod_slotmem_plain
+
+!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_slotmem_plain module for Apache"
+
+OBJECTS = \
+ $(WORKDIR)\mod_slotmem_plain.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_slotmem_plain.c)
+install: $(BUILDBIN)
+!ELSE
+install:
+ @echo Skipping $(PROJECT) build.
+!ENDIF
Added: trunk/httpd/httpd-2.4/modules/slotmem/NMAKEslotmem_shm
===================================================================
--- trunk/httpd/httpd-2.4/modules/slotmem/NMAKEslotmem_shm (rev 0)
+++ trunk/httpd/httpd-2.4/modules/slotmem/NMAKEslotmem_shm 2014-01-27 12:43:33 UTC (rev 3202)
@@ -0,0 +1,68 @@
+# 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_slotmem_shm module makefile.
+#
+# Originally contributed by Mladen Turk <mturk redhat.com>
+#
+# ====================================================================
+#
+
+TARGET=DLL
+PROJECT = mod_slotmem_shm
+
+!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_slotmem_shm module for Apache"
+
+OBJECTS = \
+ $(WORKDIR)\mod_slotmem_shm.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_slotmem_shm.c)
+install: $(BUILDBIN)
+!ELSE
+install:
+ @echo Skipping $(PROJECT) build.
+!ENDIF
Deleted: trunk/httpd/httpd-2.4/modules/slotmem/config5.m4
===================================================================
--- trunk/httpd/httpd-2.4/modules/mod_slotmem/config5.m4 2014-01-27 10:44:40 UTC (rev 3201)
+++ trunk/httpd/httpd-2.4/modules/slotmem/config5.m4 2014-01-27 12:43:33 UTC (rev 3202)
@@ -1,17 +0,0 @@
-dnl modules enabled in this directory by default
-
-APACHE_MODPATH_INIT(mod_slotmem)
-
-if test "$enable_mod_slotmem" = "shared"; then
- mod_slotmem_mods_enable=shared
-elif test "$enable_mod_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(slotmem, A slotmem provider for mod_cluster, $slotmem_objects, , $mod_slotmem_mods_enable)
-
-APACHE_MODPATH_FINISH
10 years, 11 months
- 1
- 0
JBoss Native SVN: r3201 - in trunk/httpd: httpd-2.4/modules and 3 other directories.
by jbossnative-commits＠lists.jboss.org
Author: jfrederic.clere(a)jboss.com
Date: 2014-01-27 05:44:40 -0500 (Mon, 27 Jan 2014)
New Revision: 3201
Added:
trunk/httpd/httpd-2.4/
trunk/httpd/httpd-2.4/modules/mod_cluster_slotmem/
trunk/httpd/httpd-2.4/modules/mod_cluster_slotmem/config5.m4
trunk/httpd/httpd-2.4/modules/mod_manager/config5.m4
trunk/httpd/httpd-2.4/modules/mod_slotmem/NMAKEslotmem
trunk/httpd/httpd-2.4/modules/mod_slotmem/config5.m4
Removed:
trunk/httpd/httpd-2.4/modules/mod_cluster_slotmem/config5.m4
trunk/httpd/httpd-2.4/modules/mod_manager/config5.m4
trunk/httpd/httpd-2.4/modules/mod_slotmem/NMAKEslotmem
trunk/httpd/httpd-2.4/modules/mod_slotmem/config5.m4
Log:
Add 2.4.x (just copy).
Deleted: trunk/httpd/httpd-2.4/modules/mod_cluster_slotmem/config5.m4
===================================================================
--- trunk/httpd/httpd-2.2/modules/mod_cluster_slotmem/config5.m4 2014-01-26 09:31:42 UTC (rev 3193)
+++ trunk/httpd/httpd-2.4/modules/mod_cluster_slotmem/config5.m4 2014-01-27 10:44:40 UTC (rev 3201)
@@ -1,17 +0,0 @@
-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
Copied: trunk/httpd/httpd-2.4/modules/mod_cluster_slotmem/config5.m4 (from rev 3197, trunk/httpd/httpd-2.2/modules/mod_cluster_slotmem/config5.m4)
===================================================================
--- trunk/httpd/httpd-2.4/modules/mod_cluster_slotmem/config5.m4 (rev 0)
+++ trunk/httpd/httpd-2.4/modules/mod_cluster_slotmem/config5.m4 2014-01-27 10:44:40 UTC (rev 3201)
@@ -0,0 +1,15 @@
+dnl modules enabled in this directory by default
+
+APACHE_MODPATH_INIT(mod_cluster_slotmem)
+
+if test "$enable_mod_cluster_slotmem" = "no"; then
+ mod_cluster_slotmem_mods_enable=no
+else
+ mod_cluster_slotmem_mods_enable=yes
+fi
+
+slotmem_objects="mod_sharedmem.lo sharedmem_util.lo"
+
+APACHE_MODULE(cluster_slotmem, A slotmem provider for mod_cluster, $slotmem_objects, , $mod_cluster_slotmem_mods_enable)
+
+APACHE_MODPATH_FINISH
Deleted: trunk/httpd/httpd-2.4/modules/mod_manager/config5.m4
===================================================================
--- trunk/httpd/httpd-2.2/modules/mod_manager/config5.m4 2014-01-16 02:39:06 UTC (rev 3168)
+++ trunk/httpd/httpd-2.4/modules/mod_manager/config5.m4 2014-01-27 10:44:40 UTC (rev 3201)
@@ -1,13 +0,0 @@
-dnl modules enabled in this directory by default
-
-APACHE_MODPATH_INIT(mod_manager)
-
-manager_objects="mod_manager.lo balancer.lo context.lo host.lo node.lo sessionid.lo domain.lo jgroupsid.lo"
-
-APACHE_MODULE(manager, Manager for mod_cluster, $manager_objects, , no)
-
-if test "$manager_enable" != "no"; then
- APR_ADDTO(INCLUDES, [-I\$(top_srcdir)/../proxy/])
-fi
-
-APACHE_MODPATH_FINISH
Copied: trunk/httpd/httpd-2.4/modules/mod_manager/config5.m4 (from rev 3196, trunk/httpd/httpd-2.2/modules/mod_manager/config5.m4)
===================================================================
--- trunk/httpd/httpd-2.4/modules/mod_manager/config5.m4 (rev 0)
+++ trunk/httpd/httpd-2.4/modules/mod_manager/config5.m4 2014-01-27 10:44:40 UTC (rev 3201)
@@ -0,0 +1,19 @@
+dnl modules enabled in this directory by default
+
+APACHE_MODPATH_INIT(mod_manager)
+
+if test "$enable_mod_manager" = "no"; then
+ mod_manager_mods_enable=no
+else
+ mod_manager_mods_enable=yes
+fi
+
+manager_objects="mod_manager.lo balancer.lo context.lo host.lo node.lo sessionid.lo domain.lo jgroupsid.lo"
+
+APACHE_MODULE(manager, Manager for mod_cluster, $manager_objects, , $mod_manager_mods_enable)
+
+if test "$manager_enable" != "no"; then
+ APR_ADDTO(INCLUDES, [-I\$(top_srcdir)/../proxy/])
+fi
+
+APACHE_MODPATH_FINISH
Deleted: trunk/httpd/httpd-2.4/modules/mod_slotmem/NMAKEslotmem
===================================================================
--- trunk/httpd/httpd-2.2/modules/mod_slotmem/NMAKEslotmem 2014-01-16 02:39:06 UTC (rev 3168)
+++ trunk/httpd/httpd-2.4/modules/mod_slotmem/NMAKEslotmem 2014-01-27 10:44:40 UTC (rev 3201)
@@ -1,69 +0,0 @@
-# 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_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_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
Copied: trunk/httpd/httpd-2.4/modules/mod_slotmem/NMAKEslotmem (from rev 3190, trunk/httpd/httpd-2.2/modules/mod_slotmem/NMAKEslotmem)
===================================================================
--- trunk/httpd/httpd-2.4/modules/mod_slotmem/NMAKEslotmem (rev 0)
+++ trunk/httpd/httpd-2.4/modules/mod_slotmem/NMAKEslotmem 2014-01-27 10:44:40 UTC (rev 3201)
@@ -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
Deleted: trunk/httpd/httpd-2.4/modules/mod_slotmem/config5.m4
===================================================================
--- trunk/httpd/httpd-2.2/modules/mod_slotmem/config5.m4 2014-01-16 02:39:06 UTC (rev 3168)
+++ trunk/httpd/httpd-2.4/modules/mod_slotmem/config5.m4 2014-01-27 10:44:40 UTC (rev 3201)
@@ -1,9 +0,0 @@
-dnl modules enabled in this directory by default
-
-APACHE_MODPATH_INIT(mod_slotmem)
-
-slotmem_objects="mod_sharedmem.lo sharedmem_util.lo"
-
-APACHE_MODULE(slotmem, A slotmem provider for mod_cluster, $slotmem_objects, , no)
-
-APACHE_MODPATH_FINISH
Copied: trunk/httpd/httpd-2.4/modules/mod_slotmem/config5.m4 (from rev 3192, trunk/httpd/httpd-2.2/modules/mod_slotmem/config5.m4)
===================================================================
--- trunk/httpd/httpd-2.4/modules/mod_slotmem/config5.m4 (rev 0)
+++ trunk/httpd/httpd-2.4/modules/mod_slotmem/config5.m4 2014-01-27 10:44:40 UTC (rev 3201)
@@ -0,0 +1,17 @@
+dnl modules enabled in this directory by default
+
+APACHE_MODPATH_INIT(mod_slotmem)
+
+if test "$enable_mod_slotmem" = "shared"; then
+ mod_slotmem_mods_enable=shared
+elif test "$enable_mod_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(slotmem, A slotmem provider for mod_cluster, $slotmem_objects, , $mod_slotmem_mods_enable)
+
+APACHE_MODPATH_FINISH
10 years, 11 months
- 1
- 0
JBoss Native SVN: r3200 - trunk/build/unix.
by jbossnative-commits＠lists.jboss.org
Author: jfrederic.clere(a)jboss.com
Date: 2014-01-27 04:44:39 -0500 (Mon, 27 Jan 2014)
New Revision: 3200
Modified:
trunk/build/unix/buildbin.mod_cluster.sh
Log:
Ajust the new mod_authz_host directives.
Modified: trunk/build/unix/buildbin.mod_cluster.sh
===================================================================
--- trunk/build/unix/buildbin.mod_cluster.sh 2014-01-27 06:45:56 UTC (rev 3199)
+++ trunk/build/unix/buildbin.mod_cluster.sh 2014-01-27 09:44:39 UTC (rev 3200)
@@ -248,7 +248,9 @@
EOF
fi
- cat >> "${RPM_BUILD_ROOT}/opt/jboss/httpd/httpd/conf/httpd.conf" <<EOF
+ case ${httpd_version} in
+ 2.2*)
+ cat >> "${RPM_BUILD_ROOT}/opt/jboss/httpd/httpd/conf/httpd.conf" <<EOF
# MOD_CLUSTER_ADDS
# Adjust to you hostname and subnet.
<IfModule manager_module>
@@ -279,6 +281,37 @@
</VirtualHost>
</IfModule>
EOF
+ ;;
+ 2.4*)
+ cat >> "${RPM_BUILD_ROOT}/opt/jboss/httpd/httpd/conf/httpd.conf" <<EOF
+# MOD_CLUSTER_ADDS
+# Adjust to you hostname and subnet.
+<IfModule manager_module>
+ Listen 127.0.0.1:6666
+ ManagerBalancerName mycluster
+ <VirtualHost 127.0.0.1:6666>
+ <Location />
+ Require ip 127.0.0
+ </Location>
+
+ KeepAliveTimeout 300
+ MaxKeepAliveRequests 0
+ #ServerAdvertise on http://@IP@:6666
+ AdvertiseFrequency 5
+ #AdvertiseSecurityKey secret
+ #AdvertiseGroup @ADVIP@:23364
+ EnableMCPMReceive
+
+ <Location /mod_cluster_manager>
+ SetHandler mod_cluster-manager
+ Require ip 127.0.0
+ </Location>
+
+ </VirtualHost>
+</IfModule>
+EOF
+ ;;
+ esac
echo "Done"
;;
esac
10 years, 11 months
- 1
- 0