ExternalVendorCode/conserver
1
0
Fork 0
mirror of https://github.com/bstansell/conserver.git synced 2024-12-24 06:56:41 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

move get-version so it persists and autoreconf can be run with released version

Browse Source
This commit is contained in:
Bryan Stansell 2019-03-29 19:56:14 -07:00
parent e77500eb11
commit ca0bde5039
No known key found for this signature in database
GPG Key ID: 28E4B7253029E7F6
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
configure.ac
View File

@ -29,7 +29,7 @@ AH_TEMPLATE([REQ_SERVER_CERT], [Defined if client requires server SSL certificat
AH_TEMPLATE([TRUST_UDS_CRED], [Defined if we trust credentials from UDS client]) AH_TEMPLATE([TRUST_UDS_CRED], [Defined if we trust credentials from UDS client])
dnl ### Normal initialization. ###################################### dnl ### Normal initialization. ######################################
AC_INIT([conserver],m4_esyscmd_s([./package/get-version number])) AC_INIT([conserver],m4_esyscmd_s([./gen-version number]))
AC_PREREQ(2.59) AC_PREREQ(2.59)
AC_CONFIG_SRCDIR([conserver/main.c]) AC_CONFIG_SRCDIR([conserver/main.c])
AC_CONFIG_HEADER(config.h) AC_CONFIG_HEADER(config.h)
@ -43,8 +43,8 @@ fi
MKDIR="mkdir -p -m 755" MKDIR="mkdir -p -m 755"
AC_SUBST(MKDIR) AC_SUBST(MKDIR)
AC_SUBST(CONSERVER_VERSION, m4_esyscmd_s([./package/get-version number])) AC_SUBST(CONSERVER_VERSION, m4_esyscmd_s([./gen-version number]))
AC_SUBST(CONSERVER_DATE, m4_esyscmd_s([./package/get-version date])) AC_SUBST(CONSERVER_DATE, m4_esyscmd_s([./gen-version date]))
dnl ### Custom settings. ############################################ dnl ### Custom settings. ############################################

0
package/get-version → gen-version
View File

4
package/create-changes
View File

@ -4,7 +4,7 @@ set -e
[ -z "$1" ] && echo "Usage: $0 tag" && exit 1 [ -z "$1" ] && echo "Usage: $0 tag" && exit 1
range="$1" range="$1"
date=`./package/get-version date` date=`./gen-version date`
changedate=`date -j -f '%Y/%m/%d' "$date" '+%B %-d, %Y'` changedate=`date -j -f '%Y/%m/%d' "$date" '+%B %-d, %Y'`
echo "version `./package/get-version number` ($changedate):" echo "version `./gen-version number` ($changedate):"
git log --no-merges --pretty=tformat:' - %s (%an <%ae>)' "$range" | tail -r | awk '{if (! l[$0]) {l[$0]++; print}}' | sed -e 's/ *(Bryan Stansell <bryan@conserver.com>)$//' git log --no-merges --pretty=tformat:' - %s (%an <%ae>)' "$range" | tail -r | awk '{if (! l[$0]) {l[$0]++; print}}' | sed -e 's/ *(Bryan Stansell <bryan@conserver.com>)$//'

2
package/make-and-stage-release
View File

@ -6,7 +6,7 @@ local=false && [ "$1" = "local" ] && local=true
[ -f conserver/version.h ] || { echo "you are in the wrong place" ; exit 1; } [ -f conserver/version.h ] || { echo "you are in the wrong place" ; exit 1; }
ver=`./package/get-version number` ver=`./gen-version number`
if ! $local; then if ! $local; then
echo "Ready to tag release v$ver (y/N)?" echo "Ready to tag release v$ver (y/N)?"