Author: jfrederic.clere(a)jboss.com
Date: 2008-01-30 13:17:55 -0500 (Wed, 30 Jan 2008)
New Revision: 1313
Removed:
trunk/build/unix/buildbin.asf-jk.sh
Modified:
trunk/build/unix/buildbin.rhel-httpd.sh
trunk/build/unix/buildsrc.rhel-httpd.sh
Log:
Arrange logic to build mod_jk.so in httpd tree.
Deleted: trunk/build/unix/buildbin.asf-jk.sh
===================================================================
--- trunk/build/unix/buildbin.asf-jk.sh 2008-01-30 11:11:36 UTC (rev 1312)
+++ trunk/build/unix/buildbin.asf-jk.sh 2008-01-30 18:17:55 UTC (rev 1313)
@@ -1,114 +0,0 @@
-#!/bin/sh
-# Copyright(c) 2007 Red Hat Middleware, LLC,
-# and individual contributors as indicated by the @authors tag.
-# See the copyright.txt in the distribution for a
-# full listing of individual contributors.
-#
-# This library is free software; you can redistribute it and/or
-# modify it under the terms of the GNU Lesser General Public
-# License as published by the Free Software Foundation; either
-# version 2 of the License, or (at your option) any later version.
-#
-# This library is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-# Lesser General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public
-# License along with this library in the file COPYING.LIB;
-# if not, write to the Free Software Foundation, Inc.,
-# 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
-#
-# @author Jean-Frederic Clere
-#
-echo ""
-echo "Running : `basename $0` $LastChangedDate: 2007-07-02 16:22:00 +0200 (Mon, 02
Jul 2007) $"
-echo ""
-echo "Started : `date`"
-echo "Common : $1"
-echo "Prefix : $2"
-echo "Output : $3"
-echo "OpenSSL : $4"
-echo ""
-
-
-# parameters
-# $1: Location of the common libraries.
-# $2: Destination location.
-# $3: Location where to put the binaries.
-# $4: Use OpenSSL.
-# $5: Location of the sources.
-
-common_loc=$1
-prefix_loc=$2
-output_loc=$3
-has_openssl=$4
-sources_loc=$5
-current_loc=`pwd`
-
-echo "Building mod_jk in $current_loc"
-native_sources=srclib/`ls srclib | grep tomcat-connectors-`/native
-cd $native_sources
-
-apxs=`find $output_loc -name apxs`
-config=`find $output_loc -name config_vars.mk | grep -v jk/config_vars.mk`
-configdir=`dirname $config`
-
-echo "Using: $apxs"
-echo "Using: $config"
-
-#
-# Arrange apxs/config_vars.mk so that we can use it with the httpd we are building.
-echo "/^my \$installbuilddir = / c\\" > $$.sed
-echo "my \$installbuilddir = \"${configdir}\";" >> $$.sed
-
-sed -f $$.sed ${apxs} | sed 's:config_vars.mk:config_vars.mk.jk:' >
${apxs}.jk
-chmod a+x ${apxs}.jk
-
-sbindir=`find $output_loc -type d -name sbin`
-bindir=`find $output_loc -type d -name bin`
-APR_CONFIG=`find $output_loc -type f -name apr-1-config`
-APU_CONFIG=`find $output_loc -type f -name apu-1-config`
-LIBTOOL=`find $output_loc -type f -name libtool`
-APR_INCLUDE=`find $output_loc -type f -name apr_lib.h`
-APR_INCLUDEDIR=`dirname $APR_INCLUDE`
-APU_INCLUDE=`find $output_loc -type f -name apu.h`
-APU_INCLUDEDIR=`dirname $APU_INCLUDE`
-exp_installbuild=`find $output_loc -type f -name config_vars.mk | grep -v
jk/config_vars.mk`
-exp_installbuilddir=`dirname $exp_installbuild`
-modules_dir=`find $output_loc -type d -name modules`
-
-#
-# Fill the sed command file.
-echo "/^sbindir = / c\\" > $$.sed
-echo "sbindir = ${sbindir}" >> $$.sed
-echo "/^bindir = / c\\" >> $$.sed
-echo "bindir = ${bindir}" >> $$.sed
-echo "/^APR_CONFIG = / c\\" >> $$.sed
-echo "APR_CONFIG = ${APR_CONFIG}" >> $$.sed
-echo "/^APU_CONFIG = / c\\" >> $$.sed
-echo "APU_CONFIG = ${APU_CONFIG}" >> $$.sed
-echo "/^LIBTOOL = / c\\" >> $$.sed
-echo "LIBTOOL = ${LIBTOOL}" >> $$.sed
-echo "/^APR_INCLUDEDIR = / c\\" >> $$.sed
-echo "APR_INCLUDEDIR = ${APR_INCLUDEDIR}" >> $$.sed
-echo "/^APU_INCLUDEDIR = / c\\" >> $$.sed
-echo "APU_INCLUDEDIR = ${APU_INCLUDEDIR}" >> $$.sed
-echo "/^exp_installbuilddir = / c\\" >> $$.sed
-echo "exp_installbuilddir = ${exp_installbuilddir}/jk" >> $$.sed
-sed -f $$.sed $configdir/config_vars.mk > $configdir/config_vars.mk.jk
-mkdir -p $configdir/jk
-cp $configdir/config_vars.mk.jk $configdir/jk/config_vars.mk
-
-libdir=`find $output_loc -type d -name lib`
-LD_LIBRARY_PATH=$libdir
-export LD_LIBRARY_PATH
-echo "$native_sources; ./configure --with-apxs=${apxs}.jk"
-./configure --with-apxs=${apxs}.jk
-make
-
-# Copy the dynamic library (for the moment jlibtool can't copy mod_jk.la on itself).
-(cd apache-2.0
- ../scripts/build/instdso.sh SH_LIBTOOL=${LIBTOOL} mod_jk.la `pwd`
- cp mod_jk.${so_extension} ${modules_dir}
-)
Modified: trunk/build/unix/buildbin.rhel-httpd.sh
===================================================================
--- trunk/build/unix/buildbin.rhel-httpd.sh 2008-01-30 11:11:36 UTC (rev 1312)
+++ trunk/build/unix/buildbin.rhel-httpd.sh 2008-01-30 18:17:55 UTC (rev 1313)
@@ -83,6 +83,8 @@
--with-suexec-uidmin=500 --with-suexec-gidmin=100 \
--with-pcre=builtin \
$* || exit 1
+exit 1
+make clean || exit 1
make || exit 1
) || return 1
}
@@ -105,7 +107,6 @@
if $has_openssl_loc ; then
add_conf="--with-ssl=${common_loc} --enable-ssl --with-ssl
--enable-distcache"
else
- add_conf="--with-ssl=no"
add_conf=""
fi
if $build_iconv; then
@@ -121,6 +122,10 @@
else
add_conf="$add_conf --with-expat=builtin"
fi
+# Process mod_jk if needed.
+if $has_jk; then
+ add_conf="$add_conf --enable-jk"
+fi
case ${BUILD_SYS} in
linux*)
add_conf="$add_conf --enable-pie"
@@ -169,15 +174,5 @@
# Install it
#install -m 755 worker/httpd ${RPM_BUILD_ROOT}/${_sbindir}/httpd.worker
install -m 755 httpd ${RPM_BUILD_ROOT}/${_sbindir}/httpd.worker
-
-# Process mod_jk if needed.
-if $has_jk; then
- cd ${current_loc}
- ${build_top}/util/override.sh ${sources_loc}/buildbin.asf-jk.sh ${common_loc}
${prefix_loc} ${output_loc} $has_openssl_loc $has_static_loc ${sources_loc}
- if [ $? -ne 0 ]; then
- echo "${sources_loc}/buildbin.asf-jk.sh failed"
- exit 1
- fi
-fi
echo "Done"
exit 0
Modified: trunk/build/unix/buildsrc.rhel-httpd.sh
===================================================================
--- trunk/build/unix/buildsrc.rhel-httpd.sh 2008-01-30 11:11:36 UTC (rev 1312)
+++ trunk/build/unix/buildsrc.rhel-httpd.sh 2008-01-30 18:17:55 UTC (rev 1313)
@@ -89,6 +89,17 @@
dirsources=${native_dist}/srclib/${dirsources}
#
+# Add mod_jk sources.
+if $has_jk; then
+ ${build_top}/util/override.sh ${build_top}/buildsrc.asf-jk.sh ${jk_version}
${package_src_dir}
+ if [ $? -ne 0 ]; then
+ echo "buildsrc.asf-jk.sh failed"
+ exit 1
+ fi
+ cp ${build_top}/buildbin.asf-jk*.sh ${package_src_dir}
+fi
+
+#
# Copy the windows NMAKE files (and additional stuff).
dirnmake=${build_top}/../../httpd/httpd-2.2/
if [ -d ${dirnmake} ]; then
@@ -152,12 +163,6 @@
#(cd ${dirsources}
# autoheader && autoconf || exit 1
#)
-
-if $has_jk; then
- ${build_top}/util/override.sh ${build_top}/buildsrc.asf-jk.sh ${jk_version}
${package_src_dir}
- if [ $? -ne 0 ]; then
- echo "buildsrc.asf-jk.sh failed"
- exit 1
- fi
- cp ${build_top}/buildbin.asf-jk*.sh ${package_src_dir}
-fi
+(cd ${dirsources}
+ bash buildconf
+)
Show replies by date