June 2013 - jbossnative-commits - Jboss List Archives

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

by jbossnative-commits＠lists.jboss.org

Author: jfrederic.clere(a)jboss.com Date: 2013-06-13 05:59:33 -0400 (Thu, 13 Jun 2013) New Revision: 3104 Modified: trunk/build/unix/buildbin.mod_cluster.sh Log: Arrange HPUX logic. Modified: trunk/build/unix/buildbin.mod_cluster.sh =================================================================== --- trunk/build/unix/buildbin.mod_cluster.sh 2013-06-13 09:25:36 UTC (rev 3103) +++ trunk/build/unix/buildbin.mod_cluster.sh 2013-06-13 09:59:33 UTC (rev 3104) @@ -226,11 +226,29 @@ fi # Add default mod_cluster conf in httpd.conf +echo "Add default mod_cluster conf in httpd.conf for $build_version" case $build_version in 1.0.*) + echo "skipped!" ;; 1.1.*|1.2.*) + if [ "$BUILD_SYS" = "hpux" ]; then + echo "Add the mod_cluster modules now because with can't use buildconf on hpux" cat >> "${RPM_BUILD_ROOT}/opt/jboss/httpd/httpd/conf/httpd.conf" <<EOF + +LoadModule proxy_module modules/mod_proxy.so +LoadModule proxy_ajp_module modules/mod_proxy_ajp.so +LoadModule proxy_http_module modules/mod_proxy_http.so + +LoadModule proxy_cluster_module modules/mod_proxy_cluster.so + +LoadModule manager_module modules/mod_manager.so +LoadModule slotmem_module modules/mod_slotmem.so +LoadModule advertise_module modules/mod_advertise.so + +EOF + fi + cat >> "${RPM_BUILD_ROOT}/opt/jboss/httpd/httpd/conf/httpd.conf" <<EOF # MOD_CLUSTER_ADDS # Adjust to you hostname and subnet. <IfModule manager_module> @@ -261,6 +279,7 @@ </VirtualHost> </IfModule> EOF + echo "Done" ;; esac @@ -311,7 +330,7 @@ ant build ) javac *Advertize.java - cp -p output/classes/*Advertize.class ${RPM_BUILD_ROOT}/${BASEHTTPD}/tools + cp -p *Advertize.class ${RPM_BUILD_ROOT}/${BASEHTTPD}/tools cp -p output/classes/testhttpd.war ${RPM_BUILD_ROOT}/${BASEHTTPD}/tools ) || exit 1 @@ -328,6 +347,7 @@ # Build the *.so for any httpd-2.2.x using the httpd install done before if [ "${BUILD_SYS}" != "windows" ]; then + echo "Building mod_cluster modules with apxs" BASELOC=`(cd ../mod_cluster/test/java; ant base | grep echo | sed 's:\[echo\]::' | sed 's:^ *::' | sed 's: :/:g')` for dir in `echo mod_manager advertise mod_slotmem mod_proxy_cluster` do @@ -341,6 +361,8 @@ do nfile=`echo $file | sed 's:\.sl:\.so:'` cp -p $file ../../target/$nfile + echo "Copying $file to ${RPM_BUILD_ROOT}/${BASEHTTPD}/lib/httpd/modules" + cp -p $file ${RPM_BUILD_ROOT}/${BASEHTTPD}/lib/httpd/modules done else cp *.so ../../target

10 years, 10 months

1
0
0 / 0

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

by jbossnative-commits＠lists.jboss.org

Author: mladen.turk(a)jboss.com Date: 2013-06-13 05:25:36 -0400 (Thu, 13 Jun 2013) New Revision: 3103 Modified: trunk/build/patch/openssl-0.9.8r.patch Log: Correctly format 0.9.8r patch Modified: trunk/build/patch/openssl-0.9.8r.patch =================================================================== --- trunk/build/patch/openssl-0.9.8r.patch 2013-06-13 09:11:38 UTC (rev 3102) +++ trunk/build/patch/openssl-0.9.8r.patch 2013-06-13 09:25:36 UTC (rev 3103) @@ -26,7 +26,7 @@ } ---- apps/speed.c.org +--- apps/speed.c +++ apps/speed.c @@ -268,6 +268,11 @@ # define NO_FORK @@ -40,7 +40,7 @@ #undef BUFSIZE #define BUFSIZE ((long)1024*8+1) int run=0; ---- apps/s_time.c.org +--- apps/s_time.c +++ apps/s_time.c @@ -187,6 +187,8 @@ #endif

10 years, 10 months

1
0
0 / 0

JBoss Native SVN: r3102 - trunk/build/unix/util.

by jbossnative-commits＠lists.jboss.org

Author: jfrederic.clere(a)jboss.com Date: 2013-06-13 05:11:38 -0400 (Thu, 13 Jun 2013) New Revision: 3102 Modified: trunk/build/unix/util/jlibtool.c Log: Try to find why it fails... Modified: trunk/build/unix/util/jlibtool.c =================================================================== --- trunk/build/unix/util/jlibtool.c 2013-06-13 09:08:15 UTC (rev 3101) +++ trunk/build/unix/util/jlibtool.c 2013-06-13 09:11:38 UTC (rev 3102) @@ -490,11 +490,12 @@ if (WIFEXITED(statuscode)) { int i; /* It fails log what we were doing */ - printf("%s failed\n", argv[0]); + printf("%s failed: %d\n", argv[0], statuscode); for (i=0; argv[i]; i++) { printf("%s ", argv[i]); } printf("\n"); + printf("\n"); return WEXITSTATUS(statuscode); } return 0;

10 years, 10 months

1
0
0 / 0

JBoss Native SVN: r3101 - trunk/build/unix/util.

by jbossnative-commits＠lists.jboss.org

Author: jfrederic.clere(a)jboss.com Date: 2013-06-13 05:08:15 -0400 (Thu, 13 Jun 2013) New Revision: 3101 Modified: trunk/build/unix/util/jlibtool.c Log: Remove warning. Modified: trunk/build/unix/util/jlibtool.c =================================================================== --- trunk/build/unix/util/jlibtool.c 2013-06-13 08:29:17 UTC (rev 3100) +++ trunk/build/unix/util/jlibtool.c 2013-06-13 09:08:15 UTC (rev 3101) @@ -1767,6 +1767,8 @@ } } +int is_not_same(command_t *cmd_data); + int run_mode(command_t *cmd_data) { int rv;

10 years, 10 months

1
0
0 / 0

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

by jbossnative-commits＠lists.jboss.org

Author: mladen.turk(a)jboss.com Date: 2013-06-13 04:29:17 -0400 (Thu, 13 Jun 2013) New Revision: 3100 Modified: trunk/build/patch/openssl-0.9.8r.patch Log: Update 0.9.8r patch Modified: trunk/build/patch/openssl-0.9.8r.patch =================================================================== --- trunk/build/patch/openssl-0.9.8r.patch 2013-06-13 08:16:57 UTC (rev 3099) +++ trunk/build/patch/openssl-0.9.8r.patch 2013-06-13 08:29:17 UTC (rev 3100) @@ -26,3 +26,28 @@ } +--- apps/speed.c.org ++++ apps/speed.c +@@ -268,6 +268,11 @@ + # define NO_FORK + #endif + ++#ifdef OPENSSL_SYS_WIN32 ++# define ftime _ftime ++# define timeb _timeb ++#endif ++ + #undef BUFSIZE + #define BUFSIZE ((long)1024*8+1) + int run=0; +--- apps/s_time.c.org ++++ apps/s_time.c +@@ -187,6 +187,8 @@ + #endif + #ifdef OPENSSL_SYS_WIN32 + static int exitNow = 0; /* Set when it's time to exit main */ ++# define ftime _ftime ++# define timeb _timeb + #endif + + static void s_time_init(void)

10 years, 10 months

1
0
0 / 0

JBoss Native SVN: r3099 - trunk/build/unix/util.

by jbossnative-commits＠lists.jboss.org

Author: jfrederic.clere(a)jboss.com Date: 2013-06-13 04:16:57 -0400 (Thu, 13 Jun 2013) New Revision: 3099 Modified: trunk/build/unix/util/jlibtool.c Log: change to bash. Modified: trunk/build/unix/util/jlibtool.c =================================================================== --- trunk/build/unix/util/jlibtool.c 2013-06-13 07:50:25 UTC (rev 3098) +++ trunk/build/unix/util/jlibtool.c 2013-06-13 08:16:57 UTC (rev 3099) @@ -165,7 +165,7 @@ #endif #if defined(__hpux) -# define SHELL_CMD "/usr/bin/sh" +# define SHELL_CMD "/usr/bin/bash" # define DYNAMIC_LIB_EXT "sl" # define MODULE_LIB_EXT "sl" # define STATIC_LIB_EXT "a"

10 years, 10 months

1
0
0 / 0

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

by jbossnative-commits＠lists.jboss.org

Author: jfrederic.clere(a)jboss.com Date: 2013-06-13 03:50:25 -0400 (Thu, 13 Jun 2013) New Revision: 3098 Modified: trunk/build/unix/build.sh Log: put back cc (the other doesn't help :-(). Modified: trunk/build/unix/build.sh =================================================================== --- trunk/build/unix/build.sh 2013-06-12 16:26:01 UTC (rev 3097) +++ trunk/build/unix/build.sh 2013-06-13 07:50:25 UTC (rev 3098) @@ -365,7 +365,7 @@ if [ -f /opt/aCC/bin/cc ]; then CC=/opt/aCC/bin/cc else - CC=/opt/ansic/bin/cc + CC=cc fi export CC # http://hpux.cs.utah.edu/ only has a 32 bits one.

10 years, 10 months

1
0
0 / 0

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

by jbossnative-commits＠lists.jboss.org

Author: jfrederic.clere(a)jboss.com Date: 2013-06-12 12:26:01 -0400 (Wed, 12 Jun 2013) New Revision: 3097 Modified: trunk/build/unix/buildsrc.mod_cluster.sh Log: Stop arrange configure for hpux (it breaks). Modified: trunk/build/unix/buildsrc.mod_cluster.sh =================================================================== --- trunk/build/unix/buildsrc.mod_cluster.sh 2013-06-12 14:34:41 UTC (rev 3096) +++ trunk/build/unix/buildsrc.mod_cluster.sh 2013-06-12 16:26:01 UTC (rev 3097) @@ -109,27 +109,29 @@ fi # Replace libtool by our libtool +# and/or regenerate configure. case ${BUILD_SYS} in hpux*) echo "${build_top}/util/jlibtool.c ${dirsources}/srclib/apr/build" cp ${build_top}/util/jlibtool.c ${dirsources}/srclib/apr/build + if $has_jk; then + (cd ${dirsources}/modules/jk + autoconf || exit 1 + ) || exit 1 + fi ;; + windows) + echo "windows no buildconf" + ;; + *) + echo "regenerate configure script" + (cd ${dirsources} + bash buildconf || exit 1 + ) || exit 1 + if $has_jk; then + (cd ${dirsources}/modules/jk + autoconf || exit 1 + ) || exit 1 + fi + ;; esac - -# -# regenerate configure scripts -# XXX: It seems that produces a destroyed configure (on f8 and hpux at least). -#(cd ${dirsources} -# autoheader && autoconf || exit 1 -#) - -if [ "${BUILD_SYS}" != "windows" ]; then - (cd ${dirsources} - bash buildconf || exit 1 - ) || exit 1 - if $has_jk; then - (cd ${dirsources}/modules/jk - autoconf || exit 1 - ) || exit 1 - fi -fi

10 years, 10 months

1
0
0 / 0

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

by jbossnative-commits＠lists.jboss.org

Author: jfrederic.clere(a)jboss.com Date: 2013-06-12 10:34:41 -0400 (Wed, 12 Jun 2013) New Revision: 3096 Modified: trunk/build/unix/build.sh Log: Prevent using a broken C compiler (like /usr/ccs/bin/cc). Modified: trunk/build/unix/build.sh =================================================================== --- trunk/build/unix/build.sh 2013-06-11 15:58:06 UTC (rev 3095) +++ trunk/build/unix/build.sh 2013-06-12 14:34:41 UTC (rev 3096) @@ -362,7 +362,11 @@ ;; HP-UX*) BUILD_SYS="hpux" - CC=cc + if [ -f /opt/aCC/bin/cc ]; then + CC=/opt/aCC/bin/cc + else + CC=/opt/ansic/bin/cc + fi export CC # http://hpux.cs.utah.edu/ only has a 32 bits one. if [ $BUILD_CPU = "i64" ]; then

10 years, 10 months

1
0
0 / 0

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

by jbossnative-commits＠lists.jboss.org

Author: jfrederic.clere(a)jboss.com Date: 2013-06-11 11:58:06 -0400 (Tue, 11 Jun 2013) New Revision: 3095 Modified: trunk/build/unix/buildsrc.mod_cluster.sh Log: trace the jlibtool logic. Modified: trunk/build/unix/buildsrc.mod_cluster.sh =================================================================== --- trunk/build/unix/buildsrc.mod_cluster.sh 2013-06-11 15:54:06 UTC (rev 3094) +++ trunk/build/unix/buildsrc.mod_cluster.sh 2013-06-11 15:58:06 UTC (rev 3095) @@ -111,6 +111,7 @@ # Replace libtool by our libtool case ${BUILD_SYS} in hpux*) + echo "${build_top}/util/jlibtool.c ${dirsources}/srclib/apr/build" cp ${build_top}/util/jlibtool.c ${dirsources}/srclib/apr/build ;; esac

10 years, 10 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 June 2013