DragonX/dragonx
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 3 Wiki Activity

Auto merge of #2281 - str4d:release-version-handling, r=nathan-at-least

Browse Source 
Release version handling

- Convert Zcash versions to Debian format for packaging
- [manpage] Handle build numbers in versions
This commit is contained in:
Homu
2017-05-18 17:40:47 -07:00
parent 3cbcabc16d 2bf4f2781b
commit 4578919278
3 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
contrib/devtools/gen-manpages.sh
View File

@@ -11,7 +11,9 @@ ZCASHTX=${ZCASHTX:-$SRCDIR/zcash-tx}
[ ! -x $ZCASHD ] && echo "$ZCASHD not found or not executable." && exit 1 [ ! -x $ZCASHD ] && echo "$ZCASHD not found or not executable." && exit 1
# The autodetected version git tag can screw up manpage output a little bit # The autodetected version git tag can screw up manpage output a little bit
ZECVER=($($ZCASHCLI --version | head -n1 | awk -F'[ -]' '{ print $5, $6 }')) ZECVERSTR=$($ZCASHCLI --version | head -n1 | awk '{ print $NF }')
ZECVER=$(echo $ZECVERSTR | awk -F- '{ OFS="-"; NF--; print $0; }')
ZECCOMMIT=$(echo $ZECVERSTR | awk -F- '{ print $NF }')
# Create a footer file with copyright content. # Create a footer file with copyright content.
# This gets autodetected fine for zcashd if --version-string is not set, # This gets autodetected fine for zcashd if --version-string is not set,
@@ -21,8 +23,8 @@ $ZCASHD --version | sed -n '1!p' >> footer.h2m
for cmd in $ZCASHD $ZCASHCLI $ZCASHTX; do for cmd in $ZCASHD $ZCASHCLI $ZCASHTX; do
cmdname="${cmd##*/}" cmdname="${cmd##*/}"
help2man -N --version-string=${ZECVER[0]} --include=footer.h2m -o ${MANDIR}/${cmdname}.1 ${cmd} help2man -N --version-string=$ZECVER --include=footer.h2m -o ${MANDIR}/${cmdname}.1 ${cmd}
sed -i "s/\\\-${ZECVER[1]}//g" ${MANDIR}/${cmdname}.1 sed -i "s/\\\-$ZECCOMMIT//g" ${MANDIR}/${cmdname}.1
done done
rm -f footer.h2m rm -f footer.h2m

2
doc/release-process.md
View File

@@ -88,7 +88,7 @@ Add the newly created release notes to the Git repository:
Update the Debian package changelog: Update the Debian package changelog:
export DEBVERSION="${ZCASH_RELEASE}" export DEBVERSION=$(echo $ZCASH_RELEASE | sed 's/-beta/~beta/' | sed 's/-rc/~rc/' | sed 's/-/+/')
export DEBEMAIL="${DEBEMAIL:-team@z.cash}" export DEBEMAIL="${DEBEMAIL:-team@z.cash}"
export DEBFULLNAME="${DEBFULLNAME:-Zcash Company}" export DEBFULLNAME="${DEBFULLNAME:-Zcash Company}"

3
zcutil/build-debian-package.sh
View File

@@ -18,6 +18,7 @@ if [ ! -d $BUILD_PATH ]; then
fi fi
PACKAGE_VERSION=$($SRC_PATH/src/zcashd --version | grep version | cut -d' ' -f4 | tr -d v) PACKAGE_VERSION=$($SRC_PATH/src/zcashd --version | grep version | cut -d' ' -f4 | tr -d v)
DEBVERSION=$(echo $PACKAGE_VERSION | sed 's/-beta/~beta/' | sed 's/-rc/~rc/' | sed 's/-/+/')
BUILD_DIR="$BUILD_PATH/$PACKAGE_NAME-$PACKAGE_VERSION-amd64" BUILD_DIR="$BUILD_PATH/$PACKAGE_NAME-$PACKAGE_VERSION-amd64"
if [ -d $BUILD_DIR ]; then if [ -d $BUILD_DIR ]; then
@@ -63,7 +64,7 @@ cd $SRC_PATH/contrib
# Create the control file # Create the control file
dpkg-shlibdeps $DEB_BIN/zcashd $DEB_BIN/zcash-cli dpkg-shlibdeps $DEB_BIN/zcashd $DEB_BIN/zcash-cli
dpkg-gencontrol -P$BUILD_DIR dpkg-gencontrol -P$BUILD_DIR -v$DEBVERSION
# Create the Debian package # Create the Debian package
fakeroot dpkg-deb --build $BUILD_DIR fakeroot dpkg-deb --build $BUILD_DIR