Author: jfrederic.clere(a)jboss.com
Date: 2008-02-04 07:51:06 -0500 (Mon, 04 Feb 2008)
New Revision: 1346
Modified:
trunk/build/unix/build.sh
trunk/build/unix/buildsrc.rhel-httpd.sh
Log:
Arrange the rhel apr logic.
Modified: trunk/build/unix/build.sh
===================================================================
--- trunk/build/unix/build.sh 2008-02-04 11:41:18 UTC (rev 1345)
+++ trunk/build/unix/build.sh 2008-02-04 12:51:06 UTC (rev 1346)
@@ -188,13 +188,17 @@
apr:*)
apr_version=`echo "${arg}" | ${awk} -F':' '{print
$3}'`
apr_type=`echo "${arg}" | ${awk} -F':' '{print $2}'`
- has_apr=true
+ if [ "$apr_type" == "v" ]; then
+ has_apr=true
+ fi
export apr_version
;;
apu:*)
apu_version=`echo "${arg}" | ${awk} -F':' '{print
$3}'`
apu_type=`echo "${arg}" | ${awk} -F':' '{print $2}'`
- has_apu=true
+ if [ "$apu_type" == "v" ]; then
+ has_apu=true
+ fi
export apu_version
;;
api:*)
Modified: trunk/build/unix/buildsrc.rhel-httpd.sh
===================================================================
--- trunk/build/unix/buildsrc.rhel-httpd.sh 2008-02-04 11:41:18 UTC (rev 1345)
+++ trunk/build/unix/buildsrc.rhel-httpd.sh 2008-02-04 12:51:06 UTC (rev 1346)
@@ -50,14 +50,24 @@
#
# Build the sources from the rhel repo according to the information in data.
#
http://cvs.devel.redhat.com/cgi-bin/cvsweb.cgi/rpms/apr/RHEL-5/
-util/buildrhelsrc.sh
http://cvs.devel.redhat.com/repo/dist/apr apr/RHEL-5 trunk
${native_dist} apr rhel-httpd ${build_version}
+if [ "x${apr_version}" = "x" ]; then
+ tag=trunk
+else
+ tag=${apr_version}
+fi
+util/buildrhelsrc.sh
http://cvs.devel.redhat.com/repo/dist/apr apr/RHEL-5 ${tag}
${native_dist} apr rhel-httpd ${build_version}
if [ $? -ne 0 ]; then
echo "util/buildrhelsrc.sh apr failed"
exit 1
fi
#
http://cvs.devel.redhat.com/cgi-bin/cvsweb.cgi/rpms/apr-util/RHEL-5/
-util/buildrhelsrc.sh
http://cvs.devel.redhat.com/repo/dist/apr-util apr-util/RHEL-5 trunk
${native_dist} apr-util rhel-httpd ${build_version}
+if [ "x${apu_version}" = "x" ]; then
+ tag=trunk
+else
+ tag=${apu_version}
+fi
+util/buildrhelsrc.sh
http://cvs.devel.redhat.com/repo/dist/apr-util apr-util/RHEL-5
${tag} ${native_dist} apr-util rhel-httpd ${build_version}
if [ $? -ne 0 ]; then
echo "util/buildrhelsrc.sh apr-util failed"
exit 1