Tweak SVNVersion be happier (matches windows)....

build/mac/tweak_app_infoplist

 #!/bin/bash
 
 # Copyright (c) 2009 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 set -e
 
 # Pull off the optional args
 USE_BREAKPAD=0
@@ skipping 47 matching lines @@
 
 TOP="${SRCROOT}/.."
 BUILD_BRANDING=$1
 BRAND_SCRIPT="${TOP}/build/branding_value.sh"
 
 set -x
 
 APP_NAME=$("${BRAND_SCRIPT}" "${BUILD_BRANDING}" PRODUCT_FULLNAME)
 SRC_APP_PATH="${BUILT_PRODUCTS_DIR}/${APP_NAME}.app"
 
-# Figure out what version this build corresponds to.  Just use the svn revision
-# for now. Warning: my svnversion returns 10495:10552M. But that's ok since
-# it is just for reference.
-SVN_REVISION=$(svnversion "${SRCROOT}")
+# Visible in the about:version page.
+SVN_REVISION=$(svn info "${SRCROOT}" | grep "Revision:" | cut -d" " -f2-)
 if [ -z "${SVN_REVISION}" ] ; then

[jeremy, 2009/06/01 18:15:06]

Could you add a comment about needing to add a codepath for GIT?

-  echo "warning: could not determine svn revision" >&2
+  echo "Could not determine svn revision.  This may be OK." >&2
 fi
 
 # Pull in the chrome version number
 . "${TOP}/chrome/VERSION"
 FULL_VERSION="${MAJOR}.${MINOR}.${BUILD}.${PATCH}"
 SHORT_VERSION="${MAJOR}.${MINOR}.${BUILD}"
 
 # Fetch the copyright
 COPYRIGHT_STRING=$("${BRAND_SCRIPT}" "${BUILD_BRANDING}" COPYRIGHT)
 # Map (c) or (C) to the copyright sign
 COPYRIGHT_STRING=$(echo "${COPYRIGHT_STRING}" | sed -e $'s/([cC])/\302\251/g')
 
 # Build the full copyright string
 LONG_COPYRIGHT="${APP_NAME} ${FULL_VERSION}, ${COPYRIGHT_STRING}"
 
 # I really hate how "defaults" doesn't take a real pathname but instead insists
 # on appending ".plist" to everything.
 INFO_PLIST_PATH="Contents/Info.plist"
 TMP_INFO_PLIST_DEFAULTS="${TEMP_DIR}/Info"
 TMP_INFO_PLIST="${TMP_INFO_PLIST_DEFAULTS}.plist"
 cp "${SRC_APP_PATH}/${INFO_PLIST_PATH}" "${TMP_INFO_PLIST}"
 
 # Save off the svn version number in case we need it
-defaults write "${TMP_INFO_PLIST_DEFAULTS}" \
+if [ ! -z "${SVN_REVISION}" ] ; then
+  defaults write "${TMP_INFO_PLIST_DEFAULTS}" \
     SVNRevision -string "${SVN_REVISION}"
+fi
 
 # Add public version info so "Get Info" works
 defaults write "${TMP_INFO_PLIST_DEFAULTS}" \
     CFBundleGetInfoString -string "${LONG_COPYRIGHT}"
 defaults write "${TMP_INFO_PLIST_DEFAULTS}" \
     CFBundleShortVersionString -string "${SHORT_VERSION}"
 # Honor the 429496.72.95 limit.  The maximum comes from splitting 2^32 - 1 into
 # 6, 2, 2 digits.  The limitation was present in Tiger, but it could have been
 # fixed in later OS release, but hasn't been tested (it's easy enough to find
 # out with "lsregister -dump).
@@ skipping 43 matching lines @@
   defaults delete "${TMP_INFO_PLIST_DEFAULTS}" KSVersion || true
   defaults delete "${TMP_INFO_PLIST_DEFAULTS}" KSProductID || true
   defaults delete "${TMP_INFO_PLIST_DEFAULTS}" KSUpdateURL || true
 fi
 
 # Info.plist will work perfectly well in any plist format, but traditionally
 # applications use xml1 for this, so convert it back after whatever defaults
 # might have done.
 plutil -convert xml1 "${TMP_INFO_PLIST}"
 cp "${TMP_INFO_PLIST}" "${SRC_APP_PATH}/${INFO_PLIST_PATH}"