11:47 a.m.
Author: jfrederic.clere(a)jboss.com
Date: 2007-12-14 12:47:49 -0500 (Fri, 14 Dec 2007)
New Revision: 1219
Added:
trunk/build/unix/buildbin.asf-jk.sh
trunk/build/unix/buildsrc.asf-jk.sh
Modified:
trunk/build/unix/build.sh
trunk/build/unix/buildbin.rhel-httpd.sh
trunk/build/unix/buildsrc.rhel-httpd.sh
trunk/build/unix/package.list
Log:
Add building of mod_jk. (still need fixing).
Modified: trunk/build/unix/build.sh
===================================================================
--- trunk/build/unix/build.sh 2007-12-14 12:52:19 UTC (rev 1218)
+++ trunk/build/unix/build.sh 2007-12-14 17:47:49 UTC (rev 1219)
@@ -721,6 +721,11 @@
# General part
cp JBossORG-EULA.txt ${package_output_dir}
+ # mod_jk
+ if $has_jk; then
+ override ${package_src_dir}/buildbin.asf-jk.sh ${build_common_dir}
${package_dist_dir} ${package_output_dir} $has_openssl $has_static
+ fi
+
# Build the binary distribution tarball
buildtar ${package_output_dir} "*" ${dst_dir} ${package_build_name}
}
@@ -805,15 +810,24 @@
override ${build_top}/buildsrc.${PACKAGE}.sh ${svn_tagname} ${package_src_dir}
#
+# Add mod_jk if needed.
+if $has_jk; then
+ override ${build_top}/buildsrc.asf-jk.sh ${jk_version} ${package_src_dir}
+ cp ./buildbin.asf-jk*.sh ${package_src_dir}
+fi
+
+#
# Copy build files
cp ./build.sh ${package_src_dir}
cp ./buildbin.${PACKAGE}*.sh ${package_src_dir}
+mkdir -p ${package_src_dir}/util
+cp util/*.sh ${package_src_dir}/util
# TODO: Generate package list instead copying
cat > ${package_src_dir}/package.list << EOF
# THIS FILE WAS AUTOGENERATED BY `basename $0`
#
-${PACKAGE}|${build_version}|${apr_version}|${apu_version}|${api_version}|${ssl_version}|${zlib_version}|${svn_tagname}
+${PACKAGE}|${build_version}|${svn_tagname}|${apr_version}|${apu_version}|${api_version}|${ssl_version}|${zlib_version}|${jk_version}
EOF
Added: trunk/build/unix/buildbin.asf-jk.sh
===================================================================
--- trunk/build/unix/buildbin.asf-jk.sh (rev 0)
+++ trunk/build/unix/buildbin.asf-jk.sh 2007-12-14 17:47:49 UTC (rev 1219)
@@ -0,0 +1,55 @@
+#!/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.
+
+common_loc=$1
+prefix_loc=$2
+output_loc=$3
+has_openssl=$4
+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`
+echo "$native_sources; ./configure --with-apxs=${apxs}"
+./configure --with-apxs=${apxs}
+make
+make DESTDIR=$output_loc` install
Property changes on: trunk/build/unix/buildbin.asf-jk.sh
___________________________________________________________________
Name: svn:executable
+ *
Modified: trunk/build/unix/buildbin.rhel-httpd.sh
===================================================================
--- trunk/build/unix/buildbin.rhel-httpd.sh 2007-12-14 12:52:19 UTC (rev 1218)
+++ trunk/build/unix/buildbin.rhel-httpd.sh 2007-12-14 17:47:49 UTC (rev 1219)
@@ -82,11 +82,12 @@
#
# Set needed variables. (defaulted to hacked values).
PREFIX=/opt/jboss/httpd
+
_sysconfdir=${PREFIX}
_prefix=${PREFIX}
_sbindir=${PREFIX}/sbin
_bindir=${PREFIX}/bin
-_mandir=${PREFIX}/man
+_mandir=${PREFIX}/man
_libdir=${PREFIX}/lib
_includedir=${PREFIX}/include
contentdir=${PREFIX}/htdocs
Added: trunk/build/unix/buildsrc.asf-jk.sh
===================================================================
--- trunk/build/unix/buildsrc.asf-jk.sh (rev 0)
+++ trunk/build/unix/buildsrc.asf-jk.sh 2007-12-14 17:47:49 UTC (rev 1219)
@@ -0,0 +1,53 @@
+#!/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-06-01 18:00:27 +0200 (Fri, 01
Jun 2007) $"
+echo ""
+echo "Started : `date`"
+echo "Tag : $1"
+echo "Target : $2"
+echo ""
+
+# parameters
+# $1: The tag to use something like 2.2.6 or trunk
+# $2: Directory where to put the sources.
+
+native_tag=$1
+native_dist=$2
+
+# we need something like:
+#
http://archive.apache.org/dist/tomcat/tomcat-connectors/jk/source/jk-1.2....
+URLBASE=http://archive.apache.org/dist/tomcat/tomcat-connectors/jk/source/jk-$1/tomcat-connectors-$1-src
+URLBASEBACK=http://ftp.heanet.ie/mirrors/www.apache.org/dist/tomcat/tomcat-connectors/jk/source/jk-$1/tomcat-connectors-$1-src
+case $BUILD_SYS in
+ windows)
+ URL=${URLBASE}.zip
+ URLBACK=${URLBASEBACK}.zip
+ ;;
+ *)
+ URL=${URLBASE}.tar.gz
+ URLBACK=${URLBASEBACK}.tar.gz
+esac
+
+util/ckeckdownload.sh $build_cache_dir $package_src_dir $build_top
tomcat-connectors-${native_tag}-src $URL $URLBACK
Property changes on: trunk/build/unix/buildsrc.asf-jk.sh
___________________________________________________________________
Name: svn:executable
+ *
Modified: trunk/build/unix/buildsrc.rhel-httpd.sh
===================================================================
--- trunk/build/unix/buildsrc.rhel-httpd.sh 2007-12-14 12:52:19 UTC (rev 1218)
+++ trunk/build/unix/buildsrc.rhel-httpd.sh 2007-12-14 17:47:49 UTC (rev 1219)
@@ -95,13 +95,16 @@
remove_list=""
;;
*)
- remove_list="httpd-2.0.54-selinux.patch"
+ remove_list="httpd-2.0.54-selinux.patch httpd-2.1.10-apxs.patch
httpd-2.0.45-deplibs.patch"
;;
esac
-if [ -z ${remove_list} ]; then
- echo "Linux applying all the rhel patches"
+if [ -z "${remove_list}" ]; then
+ echo "applying all the rhel patches"
else
- cat ${WHERE}/patch.sh | grep -v ${remove_list} > ${WHERE}/patch.sh
+ for patch in `echo "$remove_list"`
+ do
+ cat ${WHERE}/patch.sh | grep -v ${patch} > ${WHERE}/patch.sh
+ done
fi
echo "Applying the rhel patches to ${dirsources}"
chmod a+x ${WHERE}/patch.sh
Modified: trunk/build/unix/package.list
===================================================================
--- trunk/build/unix/package.list 2007-12-14 12:52:19 UTC (rev 1218)
+++ trunk/build/unix/package.list 2007-12-14 17:47:49 UTC (rev 1219)
@@ -10,4 +10,4 @@
jboss-sight|1.0.2|trunk|1.2.8|1.2.8|1.2.1
# httpd
jboss-httpd|0.0.1|2.2.6
-rhel-httpd|0.0.1|httpd-2_2_3-11_el5
+rhel-httpd|0.0.1|httpd-2_2_3-11_el5||||||1.2.25