JBoss Native SVN: r3332 - trunk/build/unix.
by jbossnative-commits＠lists.jboss.org
Author: jfrederic.clere(a)jboss.com
Date: 2014-08-19 05:22:53 -0400 (Tue, 19 Aug 2014)
New Revision: 3332
Modified:
trunk/build/unix/buildsrc.mod_cluster.sh
Log:
try to debug a weird windows core problem...
Modified: trunk/build/unix/buildsrc.mod_cluster.sh
===================================================================
--- trunk/build/unix/buildsrc.mod_cluster.sh 2014-08-19 07:42:50 UTC (rev 3331)
+++ trunk/build/unix/buildsrc.mod_cluster.sh 2014-08-19 09:22:53 UTC (rev 3332)
@@ -127,6 +127,7 @@
if [ -d ${dirnmake} ]; then
#svn export --force ${dirnmake} ${dirsources}
echo "svn export --force http://anonsvn.jboss.org/repos/jbossnative/trunk/httpd/${dirhttpd} ${dirsources}"
+ svn --version
svn export --force http://anonsvn.jboss.org/repos/jbossnative/trunk/httpd/${dirhttpd} ${dirsources}
if [ $? -ne 0 ]; then
#echo "svn export --force ${dirnmake} ${dirsources} FAILED"
11 years, 1 month
- 1
- 0
JBoss Native SVN: r3331 - trunk/build/unix.
by jbossnative-commits＠lists.jboss.org
Author: jfrederic.clere(a)jboss.com
Date: 2014-08-19 03:42:50 -0400 (Tue, 19 Aug 2014)
New Revision: 3331
Modified:
trunk/build/unix/buildsrc.mod_cluster.sh
Log:
Add a trace...
Modified: trunk/build/unix/buildsrc.mod_cluster.sh
===================================================================
--- trunk/build/unix/buildsrc.mod_cluster.sh 2014-08-19 07:03:47 UTC (rev 3330)
+++ trunk/build/unix/buildsrc.mod_cluster.sh 2014-08-19 07:42:50 UTC (rev 3331)
@@ -126,6 +126,7 @@
esac
if [ -d ${dirnmake} ]; then
#svn export --force ${dirnmake} ${dirsources}
+ echo "svn export --force http://anonsvn.jboss.org/repos/jbossnative/trunk/httpd/${dirhttpd} ${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"
11 years, 1 month
- 1
- 0
JBoss Native SVN: r3330 - trunk/httpd/httpd-2.2/modules/filters.
by jbossnative-commits＠lists.jboss.org
Author: jfrederic.clere(a)jboss.com
Date: 2014-08-19 03:03:47 -0400 (Tue, 19 Aug 2014)
New Revision: 3330
Added:
trunk/httpd/httpd-2.2/modules/filters/NMAKEsubstitute
Modified:
trunk/httpd/httpd-2.2/modules/filters/NMAKEmakefile
Log:
Add mod_substitute on windows.
Modified: trunk/httpd/httpd-2.2/modules/filters/NMAKEmakefile
===================================================================
--- trunk/httpd/httpd-2.2/modules/filters/NMAKEmakefile 2014-07-23 23:01:32 UTC (rev 3329)
+++ trunk/httpd/httpd-2.2/modules/filters/NMAKEmakefile 2014-08-19 07:03:47 UTC (rev 3330)
@@ -35,7 +35,8 @@
$(SRCDIR)\NMAKEcharsetlite\~ \
$(SRCDIR)\NMAKEfilter\~ \
$(SRCDIR)\NMAKEextfilter\~ \
- $(SRCDIR)\NMAKEinclude\~
+ $(SRCDIR)\NMAKEinclude\~ \
+ $(SRCDIR)\NMAKEsubstitute\~
all: $(WORKDIR) $(MODULES)
@echo Building filter modules ...
Added: trunk/httpd/httpd-2.2/modules/filters/NMAKEsubstitute
===================================================================
--- trunk/httpd/httpd-2.2/modules/filters/NMAKEsubstitute (rev 0)
+++ trunk/httpd/httpd-2.2/modules/filters/NMAKEsubstitute 2014-08-19 07:03:47 UTC (rev 3330)
@@ -0,0 +1,62 @@
+# Copyright 2001-2007 The Apache Software Foundation or its licensors, as
+# applicable.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+# ====================================================================
+#
+# NMAKEmakefile substitute module makefile.
+#
+# Originally contributed by Mladen Turk <mturk redhat.com>
+#
+# ====================================================================
+#
+
+TARGET=DLL
+PROJECT = mod_substitute
+
+!IF !DEFINED(SRCDIR) || "$(SRCDIR)" == ""
+SRCDIR = .
+!ENDIF
+
+!include <..\..\NMAKEcommon.inc>
+!include <..\..\NMAKEhttpd.inc>
+
+LDIRS = /libpath:"$(BUILDLIB)"
+LFLAGS = $(LFLAGS) user32.lib psapi.lib gdi32.lib shlwapi.lib wldap32.lib ole32.lib $(LIBAPR) $(LIBAPU) $(LIBHTTPD)
+
+INCLUDES = -I$(SRCDIR) -I$(BUILDINC)
+PDBFLAGS = -Fo$(WORKDIR)\ -Fd$(WORKDIR)\$(PROJECT)-src
+
+BUILDBIN = $(WORKDIR)\$(PROJECT).so
+BUILDPDB = $(WORKDIR)\$(PROJECT).pdb
+BUILDRES = $(WORKDIR)\$(PROJECT).res
+BUILDMFT = $(BUILDBIN).manifest
+
+RCFLAGS = $(RCFLAGS) /d BIN_NAME="$(PROJECT).so" /d LONG_NAME="substitute_module for Apache"
+
+OBJECTS = \
+ $(WORKDIR)\mod_substitute.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)
11 years, 1 month
- 1
- 0