xan/awips2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Omaha #2991 Initial add of qpid 0.28. Fixed an issue with the x86_64 directory not being created.

Browse source 
Change-Id: Iacd5c7d8b41ab3100b7ea9c409ec18691ffe7fdc

Former-commit-id: 2f9c1e8303 [formerly b50c56c84968f4765245ec12fa33c3037b0380ff]
Former-commit-id: 081ea4a12a
This commit is contained in:
David Lovely 2014-10-23 15:55:26 -05:00
parent e2759d38e4
commit 2f02a475a8
1 changed files with 21 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
rpms/build/common/rpms.sh
View file

@ -49,6 +49,22 @@ function buildQPID()
pushd . > /dev/null 2>&1
# ensure that the destination rpm directories exist
if [ ! -d ${AWIPSII_TOP_DIR}/RPMS/noarch ]; then
mkdir -p ${AWIPSII_TOP_DIR}/RPMS/noarch
if [ $? -ne 0 ]; then
exit 1
fi
fi
# ensure that the destination rpm directories exist
if [ ! -d ${AWIPSII_TOP_DIR}/RPMS/x86_64 ]; then
mkdir -p ${AWIPSII_TOP_DIR}/RPMS/x86_64
if [ $? -ne 0 ]; then
exit 1
fi
fi
cd ${WORKSPACE}/rpms/awips2.qpid/0.18/deploy.builder
if [ $? -ne 0 ]; then
echo "ERROR: Failed to build the qpid rpms."
@ -61,14 +77,6 @@ function buildQPID()
return 1
fi
# ensure that the destination rpm directories exist
if [ ! -d ${AWIPSII_TOP_DIR}/RPMS/noarch ]; then
mkdir -p ${AWIPSII_TOP_DIR}/RPMS/noarch
if [ $? -ne 0 ]; then
exit 1
fi
fi
# Copy the 0.18 qpid rpms
cd ${WORKSPACE}/rpms/awips2.qpid/0.18/RPMS/noarch
if [ $? -ne 0 ]; then
@ -90,6 +98,11 @@ function buildQPID()
return 1
fi
#build 0.28
export AWIPS_II_TOP_DIR
cd ${WORKSPACE}/installers/RPMs/qpid-java-broker-0.28
/bin/bash build.sh
popd > /dev/null 2>&1
return 0