JBoss Native SVN: r3249 - trunk/httpd/httpd-2.4/modules/aaa.
by jbossnative-commits＠lists.jboss.org
Author: jfrederic.clere(a)jboss.com
Date: 2014-01-31 10:44:37 -0500 (Fri, 31 Jan 2014)
New Revision: 3249
Modified:
trunk/httpd/httpd-2.4/modules/aaa/NMAKEauthncore
trunk/httpd/httpd-2.4/modules/aaa/NMAKEauthzcore
Log:
one more typo.
Modified: trunk/httpd/httpd-2.4/modules/aaa/NMAKEauthncore
===================================================================
--- trunk/httpd/httpd-2.4/modules/aaa/NMAKEauthncore 2014-01-31 14:30:08 UTC (rev 3248)
+++ trunk/httpd/httpd-2.4/modules/aaa/NMAKEauthncore 2014-01-31 15:44:37 UTC (rev 3249)
@@ -23,7 +23,7 @@
#
TARGET=DLL
-PROJECT = "mod_authn_core
+PROJECT = mod_authn_core
!IF !DEFINED(SRCDIR) || "$(SRCDIR)" == ""
SRCDIR = .
@@ -47,7 +47,7 @@
RCFLAGS = $(RCFLAGS) /d BIN_NAME="$(PROJECT).so" /d LONG_NAME="authn_core_module for Apache"
OBJECTS = \
- $(WORKDIR)\"mod_authn_core.obj
+ $(WORKDIR)\mod_authn_core.obj
{$(SRCDIR)}.c{$(WORKDIR)}.obj:
$(CC) $(CFLAGS) $(INCLUDES) $(PDBFLAGS) $<
Modified: trunk/httpd/httpd-2.4/modules/aaa/NMAKEauthzcore
===================================================================
--- trunk/httpd/httpd-2.4/modules/aaa/NMAKEauthzcore 2014-01-31 14:30:08 UTC (rev 3248)
+++ trunk/httpd/httpd-2.4/modules/aaa/NMAKEauthzcore 2014-01-31 15:44:37 UTC (rev 3249)
@@ -23,7 +23,7 @@
#
TARGET=DLL
-PROJECT = "mod_authz_core
+PROJECT = mod_authz_core
!IF !DEFINED(SRCDIR) || "$(SRCDIR)" == ""
SRCDIR = .
@@ -47,7 +47,7 @@
RCFLAGS = $(RCFLAGS) /d BIN_NAME="$(PROJECT).so" /d LONG_NAME="authz_core_module for Apache"
OBJECTS = \
- $(WORKDIR)\"mod_authz_core.obj
+ $(WORKDIR)\mod_authz_core.obj
{$(SRCDIR)}.c{$(WORKDIR)}.obj:
$(CC) $(CFLAGS) $(INCLUDES) $(PDBFLAGS) $<
10 years, 10 months
JBoss Native SVN: r3248 - trunk/httpd/httpd-2.4/modules/aaa.
by jbossnative-commits＠lists.jboss.org
Author: jfrederic.clere(a)jboss.com
Date: 2014-01-31 09:30:08 -0500 (Fri, 31 Jan 2014)
New Revision: 3248
Modified:
trunk/httpd/httpd-2.4/modules/aaa/NMAKEmakefile
Log:
typo :-(
Modified: trunk/httpd/httpd-2.4/modules/aaa/NMAKEmakefile
===================================================================
--- trunk/httpd/httpd-2.4/modules/aaa/NMAKEmakefile 2014-01-31 12:09:58 UTC (rev 3247)
+++ trunk/httpd/httpd-2.4/modules/aaa/NMAKEmakefile 2014-01-31 14:30:08 UTC (rev 3248)
@@ -41,9 +41,9 @@
$(SRCDIR)\NMAKEauthzdbm\~ \
$(SRCDIR)\NMAKEauthzgroupfile\~ \
$(SRCDIR)\NMAKEauthzhost\~ \
- $(SRCDIR)\NMAKEauthzuser\~
- $(SRCDIR)\NMAKEaccesscompat\~
- $(SRCDIR)\NMAKEauthzcore\~
+ $(SRCDIR)\NMAKEauthzuser\~ \
+ $(SRCDIR)\NMAKEaccesscompat\~ \
+ $(SRCDIR)\NMAKEauthzcore\~ \
$(SRCDIR)\NMAKEauthncore\~
all: $(WORKDIR) $(MODULES)
10 years, 10 months
JBoss Native SVN: r3247 - in trunk: httpd/httpd-2.4/installer and 1 other directories.
by jbossnative-commits＠lists.jboss.org
Author: jfrederic.clere(a)jboss.com
Date: 2014-01-31 07:09:58 -0500 (Fri, 31 Jan 2014)
New Revision: 3247
Added:
trunk/httpd/httpd-2.4/modules/aaa/NMAKEaccesscompat
trunk/httpd/httpd-2.4/modules/aaa/NMAKEauthncore
trunk/httpd/httpd-2.4/modules/aaa/NMAKEauthzcore
Modified:
trunk/build/unix/buildbin.mod_cluster.windows.sh
trunk/httpd/httpd-2.4/installer/installconf.awk
trunk/httpd/httpd-2.4/modules/aaa/NMAKEmakefile
Log:
Add missing modules and adjust install.
Modified: trunk/build/unix/buildbin.mod_cluster.windows.sh
===================================================================
--- trunk/build/unix/buildbin.mod_cluster.windows.sh 2014-01-31 08:57:28 UTC (rev 3246)
+++ trunk/build/unix/buildbin.mod_cluster.windows.sh 2014-01-31 12:09:58 UTC (rev 3247)
@@ -117,7 +117,7 @@
case $build_version in
1.0.*)
;;
- 1.1.*|1.2.*)
+ 1.1.*|1.2.*|1.3.*)
cat >> "${win_output_loc}/conf/default/httpd.conf.in" <<EOF
LoadModule proxy_module modules/mod_proxy.so
Modified: trunk/httpd/httpd-2.4/installer/installconf.awk
===================================================================
--- trunk/httpd/httpd-2.4/installer/installconf.awk 2014-01-31 08:57:28 UTC (rev 3246)
+++ trunk/httpd/httpd-2.4/installer/installconf.awk 2014-01-31 12:09:58 UTC (rev 3247)
@@ -90,6 +90,7 @@
print "#LoadModule authn_dbm_module modules/mod_authn_dbm.so" > dstfl;
print "LoadModule authn_default_module modules/mod_authn_default.so" > dstfl;
print "LoadModule authn_file_module modules/mod_authn_file.so" > dstfl;
+ print "LoadModule authz_core_module modules/mod_authz_core.so" > dstfl;
print "#LoadModule authnz_ldap_module modules/mod_authnz_ldap.so" > dstfl;
print "#LoadModule authz_dbm_module modules/mod_authz_dbm.so" > dstfl;
print "LoadModule authz_default_module modules/mod_authz_default.so" > dstfl;
@@ -97,6 +98,7 @@
print "LoadModule authz_host_module modules/mod_authz_host.so" > dstfl;
print "#LoadModule authz_owner_module modules/mod_authz_owner.so" > dstfl;
print "LoadModule authz_user_module modules/mod_authz_user.so" > dstfl;
+ print "LoadModule access_compat_module modules/mod_access_compat.so" > dstfl;
print "LoadModule autoindex_module modules/mod_autoindex.so" > dstfl;
print "#LoadModule cache_module modules/mod_cache.so" > dstfl;
print "#LoadModule cern_meta_module modules/mod_cern_meta.so" > dstfl;
Added: trunk/httpd/httpd-2.4/modules/aaa/NMAKEaccesscompat
===================================================================
--- trunk/httpd/httpd-2.4/modules/aaa/NMAKEaccesscompat (rev 0)
+++ trunk/httpd/httpd-2.4/modules/aaa/NMAKEaccesscompat 2014-01-31 12:09:58 UTC (rev 3247)
@@ -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 authz_host module makefile.
+#
+# Originally contributed by Mladen Turk <mturk redhat.com>
+#
+# ====================================================================
+#
+
+TARGET=DLL
+PROJECT = mod_access_compat
+
+!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) -DAAA_DECLARE_EXPORT
+
+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="access_compat_module for Apache"
+
+OBJECTS = \
+ $(WORKDIR)\mod_access_compat.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/aaa/NMAKEauthncore
===================================================================
--- trunk/httpd/httpd-2.4/modules/aaa/NMAKEauthncore (rev 0)
+++ trunk/httpd/httpd-2.4/modules/aaa/NMAKEauthncore 2014-01-31 12:09:58 UTC (rev 3247)
@@ -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 authn_core module makefile.
+#
+# Originally contributed by Mladen Turk <mturk redhat.com>
+#
+# ====================================================================
+#
+
+TARGET=DLL
+PROJECT = "mod_authn_core
+
+!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) -DAAA_DECLARE_EXPORT
+
+INCLUDES = -I$(SRCDIR) -I$(BUILDINC) -I..\database
+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="authn_core_module for Apache"
+
+OBJECTS = \
+ $(WORKDIR)\"mod_authn_core.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/aaa/NMAKEauthzcore
===================================================================
--- trunk/httpd/httpd-2.4/modules/aaa/NMAKEauthzcore (rev 0)
+++ trunk/httpd/httpd-2.4/modules/aaa/NMAKEauthzcore 2014-01-31 12:09:58 UTC (rev 3247)
@@ -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 authz_host module makefile.
+#
+# Originally contributed by Mladen Turk <mturk redhat.com>
+#
+# ====================================================================
+#
+
+TARGET=DLL
+PROJECT = "mod_authz_core
+
+!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) -DAAA_DECLARE_EXPORT
+
+INCLUDES = -I$(SRCDIR) -I$(BUILDINC) -I..\database
+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="authz_core_module for Apache"
+
+OBJECTS = \
+ $(WORKDIR)\"mod_authz_core.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/aaa/NMAKEmakefile
===================================================================
--- trunk/httpd/httpd-2.4/modules/aaa/NMAKEmakefile 2014-01-31 08:57:28 UTC (rev 3246)
+++ trunk/httpd/httpd-2.4/modules/aaa/NMAKEmakefile 2014-01-31 12:09:58 UTC (rev 3247)
@@ -42,6 +42,9 @@
$(SRCDIR)\NMAKEauthzgroupfile\~ \
$(SRCDIR)\NMAKEauthzhost\~ \
$(SRCDIR)\NMAKEauthzuser\~
+ $(SRCDIR)\NMAKEaccesscompat\~
+ $(SRCDIR)\NMAKEauthzcore\~
+ $(SRCDIR)\NMAKEauthncore\~
all: $(WORKDIR) $(MODULES)
@echo Building aaa modules ...
10 years, 10 months
JBoss Native SVN: r3246 - trunk/httpd/httpd-2.4/modules/cache.
by jbossnative-commits＠lists.jboss.org
Author: jfrederic.clere(a)jboss.com
Date: 2014-01-31 03:57:28 -0500 (Fri, 31 Jan 2014)
New Revision: 3246
Modified:
trunk/httpd/httpd-2.4/modules/cache/NMAKEmakefile
Log:
adjust makefile name.
Modified: trunk/httpd/httpd-2.4/modules/cache/NMAKEmakefile
===================================================================
--- trunk/httpd/httpd-2.4/modules/cache/NMAKEmakefile 2014-01-30 21:19:21 UTC (rev 3245)
+++ trunk/httpd/httpd-2.4/modules/cache/NMAKEmakefile 2014-01-31 08:57:28 UTC (rev 3246)
@@ -37,7 +37,7 @@
$(SRCDIR)\NMAKEsocachememcache\~ \
$(SRCDIR)\NMAKEcachesocache\~ \
$(SRCDIR)\NMAKEsocachedbm\~ \
- $(SRCDIR)\NMAKEsocache_dc\~
+ $(SRCDIR)\NMAKEsocachedc\~
all: $(WORKDIR) $(MODULES)
@echo Building cache modules ...
10 years, 10 months
JBoss Native SVN: r3245 - in trunk/httpd/httpd-2.4/modules: session and 1 other directory.
by jbossnative-commits＠lists.jboss.org
Author: jfrederic.clere(a)jboss.com
Date: 2014-01-30 16:19:21 -0500 (Thu, 30 Jan 2014)
New Revision: 3245
Modified:
trunk/httpd/httpd-2.4/modules/cache/NMAKEcachesocache
trunk/httpd/httpd-2.4/modules/session/NMAKEsession_crypto
trunk/httpd/httpd-2.4/modules/session/NMAKEsession_dbd
Log:
Arrange the modules.
Modified: trunk/httpd/httpd-2.4/modules/cache/NMAKEcachesocache
===================================================================
--- trunk/httpd/httpd-2.4/modules/cache/NMAKEcachesocache 2014-01-30 16:36:23 UTC (rev 3244)
+++ trunk/httpd/httpd-2.4/modules/cache/NMAKEcachesocache 2014-01-30 21:19:21 UTC (rev 3245)
@@ -47,8 +47,7 @@
RCFLAGS = $(RCFLAGS) /d BIN_NAME="$(PROJECT).so" /d LONG_NAME="cache_module for Apache"
OBJECTS = \
- $(WORKDIR)\mod_cache_socache.obj \
- $(WORKDIR)\cache_util.obj
+ $(WORKDIR)\mod_cache_socache.obj
{$(SRCDIR)}.c{$(WORKDIR)}.obj:
$(CC) $(CFLAGS) $(INCLUDES) $(PDBFLAGS) $<
Modified: trunk/httpd/httpd-2.4/modules/session/NMAKEsession_crypto
===================================================================
--- trunk/httpd/httpd-2.4/modules/session/NMAKEsession_crypto 2014-01-30 16:36:23 UTC (rev 3244)
+++ trunk/httpd/httpd-2.4/modules/session/NMAKEsession_crypto 2014-01-30 21:19:21 UTC (rev 3245)
@@ -32,8 +32,8 @@
!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)
+LDIRS = /libpath:"$(BUILDLIB)" /libpath:"$(WORKDIR)"
+LFLAGS = $(LFLAGS) user32.lib psapi.lib gdi32.lib shlwapi.lib wldap32.lib ole32.lib $(LIBAPR) $(LIBAPU) $(LIBHTTPD) mod_session.lib
CFLAGS = $(CFLAGS) -DSESSION_DECLARE_EXPORT
INCLUDES = -I$(SRCDIR) -I$(BUILDINC) -I../proxy
Modified: trunk/httpd/httpd-2.4/modules/session/NMAKEsession_dbd
===================================================================
--- trunk/httpd/httpd-2.4/modules/session/NMAKEsession_dbd 2014-01-30 16:36:23 UTC (rev 3244)
+++ trunk/httpd/httpd-2.4/modules/session/NMAKEsession_dbd 2014-01-30 21:19:21 UTC (rev 3245)
@@ -32,8 +32,8 @@
!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)
+LDIRS = /libpath:"$(BUILDLIB)" /libpath:"$(WORKDIR)"
+LFLAGS = $(LFLAGS) user32.lib psapi.lib gdi32.lib shlwapi.lib wldap32.lib ole32.lib $(LIBAPR) $(LIBAPU) $(LIBHTTPD) mod_session.lib
CFLAGS = $(CFLAGS) -DSESSION_DECLARE_EXPORT
INCLUDES = -I$(SRCDIR) -I$(BUILDINC) -I../proxy -I../database
10 years, 10 months
JBoss Native SVN: r3244 - in trunk/httpd/httpd-2.4/modules: cluster and 1 other directories.
by jbossnative-commits＠lists.jboss.org
Author: jfrederic.clere(a)jboss.com
Date: 2014-01-30 11:36:23 -0500 (Thu, 30 Jan 2014)
New Revision: 3244
Modified:
trunk/httpd/httpd-2.4/modules/cache/NMAKEcachesocache
trunk/httpd/httpd-2.4/modules/cluster/NMAKEheartmonitor
trunk/httpd/httpd-2.4/modules/session/NMAKEsession_dbd
Log:
some more missing stuff.
Modified: trunk/httpd/httpd-2.4/modules/cache/NMAKEcachesocache
===================================================================
--- trunk/httpd/httpd-2.4/modules/cache/NMAKEcachesocache 2014-01-30 15:47:33 UTC (rev 3243)
+++ trunk/httpd/httpd-2.4/modules/cache/NMAKEcachesocache 2014-01-30 16:36:23 UTC (rev 3244)
@@ -32,8 +32,8 @@
!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)
+LDIRS = /libpath:"$(BUILDLIB)" /libpath:"$(WORKDIR)"
+LFLAGS = $(LFLAGS) user32.lib psapi.lib gdi32.lib shlwapi.lib wldap32.lib ole32.lib $(LIBAPR) $(LIBAPU) $(LIBHTTPD) mod_cache.lib
CFLAGS = $(CFLAGS) -DCACHE_DECLARE_EXPORT -DMOD_CACHE_EXPORTS
INCLUDES = -I$(SRCDIR) -I$(BUILDINC)
Modified: trunk/httpd/httpd-2.4/modules/cluster/NMAKEheartmonitor
===================================================================
--- trunk/httpd/httpd-2.4/modules/cluster/NMAKEheartmonitor 2014-01-30 15:47:33 UTC (rev 3243)
+++ trunk/httpd/httpd-2.4/modules/cluster/NMAKEheartmonitor 2014-01-30 16:36:23 UTC (rev 3244)
@@ -32,11 +32,11 @@
!include <..\..\NMAKEcommon.inc>
!include <..\..\NMAKEhttpd.inc>
-LDIRS = /libpath:"$(BUILDLIB)"
+LDIRS = /libpath:"$(BUILDLIB)" /libpath:"../core/$(WORKDIR)"
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
+INCLUDES = -I$(SRCDIR) -I$(BUILDINC) -I../proxy -I../core
PDBFLAGS = -Fo$(WORKDIR)\ -Fd$(WORKDIR)\$(PROJECT)-src
BUILDBIN = $(WORKDIR)\$(PROJECT).so
Modified: trunk/httpd/httpd-2.4/modules/session/NMAKEsession_dbd
===================================================================
--- trunk/httpd/httpd-2.4/modules/session/NMAKEsession_dbd 2014-01-30 15:47:33 UTC (rev 3243)
+++ trunk/httpd/httpd-2.4/modules/session/NMAKEsession_dbd 2014-01-30 16:36:23 UTC (rev 3244)
@@ -36,7 +36,7 @@
LFLAGS = $(LFLAGS) user32.lib psapi.lib gdi32.lib shlwapi.lib wldap32.lib ole32.lib $(LIBAPR) $(LIBAPU) $(LIBHTTPD)
CFLAGS = $(CFLAGS) -DSESSION_DECLARE_EXPORT
-INCLUDES = -I$(SRCDIR) -I$(BUILDINC) -I../proxy
+INCLUDES = -I$(SRCDIR) -I$(BUILDINC) -I../proxy -I../database
PDBFLAGS = -Fo$(WORKDIR)\ -Fd$(WORKDIR)\$(PROJECT)-src
BUILDBIN = $(WORKDIR)\$(PROJECT).so
10 years, 10 months
JBoss Native SVN: r3243 - in trunk/httpd/httpd-2.4/modules: session and 1 other directory.
by jbossnative-commits＠lists.jboss.org
Author: jfrederic.clere(a)jboss.com
Date: 2014-01-30 10:47:33 -0500 (Thu, 30 Jan 2014)
New Revision: 3243
Modified:
trunk/httpd/httpd-2.4/modules/cluster/NMAKEheartbeat
trunk/httpd/httpd-2.4/modules/session/NMAKEsession_cookie
Log:
use /libpath: to find the other module.
Modified: trunk/httpd/httpd-2.4/modules/cluster/NMAKEheartbeat
===================================================================
--- trunk/httpd/httpd-2.4/modules/cluster/NMAKEheartbeat 2014-01-30 15:18:23 UTC (rev 3242)
+++ trunk/httpd/httpd-2.4/modules/cluster/NMAKEheartbeat 2014-01-30 15:47:33 UTC (rev 3243)
@@ -32,7 +32,7 @@
!include <..\..\NMAKEcommon.inc>
!include <..\..\NMAKEhttpd.inc>
-LDIRS = /libpath:"$(BUILDLIB)"
+LDIRS = /libpath:"$(BUILDLIB)" /libpath:"../core/$(WORKDIR)"
LFLAGS = $(LFLAGS) user32.lib psapi.lib gdi32.lib shlwapi.lib wldap32.lib ole32.lib $(LIBAPR) $(LIBAPU) $(LIBHTTPD) mod_watchdog.lib
CFLAGS = $(CFLAGS) -DAP_WD_DECLARE_EXPORT
Modified: trunk/httpd/httpd-2.4/modules/session/NMAKEsession_cookie
===================================================================
--- trunk/httpd/httpd-2.4/modules/session/NMAKEsession_cookie 2014-01-30 15:18:23 UTC (rev 3242)
+++ trunk/httpd/httpd-2.4/modules/session/NMAKEsession_cookie 2014-01-30 15:47:33 UTC (rev 3243)
@@ -32,7 +32,7 @@
!include <..\..\NMAKEcommon.inc>
!include <..\..\NMAKEhttpd.inc>
-LDIRS = /libpath:"$(BUILDLIB)"
+LDIRS = /libpath:"$(BUILDLIB)" /libpath:"$(WORKDIR)"
LFLAGS = $(LFLAGS) user32.lib psapi.lib gdi32.lib shlwapi.lib wldap32.lib ole32.lib $(LIBAPR) $(LIBAPU) $(LIBHTTPD) mod_session.lib
CFLAGS = $(CFLAGS) -DSESSION_DECLARE_EXPORT
10 years, 10 months
JBoss Native SVN: r3242 - trunk/httpd/httpd-2.4/modules/cache.
by jbossnative-commits＠lists.jboss.org
Author: jfrederic.clere(a)jboss.com
Date: 2014-01-30 10:18:23 -0500 (Thu, 30 Jan 2014)
New Revision: 3242
Modified:
trunk/httpd/httpd-2.4/modules/cache/NMAKEcachesocache
Log:
another missing object.
Modified: trunk/httpd/httpd-2.4/modules/cache/NMAKEcachesocache
===================================================================
--- trunk/httpd/httpd-2.4/modules/cache/NMAKEcachesocache 2014-01-30 14:46:24 UTC (rev 3241)
+++ trunk/httpd/httpd-2.4/modules/cache/NMAKEcachesocache 2014-01-30 15:18:23 UTC (rev 3242)
@@ -47,7 +47,8 @@
RCFLAGS = $(RCFLAGS) /d BIN_NAME="$(PROJECT).so" /d LONG_NAME="cache_module for Apache"
OBJECTS = \
- $(WORKDIR)\mod_cache_socache.obj
+ $(WORKDIR)\mod_cache_socache.obj \
+ $(WORKDIR)\cache_util.obj
{$(SRCDIR)}.c{$(WORKDIR)}.obj:
$(CC) $(CFLAGS) $(INCLUDES) $(PDBFLAGS) $<
10 years, 10 months
JBoss Native SVN: r3241 - in trunk/httpd/httpd-2.4/modules: session and 1 other directory.
by jbossnative-commits＠lists.jboss.org
Author: jfrederic.clere(a)jboss.com
Date: 2014-01-30 09:46:24 -0500 (Thu, 30 Jan 2014)
New Revision: 3241
Modified:
trunk/httpd/httpd-2.4/modules/cluster/NMAKEheartbeat
trunk/httpd/httpd-2.4/modules/session/NMAKEsession_cookie
Log:
Add dependencies of other modules.
Modified: trunk/httpd/httpd-2.4/modules/cluster/NMAKEheartbeat
===================================================================
--- trunk/httpd/httpd-2.4/modules/cluster/NMAKEheartbeat 2014-01-30 13:10:59 UTC (rev 3240)
+++ trunk/httpd/httpd-2.4/modules/cluster/NMAKEheartbeat 2014-01-30 14:46:24 UTC (rev 3241)
@@ -33,7 +33,7 @@
!include <..\..\NMAKEhttpd.inc>
LDIRS = /libpath:"$(BUILDLIB)"
-LFLAGS = $(LFLAGS) user32.lib psapi.lib gdi32.lib shlwapi.lib wldap32.lib ole32.lib $(LIBAPR) $(LIBAPU) $(LIBHTTPD)
+LFLAGS = $(LFLAGS) user32.lib psapi.lib gdi32.lib shlwapi.lib wldap32.lib ole32.lib $(LIBAPR) $(LIBAPU) $(LIBHTTPD) mod_watchdog.lib
CFLAGS = $(CFLAGS) -DAP_WD_DECLARE_EXPORT
INCLUDES = -I$(SRCDIR) -I$(BUILDINC) -I../proxy -I../core
Modified: trunk/httpd/httpd-2.4/modules/session/NMAKEsession_cookie
===================================================================
--- trunk/httpd/httpd-2.4/modules/session/NMAKEsession_cookie 2014-01-30 13:10:59 UTC (rev 3240)
+++ trunk/httpd/httpd-2.4/modules/session/NMAKEsession_cookie 2014-01-30 14:46:24 UTC (rev 3241)
@@ -33,7 +33,7 @@
!include <..\..\NMAKEhttpd.inc>
LDIRS = /libpath:"$(BUILDLIB)"
-LFLAGS = $(LFLAGS) user32.lib psapi.lib gdi32.lib shlwapi.lib wldap32.lib ole32.lib $(LIBAPR) $(LIBAPU) $(LIBHTTPD)
+LFLAGS = $(LFLAGS) user32.lib psapi.lib gdi32.lib shlwapi.lib wldap32.lib ole32.lib $(LIBAPR) $(LIBAPU) $(LIBHTTPD) mod_session.lib
CFLAGS = $(CFLAGS) -DSESSION_DECLARE_EXPORT
INCLUDES = -I$(SRCDIR) -I$(BUILDINC) -I../proxy
10 years, 10 months
JBoss Native SVN: r3240 - trunk/httpd/httpd-2.4.
by jbossnative-commits＠lists.jboss.org
Author: jfrederic.clere(a)jboss.com
Date: 2014-01-30 08:10:59 -0500 (Thu, 30 Jan 2014)
New Revision: 3240
Modified:
trunk/httpd/httpd-2.4/NMAKElibhttpd
Log:
useless includes.
Modified: trunk/httpd/httpd-2.4/NMAKElibhttpd
===================================================================
--- trunk/httpd/httpd-2.4/NMAKElibhttpd 2014-01-30 12:58:07 UTC (rev 3239)
+++ trunk/httpd/httpd-2.4/NMAKElibhttpd 2014-01-30 13:10:59 UTC (rev 3240)
@@ -93,8 +93,6 @@
$(SRCDIR)\include\os.h \
$(SRCDIR)\include\ap_config_layout.h \
$(SRCDIR)\include\mod_core.h \
- $(SRCDIR)\modules\dav\main\mod_dav.h \
- $(SRCDIR)\modules\filters\mod_include.h \
$(SRCDIR)\include\mod_proxy.h \
$(SRCDIR)\include\mod_so.h \
$(SRCDIR)\include\mod_cgi.h \
10 years, 10 months