You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by rh...@apache.org on 2013/02/16 01:04:50 UTC
svn commit: r1446820 - in /qpid/proton/trunk: CMakeLists.txt bin/release.sh
Author: rhs
Date: Sat Feb 16 00:04:50 2013
New Revision: 1446820
URL: http://svn.apache.org/r1446820
Log:
modified release script and cmake to pull proton version from version.txt
Modified:
qpid/proton/trunk/CMakeLists.txt
qpid/proton/trunk/bin/release.sh
Modified: qpid/proton/trunk/CMakeLists.txt
URL: http://svn.apache.org/viewvc/qpid/proton/trunk/CMakeLists.txt?rev=1446820&r1=1446819&r2=1446820&view=diff
==============================================================================
--- qpid/proton/trunk/CMakeLists.txt (original)
+++ qpid/proton/trunk/CMakeLists.txt Sat Feb 16 00:04:50 2013
@@ -30,9 +30,14 @@ else (BUILD_WITH_CXX)
project (Proton C)
endif (BUILD_WITH_CXX)
-set (PN_VERSION_MAJOR 0)
-set (PN_VERSION_MINOR 3)
+file(READ version.txt PN_VERSION_FILE)
+string(REGEX MATCHALL "[0-9]+" PN_VERSION_LIST "${PN_VERSION_FILE}")
+
+list(GET PN_VERSION_LIST 0 PN_VERSION_MAJOR)
+list(GET PN_VERSION_LIST 1 PN_VERSION_MINOR)
+
set (PN_VERSION "${PN_VERSION_MAJOR}.${PN_VERSION_MINOR}")
+message("PN_VERSION: ${PN_VERSION}")
enable_testing()
include (CTest)
Modified: qpid/proton/trunk/bin/release.sh
URL: http://svn.apache.org/viewvc/qpid/proton/trunk/bin/release.sh?rev=1446820&r1=1446819&r2=1446820&view=diff
==============================================================================
--- qpid/proton/trunk/bin/release.sh (original)
+++ qpid/proton/trunk/bin/release.sh Sat Feb 16 00:04:50 2013
@@ -39,7 +39,6 @@ REVISION=""
usage()
{
echo "Usage: ${ME} -v VERSION [-u URL] [-b BRANCH] [-r REVISION]"
- echo "-v VERSION Specifies the release version; e.g., 3.14"
echo "-u URL The base URL for the repository (def. ${URL})"
echo "-b BRANCH The branch to check out (def. ${BRANCH})"
echo "-r REVISION The revision to check out (def. HEAD)"
@@ -53,8 +52,6 @@ while getopts "hu:b:r:v:d" OPTION; do
case $OPTION in
h) usage;;
- v) VERSION=$OPTARG;;
-
u) URL=$OPTARG;;
b) BRANCH=$OPTARG;;
@@ -67,10 +64,6 @@ while getopts "hu:b:r:v:d" OPTION; do
esac
done
-if [[ -z "${VERSION}" ]]; then
- die "You need to specify a version."
-fi
-
if [[ -z "${REVISION}" ]]; then
# grab a consistent revision to use for all exports
REVISION=$(svn info http://svn.apache.org/repos/asf/qpid/proton | fgrep Revision: | awk '{ print $2 }')
@@ -81,12 +74,14 @@ echo "Using svn revision ${REVISION}."
##
## Create the tarball
##
-rootname="qpid-proton-${VERSION}"
WORKDIR=$(mktemp -d)
mkdir -p "${WORKDIR}"
(
cd ${WORKDIR}
- svn export -qr ${REVISION} ${URL}/${BRANCH}/ ${rootname}
+ svn export -qr ${REVISION} ${URL}/${BRANCH}/ tmp
+ VERSION=$(cat tmp/version.txt)
+ rootname="qpid-proton-${VERSION}"
+ mv tmp ${rootname}
cat <<EOF > ${rootname}/SVN_INFO
Repo: ${URL}
@@ -102,48 +97,6 @@ EOF
rm -r ${rootname}/design
echo "Generating Archive: ${CURRDIR}/${rootname}.tar.gz"
- tar zcf ${CURRDIR}/${rootname}.tar.gz ${rootname}
-)
-
-##
-## Create the Ruby GEM
-##
-rootname="qpid-proton-ruby-${VERSION}"
-WORKDIR=$(mktemp -d)
-mkdir -p "${WORKDIR}"
-(
- cd ${WORKDIR}
- svn export -qr ${REVISION} ${URL}/${BRANCH}/proton-c/bindings/ruby ${rootname}
-
- cat <<EOF > ${rootname}/SVN_INFO
-Repo: ${URL}
-Branch: ${BRANCH}
-Revision: ${REVISION}
-EOF
-
- tar zcf ${CURRDIR}/${rootname}.tar.gz ${rootname} \
- --exclude=spec \
- --exclude=CMakeLists.txt \
- --exclude=.gitignore
-)
-
-##
-## Create the Perl tarball
-##
-rootname="perl-qpid_proton-${VERSION}"
-WORKDIR=$(mktemp -d)
-mkdir -p "${WORKDIR}"
-(
- cd ${WORKDIR}
- svn export -qr ${REVISION} ${URL}/${BRANCH}/proton-c/bindings/perl ${rootname}
-
- cat <<EOF > ${rootname}/SVN_INFO
-Repo: ${URL}
-Branch: ${BRANCH}
-Revision: ${REVISION}
-EOF
-
-tar zcf ${CURRDIR}/${rootname}.tar.gz ${rootname} \
- --exclude=CMakeLists.txt \
- --exclude=.gitignore
+ tar zcf ${CURRDIR}/${rootname}.tar.gz ${rootname} \
+ --exclude=.gitignore
)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org