OpenPAM/OpenPAM
OpenPAM/OpenPAM
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Extend the append-svn-revision-to-package-version logic to all

Browse source 
non-numeric branches, not just trunk.


git-svn-id: svn+ssh://svn.openpam.org/svn/openpam/trunk@708 185d5e19-27fe-0310-9dcf-9bff6b9f3609
This commit is contained in:
Dag-Erling Smørgrav 2013-08-18 12:13:21 +00:00
parent a03bbedb50
commit 90715a13d4
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
mkpkgng.in
View file

@ -52,7 +52,7 @@ pkgabi=$(pkg -vv | awk '$1 == "ABI:" { print $2 }')
# #
package="@PACKAGE@" package="@PACKAGE@"
version="@PACKAGE_VERSION@" version="@PACKAGE_VERSION@"
if [ "$version" = "trunk" ] ; then if ! expr "$version" : "[0-9]{1,}$" >/dev/null ; then
svnversion="$(svnversion 2>&1)" svnversion="$(svnversion 2>&1)"
svnversion=$(expr "$svnversion" : '\([0-9][0-9]*\)[A-Z]\{0,1\}$') svnversion=$(expr "$svnversion" : '\([0-9][0-9]*\)[A-Z]\{0,1\}$')
if [ -n "$svnversion" ] ; then if [ -n "$svnversion" ] ; then
@ -76,6 +76,7 @@ make="$make --no-print-directory --quiet V=0"
info "Creating temporary directory." info "Creating temporary directory."
tmproot=$(mktemp -d "${TMPDIR:-/tmp}/$package-$version.XXXXXX") tmproot=$(mktemp -d "${TMPDIR:-/tmp}/$package-$version.XXXXXX")
[ -n "$tmproot" -a -d "$tmproot" ] || error "unable to create temporary directory" [ -n "$tmproot" -a -d "$tmproot" ] || error "unable to create temporary directory"
trap "exit 1" INT
trap "info Deleting temporary directory. ; rm -rf '$tmproot'" EXIT trap "info Deleting temporary directory. ; rm -rf '$tmproot'" EXIT
set -e set -e