Changeset 14494


Ignore:
Timestamp:
Apr 12, 2015, 5:08:46 AM (6 years ago)
Author:
titer
Message:

#5925 no CFBundleVersion in Jenkins builds
Work around version mismatch between java's and command-line's svns

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/update-version-h.sh

    r11308 r14494  
    2121minor_version=`echo ${user_agent_prefix} | awk -F . '{print $2 + 0}'`
    2222
    23 # If this is a svn tree, and svnversion is available in PATH, use it to
    24 # grab the version.
    25 if [ -d ".svn" ] && type svnversion >/dev/null 2>&1; then
     23if [ -n "$JENKINS_URL" -a -n "$SVN_REVISION" ]; then
     24    # Jenkins automated build, use the set environment variables to avoid
     25    # version mismatches between java's svn and command line's svn
     26    svn_revision=$SVN_REVISION
     27elif [ -d ".svn" ] && type svnversion >/dev/null 2>&1; then
     28    # If this is a svn tree, and svnversion is available in PATH, use it to
     29    # grab the version.
    2630    svn_revision=`svnversion -n . | cut -d: -f1 | cut -dM -f1 | cut -dS -f1`
    2731else
Note: See TracChangeset for help on using the changeset viewer.