August 2014 - jbossnative-commits

JBoss Native SVN: r3342 - trunk/build/unix.

by jbossnative-commits＠lists.jboss.org

Author: jfrederic.clere(a)jboss.com Date: 2014-08-22 11:44:16 -0400 (Fri, 22 Aug 2014) New Revision: 3342 Modified: trunk/build/unix/buildsrc.mod_cluster.sh Log: Remove the useless svn export. Modified: trunk/build/unix/buildsrc.mod_cluster.sh =================================================================== --- trunk/build/unix/buildsrc.mod_cluster.sh 2014-08-20 16:33:42 UTC (rev 3341) +++ trunk/build/unix/buildsrc.mod_cluster.sh 2014-08-22 15:44:16 UTC (rev 3342) @@ -125,16 +125,15 @@ ;; esac if [ -d ${dirnmake} ]; then - #svn export --force ${dirnmake} ${dirsources} - echo "svn export --force http://anonsvn.jboss.org/repos/jbossnative/trunk/httpd/${dirhttpd} ${dirsources}" - which svn - 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" - echo "svn export --force http://anonsvn.jboss.org/repos/jbossnative/trunk/httpd/${dirhttpd} ${dirsources} FAILED" - exit 1 - fi + for file in `(cd ${dirnmake}; find . -type f)` + do + FILE=`echo $file | sed s:./::` + cp -p ${dirnmake}/$FILE ${dirsources}/${FILE} + if [ $? -ne 0 ]; then + echo "cp -p ${dirnmake}/$FILE ${dirsources}/${FILE} FAILED" + exit 1 + fi + done # Apply patches for iconv if [ "${BUILD_SYS}" = "windows" ]; then (cd ${dirsources}/srclib/apr-iconv

9 years, 8 months

1
0
0 / 0

JBoss Native SVN: r3341 - trunk/build/windows.

by jbossnative-commits＠lists.jboss.org

Author: jfrederic.clere(a)jboss.com Date: 2014-08-20 12:33:42 -0400 (Wed, 20 Aug 2014) New Revision: 3341 Modified: trunk/build/windows/buildnew.bat Log: Remove traces... Modified: trunk/build/windows/buildnew.bat =================================================================== --- trunk/build/windows/buildnew.bat 2014-08-20 14:38:39 UTC (rev 3340) +++ trunk/build/windows/buildnew.bat 2014-08-20 16:33:42 UTC (rev 3341) @@ -46,8 +46,6 @@ echo Params : %* echo. -svn --version - set ENV_BAT=%BUILD_HOME%\env.%1.%2.bat echo Writting conf in %ENV_BAT% echo REM Generated by %PROGNAME% %DATE% %TIME% > %ENV_BAT% @@ -63,11 +61,7 @@ goto cmdEnd :cmdFoundCygwin -echo ":cmdFoundCygwin ... " -svn --version set PATH=C:\cmsc\perl\bin;%CYGWIN_INSTALL_DIR%\bin;%PATH% -echo "After set PATH=C:\cmsc\perl\bin;%CYGWIN_INSTALL_DIR%\bin;%PATH%" -svn --version echo set PATH=C:\cmsc\perl\bin;%CYGWIN_INSTALL_DIR%\bin;%PATH% >> %ENV_BAT% REM Then for an acceptable location. @@ -106,9 +100,7 @@ :cpuX86 set BUILD_CPU=x86 echo set BUILD_CPU=x86 >> %ENV_BAT% -svn --version call "c:\cmsc\setenv.bat" /x86 -svn --version echo call "c:\cmsc\setenv.bat" /x86 >> %ENV_BAT% goto cmdBuild @@ -131,7 +123,6 @@ set INIT=%LOCAL_DIR% echo set INIT=%LOCAL_DIR% >> %ENV_BAT% pushd %BUILD_HOME%\unix -svn --version bash build.sh %1 %2 %3 %4 %5 @if ERRORLEVEL 1 ( echo build.sh failed

9 years, 8 months

1
0
0 / 0

JBoss Native SVN: r3340 - trunk/build/windows.

by jbossnative-commits＠lists.jboss.org

Author: jfrederic.clere(a)jboss.com Date: 2014-08-20 10:38:39 -0400 (Wed, 20 Aug 2014) New Revision: 3340 Modified: trunk/build/windows/buildnew.bat Log: last debug? Modified: trunk/build/windows/buildnew.bat =================================================================== --- trunk/build/windows/buildnew.bat 2014-08-20 14:30:26 UTC (rev 3339) +++ trunk/build/windows/buildnew.bat 2014-08-20 14:38:39 UTC (rev 3340) @@ -66,6 +66,7 @@ echo ":cmdFoundCygwin ... " svn --version set PATH=C:\cmsc\perl\bin;%CYGWIN_INSTALL_DIR%\bin;%PATH% +echo "After set PATH=C:\cmsc\perl\bin;%CYGWIN_INSTALL_DIR%\bin;%PATH%" svn --version echo set PATH=C:\cmsc\perl\bin;%CYGWIN_INSTALL_DIR%\bin;%PATH% >> %ENV_BAT%

9 years, 8 months

1
0
0 / 0

JBoss Native SVN: r3339 - trunk/build/windows.

by jbossnative-commits＠lists.jboss.org

Author: jfrederic.clere(a)jboss.com Date: 2014-08-20 10:30:26 -0400 (Wed, 20 Aug 2014) New Revision: 3339 Modified: trunk/build/windows/buildnew.bat Log: more debug :-( Modified: trunk/build/windows/buildnew.bat =================================================================== --- trunk/build/windows/buildnew.bat 2014-08-20 12:55:15 UTC (rev 3338) +++ trunk/build/windows/buildnew.bat 2014-08-20 14:30:26 UTC (rev 3339) @@ -63,6 +63,8 @@ goto cmdEnd :cmdFoundCygwin +echo ":cmdFoundCygwin ... " +svn --version set PATH=C:\cmsc\perl\bin;%CYGWIN_INSTALL_DIR%\bin;%PATH% svn --version echo set PATH=C:\cmsc\perl\bin;%CYGWIN_INSTALL_DIR%\bin;%PATH% >> %ENV_BAT%

9 years, 8 months

1
0
0 / 0

JBoss Native SVN: r3338 - trunk/build/windows.

by jbossnative-commits＠lists.jboss.org

Author: jfrederic.clere(a)jboss.com Date: 2014-08-20 08:55:15 -0400 (Wed, 20 Aug 2014) New Revision: 3338 Modified: trunk/build/windows/buildnew.bat Log: more debug... Modified: trunk/build/windows/buildnew.bat =================================================================== --- trunk/build/windows/buildnew.bat 2014-08-19 16:33:17 UTC (rev 3337) +++ trunk/build/windows/buildnew.bat 2014-08-20 12:55:15 UTC (rev 3338) @@ -23,8 +23,6 @@ REM @author Jean-Frederic Clere REM -svn --version - @if not "%ECHO%" == "" echo %ECHO% @if "%OS%" == "Windows_NT" setlocal @@ -48,6 +46,8 @@ echo Params : %* echo. +svn --version + set ENV_BAT=%BUILD_HOME%\env.%1.%2.bat echo Writting conf in %ENV_BAT% echo REM Generated by %PROGNAME% %DATE% %TIME% > %ENV_BAT% @@ -64,6 +64,7 @@ :cmdFoundCygwin set PATH=C:\cmsc\perl\bin;%CYGWIN_INSTALL_DIR%\bin;%PATH% +svn --version echo set PATH=C:\cmsc\perl\bin;%CYGWIN_INSTALL_DIR%\bin;%PATH% >> %ENV_BAT% REM Then for an acceptable location.

9 years, 8 months

1
0
0 / 0

JBoss Native SVN: r3337 - trunk/build/windows.

by jbossnative-commits＠lists.jboss.org

Author: jfrederic.clere(a)jboss.com Date: 2014-08-19 12:33:17 -0400 (Tue, 19 Aug 2014) New Revision: 3337 Modified: trunk/build/windows/buildnew.bat Log: more debug... Modified: trunk/build/windows/buildnew.bat =================================================================== --- trunk/build/windows/buildnew.bat 2014-08-19 16:17:27 UTC (rev 3336) +++ trunk/build/windows/buildnew.bat 2014-08-19 16:33:17 UTC (rev 3337) @@ -102,7 +102,9 @@ :cpuX86 set BUILD_CPU=x86 echo set BUILD_CPU=x86 >> %ENV_BAT% +svn --version call "c:\cmsc\setenv.bat" /x86 +svn --version echo call "c:\cmsc\setenv.bat" /x86 >> %ENV_BAT% goto cmdBuild

9 years, 8 months

1
0
0 / 0

JBoss Native SVN: r3336 - trunk/build/windows.

by jbossnative-commits＠lists.jboss.org

Author: jfrederic.clere(a)jboss.com Date: 2014-08-19 12:17:27 -0400 (Tue, 19 Aug 2014) New Revision: 3336 Modified: trunk/build/windows/buildnew.bat Log: one more... Modified: trunk/build/windows/buildnew.bat =================================================================== --- trunk/build/windows/buildnew.bat 2014-08-19 15:49:11 UTC (rev 3335) +++ trunk/build/windows/buildnew.bat 2014-08-19 16:17:27 UTC (rev 3336) @@ -23,6 +23,7 @@ REM @author Jean-Frederic Clere REM +svn --version @if not "%ECHO%" == "" echo %ECHO% @if "%OS%" == "Windows_NT" setlocal

9 years, 8 months

1
0
0 / 0

JBoss Native SVN: r3335 - trunk/build/windows.

by jbossnative-commits＠lists.jboss.org

Author: jfrederic.clere(a)jboss.com Date: 2014-08-19 11:49:11 -0400 (Tue, 19 Aug 2014) New Revision: 3335 Modified: trunk/build/windows/buildnew.bat Log: Try to debug svn... Modified: trunk/build/windows/buildnew.bat =================================================================== --- trunk/build/windows/buildnew.bat 2014-08-19 10:09:43 UTC (rev 3334) +++ trunk/build/windows/buildnew.bat 2014-08-19 15:49:11 UTC (rev 3335) @@ -124,6 +124,7 @@ set INIT=%LOCAL_DIR% echo set INIT=%LOCAL_DIR% >> %ENV_BAT% pushd %BUILD_HOME%\unix +svn --version bash build.sh %1 %2 %3 %4 %5 @if ERRORLEVEL 1 ( echo build.sh failed

9 years, 8 months

1
0
0 / 0

JBoss Native SVN: r3334 - trunk/httpd/httpd-2.4/modules/filters.

by jbossnative-commits＠lists.jboss.org

Author: jfrederic.clere(a)jboss.com Date: 2014-08-19 06:09:43 -0400 (Tue, 19 Aug 2014) New Revision: 3334 Added: trunk/httpd/httpd-2.4/modules/filters/NMAKEsubstitute Modified: trunk/httpd/httpd-2.4/modules/filters/NMAKEmakefile Log: Add mod_substitute on windows. Modified: trunk/httpd/httpd-2.4/modules/filters/NMAKEmakefile =================================================================== --- trunk/httpd/httpd-2.4/modules/filters/NMAKEmakefile 2014-08-19 10:01:02 UTC (rev 3333) +++ trunk/httpd/httpd-2.4/modules/filters/NMAKEmakefile 2014-08-19 10:09:43 UTC (rev 3334) @@ -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.4/modules/filters/NMAKEsubstitute =================================================================== --- trunk/httpd/httpd-2.4/modules/filters/NMAKEsubstitute (rev 0) +++ trunk/httpd/httpd-2.4/modules/filters/NMAKEsubstitute 2014-08-19 10:09:43 UTC (rev 3334) @@ -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)

9 years, 8 months

1
0
0 / 0

JBoss Native SVN: r3333 - trunk/build/unix.

by jbossnative-commits＠lists.jboss.org

Author: jfrederic.clere(a)jboss.com Date: 2014-08-19 06:01:02 -0400 (Tue, 19 Aug 2014) New Revision: 3333 Modified: trunk/build/unix/buildsrc.mod_cluster.sh Log: Go on tracing... Modified: trunk/build/unix/buildsrc.mod_cluster.sh =================================================================== --- trunk/build/unix/buildsrc.mod_cluster.sh 2014-08-19 09:22:53 UTC (rev 3332) +++ trunk/build/unix/buildsrc.mod_cluster.sh 2014-08-19 10:01:02 UTC (rev 3333) @@ -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}" + which svn svn --version svn export --force http://anonsvn.jboss.org/repos/jbossnative/trunk/httpd/${dirhttpd} ${dirsources} if [ $? -ne 0 ]; then

9 years, 8 months

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

jbossnative-commits August 2014