January 2012 - jbossnative-commits

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

by jbossnative-commits＠lists.jboss.org

Author: jfrederic.clere(a)jboss.com Date: 2012-01-18 07:08:48 -0500 (Wed, 18 Jan 2012) New Revision: 2905 Modified: trunk/build/unix/buildbin.mod_cluster.windows.sh Log: Arrange windows build too. Modified: trunk/build/unix/buildbin.mod_cluster.windows.sh =================================================================== --- trunk/build/unix/buildbin.mod_cluster.windows.sh 2012-01-18 09:24:32 UTC (rev 2904) +++ trunk/build/unix/buildbin.mod_cluster.windows.sh 2012-01-18 12:08:48 UTC (rev 2905) @@ -78,8 +78,12 @@ mod_cluster_sources=srclib/`ls srclib | grep mod_cluster` (cd ${mod_cluster_sources} || exit 1 mvn -P dist package -Djboss.server.log.dir=`pwd` -Djava.net.preferIPv4Stack=true + if [ $? -ne 0 ]; then + echo "mvn -P dist package -Djboss.server.log.dir=`pwd` -Djava.net.preferIPv4Stack=true FAILED" + exit 1 + fi cp target/*-bin.* ${build_top}/output -) +) || exit 1 # Add default mod_cluster conf in httpd.conf case $build_version in

12 years, 11 months

1
0
0 / 0

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

by jbossnative-commits＠lists.jboss.org

Author: jfrederic.clere(a)jboss.com Date: 2012-01-18 04:24:32 -0500 (Wed, 18 Jan 2012) New Revision: 2904 Modified: trunk/build/patch/httpd-2.2.21.patch Log: Patch the patch :-( Modified: trunk/build/patch/httpd-2.2.21.patch =================================================================== --- trunk/build/patch/httpd-2.2.21.patch 2012-01-14 08:49:44 UTC (rev 2903) +++ trunk/build/patch/httpd-2.2.21.patch 2012-01-18 09:24:32 UTC (rev 2904) @@ -30,7 +30,7 @@ return rv; --- srclib/apr/NMAKEmakefile (revision 2617) +++ srclib/apr/NMAKEmakefile (working copy) -@@ -106,11 +106,11 @@ +@@ -106,11 +106,12 @@ $(WORKDIR)\signals.obj \ $(WORKDIR)\thread.obj \ $(WORKDIR)\threadpriv.obj \

12 years, 11 months

1
0
0 / 0

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

by jbossnative-commits＠lists.jboss.org

Author: jfrederic.clere(a)jboss.com Date: 2012-01-14 03:49:44 -0500 (Sat, 14 Jan 2012) New Revision: 2903 Modified: trunk/build/patch/httpd-2.2.21.patch Log: Fix the error LNK2001: unresolved external symbol _apr_pollset_provider_poll. Modified: trunk/build/patch/httpd-2.2.21.patch =================================================================== --- trunk/build/patch/httpd-2.2.21.patch 2012-01-13 17:37:33 UTC (rev 2902) +++ trunk/build/patch/httpd-2.2.21.patch 2012-01-14 08:49:44 UTC (rev 2903) @@ -40,6 +40,7 @@ $(WORKDIR)\groupinfo.obj \ - $(WORKDIR)\userinfo.obj + $(WORKDIR)\userinfo.obj \ ++ $(WORKDIR)\poll.obj \ + $(WORKDIR)\pollset.obj !IF EXIST($(SRCDIR)\file_io\win32\buffer.c)

12 years, 11 months

1
0
0 / 0

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

by jbossnative-commits＠lists.jboss.org

Author: jfrederic.clere(a)jboss.com Date: 2012-01-13 12:37:33 -0500 (Fri, 13 Jan 2012) New Revision: 2902 Modified: trunk/build/patch/httpd-2.2.21.patch Log: Arrange windows patch. Modified: trunk/build/patch/httpd-2.2.21.patch =================================================================== --- trunk/build/patch/httpd-2.2.21.patch 2012-01-13 08:39:41 UTC (rev 2901) +++ trunk/build/patch/httpd-2.2.21.patch 2012-01-13 17:37:33 UTC (rev 2902) @@ -30,7 +30,11 @@ return rv; --- srclib/apr/NMAKEmakefile (revision 2617) +++ srclib/apr/NMAKEmakefile (working copy) -@@ -110,7 +110,8 @@ +@@ -106,11 +106,11 @@ + $(WORKDIR)\signals.obj \ + $(WORKDIR)\thread.obj \ + $(WORKDIR)\threadpriv.obj \ +- $(WORKDIR)\access.obj \ $(WORKDIR)\time.obj \ $(WORKDIR)\timestr.obj \ $(WORKDIR)\groupinfo.obj \

12 years, 11 months

1
0
0 / 0

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

by jbossnative-commits＠lists.jboss.org

Author: jfrederic.clere(a)jboss.com Date: 2012-01-13 03:39:41 -0500 (Fri, 13 Jan 2012) New Revision: 2901 Added: trunk/build/patch/httpd-2.2.21.patch Log: Add the patch for 2.2.21 (from 2.2.15). Added: trunk/build/patch/httpd-2.2.21.patch =================================================================== --- trunk/build/patch/httpd-2.2.21.patch (rev 0) +++ trunk/build/patch/httpd-2.2.21.patch 2012-01-13 08:39:41 UTC (rev 2901) @@ -0,0 +1,174 @@ +--- modules/ssl/config.m4 (revision 793871) ++++ modules/ssl/config.m4 (working copy) +@@ -120,7 +120,13 @@ + if test "x$enable_ssl" = "xshared"; then + # The only symbol which needs to be exported is the module + # structure, so ask libtool to hide everything else: +- APR_ADDTO(MOD_SSL_LDADD, [-export-symbols-regex ssl_module]) ++ case $host in ++ *-apple-darwin*) ++ ;; ++ *) ++ APR_ADDTO(MOD_SSL_LDADD, [-export-symbols-regex ssl_module]) ++ ;; ++ esac + fi + ]) + +--- srclib/apr/file_io/win32/open.c (revision 920862) ++++ srclib/apr/file_io/win32/open.c (working copy) +@@ -610,8 +610,8 @@ + #endif + #if APR_HAS_ANSI_FS + ELSE_WIN_OS_IS_ANSI { +- if (!CreateHardLinkA(wto_path, wfrom_path)) +- return apr_get_os_error() ++ if (!CreateHardLinkA(to_path, from_path, NULL)) ++ return apr_get_os_error(); + } + #endif + return rv; +--- srclib/apr/NMAKEmakefile (revision 2617) ++++ srclib/apr/NMAKEmakefile (working copy) +@@ -110,7 +110,8 @@ + $(WORKDIR)\time.obj \ + $(WORKDIR)\timestr.obj \ + $(WORKDIR)\groupinfo.obj \ +- $(WORKDIR)\userinfo.obj ++ $(WORKDIR)\userinfo.obj \ ++ $(WORKDIR)\pollset.obj + + !IF EXIST($(SRCDIR)\file_io\win32\buffer.c) + OBJECTS = $(OBJECTS) \ +--- srclib/apr-util/buildconf (original) ++++ srclib/apr-util/buildconf Thu Nov 12 23:20:30 2009 +@@ -17,6 +17,11 @@ + # + # + ++if [ "$1" = "--verbose" -o "$1" = "-v" ]; then ++ verbose="--verbose" ++ shift ++fi ++ + # Default place to look for apr source. Can be overridden with + # --with-apr=[directory] + apr_src_dir=../apr +@@ -67,11 +72,11 @@ + # Generate the autoconf header (include/apu_config.h) and ./configure + # + echo "Creating include/private/apu_config.h ..." +-${AUTOHEADER:-autoheader} ++${AUTOHEADER:-autoheader} $verbose + + echo "Creating configure ..." + ### do some work to toss config.cache? +-if ${AUTOCONF:-autoconf}; then ++if ${AUTOCONF:-autoconf} $verbose; then + : + else + echo "autoconf failed" +@@ -82,14 +87,14 @@ + # Generate build-outputs.mk for the build system + # + echo "Generating 'make' outputs ..." +-$apr_src_dir/build/gen-build.py make ++$apr_src_dir/build/gen-build.py $verbose make + + # + # If Expat has been bundled, then go and configure the thing + # + if [ -f xml/expat/buildconf.sh ]; then + echo "Invoking xml/expat/buildconf.sh ..." +- (cd xml/expat; ./buildconf.sh) ++ (cd xml/expat; ./buildconf.sh $verbose) + fi + + # Remove autoconf cache again + +--- srclib/apr-util/xml/expat/buildconf.sh (original) ++++ srclib/apr-util/xml/expat/buildconf.sh Thu Nov 12 23:20:30 2009 +@@ -1,5 +1,10 @@ + #! /bin/sh + ++if [ "$1" = "--verbose" -o "$1" = "-v" ]; then ++ verbose="--verbose" ++ shift ++fi ++ + # + # Find libtoolize + # +@@ -25,7 +30,7 @@ + (cd conftools ; rm -f ltconfig ltmain.sh) + rm -rf aclocal.m4 libtool.m4 ltsugar.m4 autom4te*.cache + +-$libtoolize --copy --automake ++$libtoolize --copy --automake --force $verbose + + # + # Build aclocal.m4 from libtool's libtool.m4 +@@ -42,12 +47,12 @@ + cat $ltfile >> aclocal.m4 + + if [ -f ltsugar.m4 ]; then +- echo "Incorporating ltsugar.m4 into aclocal.m4 ..." +- cat ltsugar.m4 >> aclocal.m4 ++ rm -f conftools/ltsugar.m4 ++ mv ltsugar.m4 conftools/ltsugar.m4 + fi + +-# Clean up again +-rm -f libtool.m4 ltsugar.m4 ++# Clean up any leftovers ++rm -f aclocal.m4 libtool.m4 + + cross_compile_warning="warning: AC_TRY_RUN called without default to allow cross compiling" + +@@ -55,11 +60,11 @@ + # Generate the autoconf header template (config.h.in) and ./configure + # + echo "Creating config.h.in ..." +-${AUTOHEADER:-autoheader} 2>&1 | grep -v "$cross_compile_warning" ++${AUTOHEADER:-autoheader} $verbose 2>&1 | grep -v "$cross_compile_warning" + + echo "Creating configure ..." + ### do some work to toss config.cache? +-${AUTOCONF:-autoconf} 2>&1 | grep -v "$cross_compile_warning" ++${AUTOCONF:-autoconf} $verbose 2>&1 | grep -v "$cross_compile_warning" + + # Remove autoconf caches + rm -rf autom4te*.cache + +--- srclib/apr-util/xml/expat/configure.in (original) ++++ srclib/apr-util/xml/expat/configure.in Thu Nov 12 23:20:30 2009 +@@ -12,6 +12,14 @@ + + AC_INIT(Makefile.in) + AC_CONFIG_AUX_DIR(conftools) ++AC_CONFIG_MACRO_DIR(conftools) ++ ++sinclude(conftools/libtool.m4) ++sinclude(conftools/ltsugar.m4) ++sinclude(conftools/argz.m4) ++sinclude(conftools/ltoptions.m4) ++sinclude(conftools/ltversion.m4) ++sinclude(conftools/lt~obsolete.m4) + + dnl + dnl Follow the GNU/Linux convention of odd number minor version for + + + +--- srclib/apr-util/xml/expat/buildconf.sh 2010-05-07 06:23:25.616783000 -0400 ++++ srclib/apr-util/xml/expat/buildconf.sh 2010-05-07 06:38:00.551126000 -0400 +@@ -50,6 +50,9 @@ + rm -f conftools/ltsugar.m4 + mv ltsugar.m4 conftools/ltsugar.m4 + fi ++if [ ! -f conftools/libtool.m4 ]; then ++ mv aclocal.m4 conftools/libtool.m4 ++fi + + # Clean up any leftovers + rm -f aclocal.m4 libtool.m4

12 years, 11 months

1
0
0 / 0

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

by jbossnative-commits＠lists.jboss.org

Author: jfrederic.clere(a)jboss.com Date: 2012-01-13 03:10:03 -0500 (Fri, 13 Jan 2012) New Revision: 2900 Modified: trunk/build/unix/buildbin.jboss-native.sh Log: It said: solaris9-sparcv9 not supported Modified: trunk/build/unix/buildbin.jboss-native.sh =================================================================== --- trunk/build/unix/buildbin.jboss-native.sh 2012-01-13 08:02:48 UTC (rev 2899) +++ trunk/build/unix/buildbin.jboss-native.sh 2012-01-13 08:10:03 UTC (rev 2900) @@ -179,7 +179,7 @@ CPU=sparc fi ;; - *solaris-sparcv9*) + *solaris9-sparcv9*) PLATFORM=solaris9 if $force_64; then CPU=sparcv9

12 years, 11 months

1
0
0 / 0

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

by jbossnative-commits＠lists.jboss.org

Author: jfrederic.clere(a)jboss.com Date: 2012-01-13 03:02:48 -0500 (Fri, 13 Jan 2012) New Revision: 2899 Modified: trunk/build/unix/buildsrc.mod_cluster.sh Log: Try to fix the: svn: E155036: Please see the 'svn upgrade' command svn: E155036: Working copy '/cygdrive/e/workspace/mod_cluster-windows/jbossnative/httpd/httpd-2.2' is too old (format 8, created by Subversion 1.4) svn export --force /cygdrive/e/workspace/mod_cluster-windows/jbossnative/httpd/httpd-2.2/ /cygdrive/e/workspace/mod_cluster-windows/jbossnative/build/unix/work/mod_cluster-1.2.0.Beta4.dev-src-ssl/srclib/httpd-2.2.21 FAILED On dev16. Modified: trunk/build/unix/buildsrc.mod_cluster.sh =================================================================== --- trunk/build/unix/buildsrc.mod_cluster.sh 2012-01-11 16:46:40 UTC (rev 2898) +++ trunk/build/unix/buildsrc.mod_cluster.sh 2012-01-13 08:02:48 UTC (rev 2899) @@ -86,9 +86,11 @@ # Copy the windows NMAKE files (and additional stuff). dirnmake=${build_svn_root}/httpd/httpd-2.2/ if [ -d ${dirnmake} ]; then - svn export --force ${dirnmake} ${dirsources} + #svn export --force ${dirnmake} ${dirsources} + svn export --force http://anonsvn.jboss.org/repos/jbossnative/trunk/httpd/httpd-2.2 ${dirsources} if [ $? -ne 0 ]; then - echo "svn export --force ${dirnmake} ${dirsources} FAILED" + #echo "svn export --force ${dirnmake} ${dirsources} FAILED" + echo "svn export --force http://anonsvn.jboss.org/repos/jbossnative/trunk/httpd/httpd-2.2 ${dirsources} FAILED" exit 1 fi # Apply patches for iconv

12 years, 11 months

1
0
0 / 0

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

by jbossnative-commits＠lists.jboss.org

12 years, 11 months

1
0
0 / 0

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

by jbossnative-commits＠lists.jboss.org

Author: jfrederic.clere(a)jboss.com Date: 2012-01-11 09:48:10 -0500 (Wed, 11 Jan 2012) New Revision: 2897 Modified: trunk/build/unix/buildbin.mod_cluster.sh Log: Add the multiple profile build tests. Modified: trunk/build/unix/buildbin.mod_cluster.sh =================================================================== --- trunk/build/unix/buildbin.mod_cluster.sh 2012-01-11 09:12:45 UTC (rev 2896) +++ trunk/build/unix/buildbin.mod_cluster.sh 2012-01-11 14:48:10 UTC (rev 2897) @@ -270,6 +270,26 @@ # Also build the java part. (cd ../mod_cluster + # Test the different profiles + mvn -P TC6 install + if [ $? -ne 0 ]; then + echo "maven TC6 build failed" + exit 1 + fi + mvn clean + mvn -P TC7 install + if [ $? -ne 0 ]; then + echo "maven TC7 build failed" + exit 1 + fi + mvn clean + mvn -P AS7 install + if [ $? -ne 0 ]; then + echo "maven AS7 build failed" + exit 1 + fi + + mvn clean mvn -P dist package -Djboss.server.log.dir=`pwd` -Djava.net.preferIPv4Stack=true if [ $? -ne 0 ]; then echo "maven build failed"

12 years, 11 months

1
0
0 / 0

JBoss Native SVN: r2896 - trunk/build/unix/src/assembly.

by jbossnative-commits＠lists.jboss.org

Author: jfrederic.clere(a)jboss.com Date: 2012-01-11 04:12:45 -0500 (Wed, 11 Jan 2012) New Revision: 2896 Modified: trunk/build/unix/src/assembly/jar.native.macosx-i686.xml trunk/build/unix/src/assembly/jar.native.macosx-x86_64.xml trunk/build/unix/src/assembly/jar.native.xml Log: Oops the location is bin/native Modified: trunk/build/unix/src/assembly/jar.native.macosx-i686.xml =================================================================== --- trunk/build/unix/src/assembly/jar.native.macosx-i686.xml 2012-01-11 07:59:48 UTC (rev 2895) +++ trunk/build/unix/src/assembly/jar.native.macosx-i686.xml 2012-01-11 09:12:45 UTC (rev 2896) @@ -9,22 +9,22 @@ <files>  <file> - <source>native/libapr-1.dylib</source> + <source>bin/native/libapr-1.dylib</source> <outputDirectory>lib/macosx-i686</outputDirectory> <destName>libapr-1.jnilib</destName> </file> <file> - <source>native/libcrypto.dylib</source> + <source>bin/native/libcrypto.dylib</source> <outputDirectory>lib/macosx-i686</outputDirectory> <destName>libcrypto.jnilib</destName> </file> <file> - <source>native/libssl.dylib</source> + <source>bin/native/libssl.dylib</source> <outputDirectory>lib/macosx-i686</outputDirectory> <destName>libssl.jnilib</destName> </file> <file> - <source>native/libtcnative-1.dylib</source> + <source>bin/native/libtcnative-1.dylib</source> <outputDirectory>lib/macosx-i686</outputDirectory> <destName>libtcnative-1.jnilib</destName> </file> Modified: trunk/build/unix/src/assembly/jar.native.macosx-x86_64.xml =================================================================== --- trunk/build/unix/src/assembly/jar.native.macosx-x86_64.xml 2012-01-11 07:59:48 UTC (rev 2895) +++ trunk/build/unix/src/assembly/jar.native.macosx-x86_64.xml 2012-01-11 09:12:45 UTC (rev 2896) @@ -9,22 +9,22 @@ <files>  <file> - <source>native/libapr-1.dylib</source> + <source>bin/native/libapr-1.dylib</source> <outputDirectory>lib/macosx-x86_64</outputDirectory> <destName>libapr-1.jnilib</destName> </file> <file> - <source>native/libcrypto.dylib</source> + <source>bin/native/libcrypto.dylib</source> <outputDirectory>lib/macosx-x86_64</outputDirectory> <destName>libcrypto.jnilib</destName> </file> <file> - <source>native/libssl.dylib</source> + <source>bin/native/libssl.dylib</source> <outputDirectory>lib/macosx-x86_64</outputDirectory> <destName>libssl.jnilib</destName> </file> <file> - <source>native/libtcnative-1.dylib</source> + <source>bin/native/libtcnative-1.dylib</source> <outputDirectory>lib/macosx-x86_64</outputDirectory> <destName>libtcnative-1.jnilib</destName> </file> Modified: trunk/build/unix/src/assembly/jar.native.xml =================================================================== --- trunk/build/unix/src/assembly/jar.native.xml 2012-01-11 07:59:48 UTC (rev 2895) +++ trunk/build/unix/src/assembly/jar.native.xml 2012-01-11 09:12:45 UTC (rev 2896) @@ -9,7 +9,7 @@ <fileSets>  <fileSet> - <directory>native</directory> + <directory>bin/native</directory> <includes> <include>libapr-1.so</include> <include>libcrypto.so</include> @@ -21,7 +21,7 @@  <fileSet> - <directory>native</directory> + <directory>bin/native</directory> <includes> <include>libapr-1.so</include> <include>libcrypto.so</include> @@ -33,7 +33,7 @@  <fileSet> - <directory>native</directory> + <directory>bin/native</directory> <includes> <include>tcnative-1.dll</include> </includes> @@ -42,7 +42,7 @@  <fileSet> - <directory>native</directory> + <directory>bin/native</directory> <includes> <include>tcnative-1.dll</include> </includes>

12 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 2012