January 2014 - jbossnative-commits

JBoss Native SVN: r3219 - trunk/httpd/httpd-2.4.

by jbossnative-commits＠lists.jboss.org

Author: jfrederic.clere(a)jboss.com Date: 2014-01-28 10:54:15 -0500 (Tue, 28 Jan 2014) New Revision: 3219 Modified: trunk/httpd/httpd-2.4/NMAKElibhttpd Log: Readd it. Modified: trunk/httpd/httpd-2.4/NMAKElibhttpd =================================================================== --- trunk/httpd/httpd-2.4/NMAKElibhttpd 2014-01-28 15:08:47 UTC (rev 3218) +++ trunk/httpd/httpd-2.4/NMAKElibhttpd 2014-01-28 15:54:15 UTC (rev 3219) @@ -84,6 +84,7 @@ $(WORKDIR)\mod_so.obj HEADERS = \ + $(SRCDIR)\include\os.h \ $(SRCDIR)\modules\generators\mod_cgi.h \ $(SRCDIR)\include\mod_core.h \ $(SRCDIR)\modules\dav\main\mod_dav.h \

10 years, 11 months

1
0
0 / 0

JBoss Native SVN: r3218 - trunk/httpd/httpd-2.4/srclib/pcre.

by jbossnative-commits＠lists.jboss.org

Author: jfrederic.clere(a)jboss.com Date: 2014-01-28 10:08:47 -0500 (Tue, 28 Jan 2014) New Revision: 3218 Modified: trunk/httpd/httpd-2.4/srclib/pcre/NMAKEmakefile Log: Adjust the names. Modified: trunk/httpd/httpd-2.4/srclib/pcre/NMAKEmakefile =================================================================== --- trunk/httpd/httpd-2.4/srclib/pcre/NMAKEmakefile 2014-01-28 13:17:58 UTC (rev 3217) +++ trunk/httpd/httpd-2.4/srclib/pcre/NMAKEmakefile 2014-01-28 15:08:47 UTC (rev 3218) @@ -48,12 +48,12 @@ !ENDIF INCLUDES = -I$(SRCDIR) -PDBFLAGS = -Fo$(WORKDIR)\ -Fd$(WORKDIR)\$(PROJECT)-src +PDBFLAGS = -Fo$(WORKDIR)\ -Fd$(WORKDIR)\$(PROJECT)-src -DHAVE_CONFIG_H OBJECTS = \ - $(WORKDIR)\get.obj \ - $(WORKDIR)\maketables.obj \ - $(WORKDIR)\pcre.obj \ - $(WORKDIR)\study.obj + $(WORKDIR)\pcre_get.obj \ + $(WORKDIR)\pcre_maketables.obj \ + $(WORKDIR)\pcre_compile.obj \ + $(WORKDIR)\pcre_study.obj HEADERS = \ $(SRCDIR)\pcre.h \ @@ -74,9 +74,9 @@ $(WORKDIR) : @$(MAKEWORKDIR) -.SUFFIXES : .hw +.SUFFIXES : .h.generic -{$(SRCDIR)}.hw{$(SRCDIR)}.h: +{$(SRCDIR)}.h.generic{$(SRCDIR)}.h: @copy /Y $< $@ >NUL {$(SRCDIR)}.c{$(WORKDIR)}.obj: $(CC) $(CFLAGS) $(INCLUDES) $(PDBFLAGS) $<

10 years, 11 months

1
0
0 / 0

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

by jbossnative-commits＠lists.jboss.org

10 years, 11 months

1
0
0 / 0

JBoss Native SVN: r3216 - trunk/build/patch.

by jbossnative-commits＠lists.jboss.org

Author: jfrederic.clere(a)jboss.com Date: 2014-01-28 07:30:20 -0500 (Tue, 28 Jan 2014) New Revision: 3216 Removed: trunk/build/patch/apr-util-1.5.3.patch Log: The patch is not needed in fact. Deleted: trunk/build/patch/apr-util-1.5.3.patch =================================================================== --- trunk/build/patch/apr-util-1.5.3.patch 2014-01-28 12:26:12 UTC (rev 3215) +++ trunk/build/patch/apr-util-1.5.3.patch 2014-01-28 12:30:20 UTC (rev 3216) @@ -1,33 +0,0 @@ -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
0 / 0

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

by jbossnative-commits＠lists.jboss.org

Author: jfrederic.clere(a)jboss.com Date: 2014-01-28 07:26:12 -0500 (Tue, 28 Jan 2014) New Revision: 3215 Modified: trunk/build/unix/build.sh trunk/build/unix/buildsrc.mod_cluster.sh trunk/build/unix/package.list Log: Add pcre (which isn't any more in httpd-2.4.x Modified: trunk/build/unix/build.sh =================================================================== --- trunk/build/unix/build.sh 2014-01-28 08:59:52 UTC (rev 3214) +++ trunk/build/unix/build.sh 2014-01-28 12:26:12 UTC (rev 3215) @@ -60,6 +60,7 @@ has_iconv=false has_expat=false has_cluster=false +has_pcre=false build_apr=false build_api=false @@ -246,11 +247,21 @@ has_cluster=true cluster_sversion="cluster:$cluster_type:$cluster_version" export cluster_version + ;; + pcre:*) + pcre_version=`echo "${arg}" | ${awk} -F':' '{print $3}'` + pcre_type=`echo "${arg}" | ${awk} -F':' '{print $2}'` + has_pcre=true + pcre_sversion="pcre:$pcre_type:$pcre_version" + ;; esac fi done export has_apr export has_apu +export has_iconv +export has_libz +export has_pcre # Get plaform information so_extension=so @@ -1264,6 +1275,7 @@ ZLIBURLBACK=http://cvs.devel.redhat.com/repo/dist/zlib/zlib-${zlib_versio... #ZLIBURLBACK=http://garr.dl.sourceforge.net/project/libpng/zlib/${zlib_version}/zlib-${zlib_version}.tar.gz ICONVURL=http://ftp.gnu.org/pub/gnu/libiconv/libiconv-${iconv_version}.ta... +PCREURL=ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/pcre-${pcre_version}.tar.gz EXPATURL=http://heanet.dl.sourceforge.net/sourceforge/expat/expat-${expat... export APIURL export APIURLBACK @@ -1276,6 +1288,12 @@ if $has_zlib; then checkdownload zlib ${zlib_version} $ZLIBURL $ZLIBURLBACK fi +if $has_pcre; then + checkdownload pcre ${pcre_version} $PCREURL $PCREURLBACK +fi +if $has_iconv; then + checkdownload iconv ${iconv_version} $ICONVURL $ICONVURLBACK +fi # Note: type of the download (r: rhel, v: internet, t: tag in svn). if $has_openssl; then if [ "${ssl_type}" = "v" ]; then Modified: trunk/build/unix/buildsrc.mod_cluster.sh =================================================================== --- trunk/build/unix/buildsrc.mod_cluster.sh 2014-01-28 08:59:52 UTC (rev 3214) +++ trunk/build/unix/buildsrc.mod_cluster.sh 2014-01-28 12:26:12 UTC (rev 3215) @@ -71,10 +71,24 @@ util/ckeckdownload.sh $build_cache_dir $dirsources $build_top apr-iconv-${api_version} $APIURL $APIURLBACK false mv $dirsources/srclib/apr-iconv-${api_version} $dirsources/srclib/apr-iconv fi - rm -rf ${dirsources}/srclib/zlib - zlibdirsources=`ls ${native_dist}/srclib/ | grep zlib-` - echo "Replacing ${dirsources}/srclib/zlib by ${native_dist}/srclib/${zlibdirsources}" - cp -rp ${native_dist}/srclib/${zlibdirsources} ${dirsources}/srclib/zlib + if $has_zlib; then + rm -rf ${dirsources}/srclib/zlib + zlibdirsources=`ls ${native_dist}/srclib/ | grep zlib-` + echo "Replacing ${dirsources}/srclib/zlib by ${native_dist}/srclib/${zlibdirsources}" + cp -rp ${native_dist}/srclib/${zlibdirsources} ${dirsources}/srclib/zlib + fi + if $has_pcre; then + rm -rf ${dirsources}/srclib/pcre + pcredirsources=`ls ${native_dist}/srclib/ | grep pcre-` + echo "Replacing ${dirsources}/srclib/pcre by ${native_dist}/srclib/${pcredirsources}" + cp -rp ${native_dist}/srclib/${pcredirsources} ${dirsources}/srclib/pcre + fi + if $has_iconv; then + rm -rf ${dirsources}/srclib/iconv + iconvdirsources=`ls ${native_dist}/srclib/ | grep iconv-` + echo "Replacing ${dirsources}/srclib/iconv by ${native_dist}/srclib/${iconvdirsources}" + cp -rp ${native_dist}/srclib/${iconvdirsources} ${dirsources}/srclib/iconv + fi fi # Add mod_jk sources. Modified: trunk/build/unix/package.list =================================================================== --- trunk/build/unix/package.list 2014-01-28 08:59:52 UTC (rev 3214) +++ trunk/build/unix/package.list 2014-01-28 12:26:12 UTC (rev 3215) @@ -67,7 +67,7 @@ mod_cluster|1.2.4.Final|2.2.21|ssl:v:0.9.8r|zlib:v:1.2.3|jk:v:1.2.30|iconv:v:1.11|expat:v:1.95.8|cluster:t:1.2.4.Final mod_cluster|1.2.5.dev|2.2.21|ssl:v:0.9.8r|zlib:v:1.2.3|jk:v:1.2.30|iconv:v:1.11|expat:v:1.95.8|cluster:t:1.2.x mod_cluster|1.2.6.Final|2.2.21|ssl:v:0.9.8r|zlib:v:1.2.3|jk:v:1.2.30|icon... -mod_cluster|1.3.0.Alpha2|2.4.7|apr:v:1.5.0|apu:v:1.5.3|api:v:1.2.1|ssl:v:0.9.8r|zlib:v:1.2.3|jk:v:1.2.37|iconv:v:1.14|expat:v:1.95.8|cluster:t:master +mod_cluster|1.3.0.Alpha2|2.4.7|apr:v:1.5.0|apu:v:1.5.3|api:v:1.2.1|ssl:v:0.9.8r|zlib:v:1.2.3|jk:v:1.2.37|iconv:v:1.14|expat:v:1.95.8|pcre:8.34|cluster:t:master traffic_server|TS_Trunk|trunk TC7|TC7_Trunk|trunk TC6|TC6_Trunk|trunk

10 years, 11 months

1
0
0 / 0

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

by jbossnative-commits＠lists.jboss.org

10 years, 11 months

1
0
0 / 0

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

by jbossnative-commits＠lists.jboss.org

Author: jfrederic.clere(a)jboss.com Date: 2014-01-28 03:52:36 -0500 (Tue, 28 Jan 2014) New Revision: 3213 Modified: trunk/build/unix/buildsrc.mod_cluster.sh trunk/build/unix/package.list Log: Windows needs apr-iconv... Modified: trunk/build/unix/buildsrc.mod_cluster.sh =================================================================== --- trunk/build/unix/buildsrc.mod_cluster.sh 2014-01-28 08:38:02 UTC (rev 3212) +++ trunk/build/unix/buildsrc.mod_cluster.sh 2014-01-28 08:52:36 UTC (rev 3213) @@ -65,8 +65,12 @@ mv $dirsources/srclib/apr-util-${apu_version} $dirsources/srclib/apr-util fi -# On windows add zlib +# On windows add zlib and apr-iconv if [ "${BUILD_SYS}" = "windows" ]; then + if $has_api; then + util/ckeckdownload.sh $build_cache_dir $dirsources $build_top apr-iconv-${api_version} $APIURL $APIURLBACK false + mv $dirsources/srclib/apr-iconv-${api_version} $dirsources/srclib/apr-iconv + fi rm -rf ${dirsources}/srclib/zlib zlibdirsources=`ls ${native_dist}/srclib/ | grep zlib-` echo "Replacing ${dirsources}/srclib/zlib by ${native_dist}/srclib/${zlibdirsources}" Modified: trunk/build/unix/package.list =================================================================== --- trunk/build/unix/package.list 2014-01-28 08:38:02 UTC (rev 3212) +++ trunk/build/unix/package.list 2014-01-28 08:52:36 UTC (rev 3213) @@ -67,7 +67,7 @@ mod_cluster|1.2.4.Final|2.2.21|ssl:v:0.9.8r|zlib:v:1.2.3|jk:v:1.2.30|iconv:v:1.11|expat:v:1.95.8|cluster:t:1.2.4.Final mod_cluster|1.2.5.dev|2.2.21|ssl:v:0.9.8r|zlib:v:1.2.3|jk:v:1.2.30|iconv:v:1.11|expat:v:1.95.8|cluster:t:1.2.x mod_cluster|1.2.6.Final|2.2.21|ssl:v:0.9.8r|zlib:v:1.2.3|jk:v:1.2.30|icon... -mod_cluster|1.3.0.Alpha2|2.4.7|apr:v:1.5.0|apu:v:1.5.3|ssl:v:0.9.8r|zlib:v:1.2.3|jk:v:1.2.37|iconv:v:1.14|expat:v:1.95.8|cluster:t:master +mod_cluster|1.3.0.Alpha2|2.4.7|apr:v:1.5.0|apu:v:1.5.3|api:1.2.1|ssl:v:0.9.8r|zlib:v:1.2.3|jk:v:1.2.37|iconv:v:1.14|expat:v:1.95.8|cluster:t:master traffic_server|TS_Trunk|trunk TC7|TC7_Trunk|trunk TC6|TC6_Trunk|trunk

10 years, 11 months

1
0
0 / 0

JBoss Native SVN: r3212 - trunk/httpd/httpd-2.4.

by jbossnative-commits＠lists.jboss.org

Author: jfrederic.clere(a)jboss.com Date: 2014-01-28 03:38:02 -0500 (Tue, 28 Jan 2014) New Revision: 3212 Modified: trunk/httpd/httpd-2.4/NMAKElibhttpd Log: Those includes are gone. Modified: trunk/httpd/httpd-2.4/NMAKElibhttpd =================================================================== --- trunk/httpd/httpd-2.4/NMAKElibhttpd 2014-01-28 08:34:36 UTC (rev 3211) +++ trunk/httpd/httpd-2.4/NMAKElibhttpd 2014-01-28 08:38:02 UTC (rev 3212) @@ -184,9 +184,6 @@ {$(SRCDIR)\server\mpm\winnt}.h{$(SRCDIR)\include}.h: @copy /Y $< $@ >NUL -{$(SRCDIR)\modules\http}.h{$(SRCDIR)\include}.h: - @copy /Y $< $@ >NUL - {$(SRCDIR)\modules\filters}.h{$(SRCDIR)\include}.h: @copy /Y $< $@ >NUL

10 years, 11 months

1
0
0 / 0

JBoss Native SVN: r3211 - in trunk/httpd/httpd-2.4: srclib/apr and 1 other directory.

by jbossnative-commits＠lists.jboss.org

Author: jfrederic.clere(a)jboss.com Date: 2014-01-28 03:34:36 -0500 (Tue, 28 Jan 2014) New Revision: 3211 Modified: trunk/httpd/httpd-2.4/NMAKElibhttpd trunk/httpd/httpd-2.4/srclib/apr/NMAKEmakefile Log: Arrange location and add missing objects. Modified: trunk/httpd/httpd-2.4/NMAKElibhttpd =================================================================== --- trunk/httpd/httpd-2.4/NMAKElibhttpd 2014-01-27 17:14:38 UTC (rev 3210) +++ trunk/httpd/httpd-2.4/NMAKElibhttpd 2014-01-28 08:34:36 UTC (rev 3211) @@ -84,16 +84,12 @@ $(WORKDIR)\mod_so.obj HEADERS = \ - $(SRCDIR)\include\os.h \ - $(SRCDIR)\include\mpm.h \ - $(SRCDIR)\include\mpm_default.h \ - $(SRCDIR)\include\mod_cgi.h \ + $(SRCDIR)\modules\generators\mod_cgi.h \ $(SRCDIR)\include\mod_core.h \ - $(SRCDIR)\include\mod_dav.h \ - $(SRCDIR)\include\mod_include.h \ - $(SRCDIR)\include\mod_proxy.h \ - $(SRCDIR)\include\mod_so.h \ - $(SRCDIR)\server\test_char.h + $(SRCDIR)\modules\dav\main\mod_dav.h \ + $(SRCDIR)\modules\filters\mod_include.h \ + $(SRCDIR)\modules\proxy\mod_proxy.h \ + $(SRCDIR)\modules\core\mod_so.h BUILDBIN = $(WORKDIR)\$(PROJECT).dll BUILDPDB = $(WORKDIR)\$(PROJECT).pdb Modified: trunk/httpd/httpd-2.4/srclib/apr/NMAKEmakefile =================================================================== --- trunk/httpd/httpd-2.4/srclib/apr/NMAKEmakefile 2014-01-27 17:14:38 UTC (rev 3210) +++ trunk/httpd/httpd-2.4/srclib/apr/NMAKEmakefile 2014-01-28 08:34:36 UTC (rev 3211) @@ -84,6 +84,8 @@ $(WORKDIR)\inet_ntop.obj \ $(WORKDIR)\inet_pton.obj \ $(WORKDIR)\select.obj \ + $(WORKDIR)\poll.obj \ + $(WORKDIR)\pollset.obj \ $(WORKDIR)\multicast.obj \ $(WORKDIR)\sendrecv.obj \ $(WORKDIR)\sockaddr.obj \

10 years, 11 months

1
0
0 / 0

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

by jbossnative-commits＠lists.jboss.org

Author: jfrederic.clere(a)jboss.com Date: 2014-01-27 12:14:38 -0500 (Mon, 27 Jan 2014) New Revision: 3210 Modified: trunk/build/unix/build.sh Log: Don't build apr and co for mod_cluster. Modified: trunk/build/unix/build.sh =================================================================== --- trunk/build/unix/build.sh 2014-01-27 16:55:32 UTC (rev 3209) +++ trunk/build/unix/build.sh 2014-01-27 17:14:38 UTC (rev 3210) @@ -61,6 +61,7 @@ has_expat=false has_cluster=false +build_apr=false build_api=false build_zlib=false build_iconv=false @@ -1116,7 +1117,7 @@ buildany srclib/expat-${expat_version} true || return 1 fi - if $has_apr; then + if $build_apr; then if $has_static ; then buildapr srclib/apr-${apr_version} true || return 1 else

10 years, 11 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 January 2014