mirror of
https://github.com/transmission/transmission
synced 2024-12-22 15:54:57 +00:00
#5925 no CFBundleVersion in Jenkins builds
Work around version mismatch between java's and command-line's svns
This commit is contained in:
parent
7bf402bb7d
commit
0bad03e6c1
1 changed files with 7 additions and 3 deletions
|
@ -20,9 +20,13 @@ peer_id_prefix=`grep m4_define configure.ac | sed "s/[][)(]/,/g" | grep peer_id_
|
||||||
major_version=`echo ${user_agent_prefix} | awk -F . '{print $1}'`
|
major_version=`echo ${user_agent_prefix} | awk -F . '{print $1}'`
|
||||||
minor_version=`echo ${user_agent_prefix} | awk -F . '{print $2 + 0}'`
|
minor_version=`echo ${user_agent_prefix} | awk -F . '{print $2 + 0}'`
|
||||||
|
|
||||||
# If this is a svn tree, and svnversion is available in PATH, use it to
|
if [ -n "$JENKINS_URL" -a -n "$SVN_REVISION" ]; then
|
||||||
# grab the version.
|
# Jenkins automated build, use the set environment variables to avoid
|
||||||
if [ -d ".svn" ] && type svnversion >/dev/null 2>&1; then
|
# version mismatches between java's svn and command line's svn
|
||||||
|
svn_revision=$SVN_REVISION
|
||||||
|
elif [ -d ".svn" ] && type svnversion >/dev/null 2>&1; then
|
||||||
|
# If this is a svn tree, and svnversion is available in PATH, use it to
|
||||||
|
# grab the version.
|
||||||
svn_revision=`svnversion -n . | cut -d: -f1 | cut -dM -f1 | cut -dS -f1`
|
svn_revision=`svnversion -n . | cut -d: -f1 | cut -dM -f1 | cut -dS -f1`
|
||||||
else
|
else
|
||||||
# Give up and check the source files
|
# Give up and check the source files
|
||||||
|
|
Loading…
Reference in a new issue