From c28abde66bf32e65b086938f42a9e4e32d3528de Mon Sep 17 00:00:00 2001
From: Jan David Mol <mol@astron.nl>
Date: Sat, 18 Jun 2016 10:10:49 +0000
Subject: [PATCH] Task #8887: Improved build_qpid script and upgraded to qpid
0.32
---
LCS/MessageBus/qpid/local/sbin/build_qpid | 28 +++++++++++++----------
1 file changed, 16 insertions(+), 12 deletions(-)
diff --git a/LCS/MessageBus/qpid/local/sbin/build_qpid b/LCS/MessageBus/qpid/local/sbin/build_qpid
index fc344947c88..86c3269fc65 100755
--- a/LCS/MessageBus/qpid/local/sbin/build_qpid
+++ b/LCS/MessageBus/qpid/local/sbin/build_qpid
@@ -1,16 +1,19 @@
-#!/bin/bash
-QPIDINSTALLDIR=/opt/qpid
+#!/bin/bash -eu
+
+# set default configuation
+: ${QPIDINSTALLDIR:=/opt/qpid}
+: ${PROTONVERSION:=0.8}
+: ${QPIDVERSION:=0.32}
# checkout sources for apache qpid and apache proton
if [[ -x ~/sources/proton ]]
then
echo Skipping svn download because source directory exists
else
- cd ~
- mkdir -p sources
+ mkdir -p ~/sources
cd ~/sources
- svn co http://svn.apache.org/repos/asf/qpid/proton/tags/0.8/ proton
- svn co http://svn.apache.org/repos/asf/qpid/tags/0.30/qpid/ qpid-0.30
+ svn export http://svn.apache.org/repos/asf/qpid/proton/tags/$PROTONVERSION/ proton
+ svn export http://svn.apache.org/repos/asf/qpid/tags/$QPIDVERSION/qpid/ qpid-$QPIDVERSION
fi
# build and install proton libraries
cd ~/sources/proton/
@@ -33,7 +36,7 @@ fi
PROTONDIR=$QPIDINSTALLDIR/lib/cmake/Proton
# build and install QPID C++ broker and libraries
-cd ~/sources/qpid-0.30/cpp
+cd ~/sources/qpid-$QPIDVERSION/cpp
rm -Rf ./BUILD
mkdir BUILD
cd BUILD
@@ -46,7 +49,8 @@ make -j4
make install
# setup config with 256MB storage per queue max.
-cat >> $QPIDINSTALLDIR/etc/qpid/qpidd.conf << \EOF
+mkdir -p $QPIDINSTALLDIR/etc/qpid
+cat > $QPIDINSTALLDIR/etc/qpid/qpidd.conf << \EOF
# max 256MB per queue persistent buffering
num-jfiles=32
@@ -55,19 +59,19 @@ jfile-size-pgs=128
EOF
# build and install QPID python generic libs
-cd ~/sources/qpid-0.30/python
+cd ~/sources/qpid-$QPIDVERSION/python
./setup.py build
./setup.py install --home=$QPIDINSTALLDIR
cd ..
# build and install QPID QMF python libraries
-cd ~/sources/qpid-0.30/extras/qmf
+cd ~/sources/qpid-$QPIDVERSION/extras/qmf
./setup.py build
./setup.py install --home=$QPIDINSTALLDIR
cd ../..
# build and install QPID tools
-cd ~/sources/qpid-0.30/tools
+cd ~/sources/qpid-$QPIDVERSION/tools
./setup.py build
./setup.py install --home=$QPIDINSTALLDIR
cd ..
@@ -89,7 +93,7 @@ then
echo "Applying patch on $QPIDINSTALLDIR/lib/python/qpid/messaging/driver.py for Python 2.4.x"
echo "--- $QPIDINSTALLDIR/lib/python/qpid/messaging/driver.py 2015-02-06 14:40:42.000000000 +0000" > /tmp/patch_qpid_driver_python2.4
echo "+++ $QPIDINSTALLDIR/lib/python/qpid/messaging/driver.py 2015-02-06 15:37:54.000000000 +0000" >> /tmp/patch_qpid_driver_python2.4
-cat >> /tmp/patch_qpid_driver_python2.4 << \EOF
+cat > /tmp/patch_qpid_driver_python2.4 << \EOF
@@ -1050,10 +1050,16 @@
declare = props.get("x-declare", {})
--
GitLab