summaryrefslogtreecommitdiffstats
path: root/chrome/tools
diff options
context:
space:
mode:
authorthomasvl@chromium.org <thomasvl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-01-27 17:57:34 +0000
committerthomasvl@chromium.org <thomasvl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-01-27 17:57:34 +0000
commitd2ced04703f35b5f4dd2ddfb15d83a9b40ffb288 (patch)
tree260509abe1d2134ce014a3ed732411478faf1813 /chrome/tools
parent905f2dea4ae5399e1751224955d41c64dad4cbe4 (diff)
downloadchromium_src-d2ced04703f35b5f4dd2ddfb15d83a9b40ffb288.zip
chromium_src-d2ced04703f35b5f4dd2ddfb15d83a9b40ffb288.tar.gz
chromium_src-d2ced04703f35b5f4dd2ddfb15d83a9b40ffb288.tar.bz2
Use the version tool to pull the version number instead of executing the data file.
BUG=none TEST=none Review URL: http://codereview.chromium.org/6403004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@72818 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/tools')
-rwxr-xr-xchrome/tools/build/mac/tweak_info_plist9
1 files changed, 6 insertions, 3 deletions
diff --git a/chrome/tools/build/mac/tweak_info_plist b/chrome/tools/build/mac/tweak_info_plist
index 049af0e..4abca09 100755
--- a/chrome/tools/build/mac/tweak_info_plist
+++ b/chrome/tools/build/mac/tweak_info_plist
@@ -95,8 +95,11 @@ if [ "${USE_SVN}" = "1" ] ; then
fi
# Pull in the Chrome version number.
-. "${TOP}/chrome/VERSION"
-FULL_VERSION="${MAJOR}.${MINOR}.${BUILD}.${PATCH}"
+VERSION_TOOL="${TOP}/chrome/tools/build/version.py"
+VERSION_FILE="${TOP}/chrome/VERSION"
+FULL_VERSION=$("${VERSION_TOOL}" -f "${VERSION_FILE}" \
+ -t "@MAJOR@.@MINOR@.@BUILD@.@PATCH@")
+BUNDLE_VERSION=$("${VERSION_TOOL}" -f "${VERSION_FILE}" -t "@BUILD@.@PATCH@")
# I really hate how "defaults" doesn't take a real pathname but instead insists
# on appending ".plist" to everything.
@@ -129,7 +132,7 @@ defaults write "${TMP_INFO_PLIST_DEFAULTS}" \
# BUILD will always be an increasing value, so BUILD_PATH gives us something
# unique that meetings what LS wants.
defaults write "${TMP_INFO_PLIST_DEFAULTS}" \
- CFBundleVersion -string "${BUILD}.${PATCH}"
+ CFBundleVersion -string "${BUNDLE_VERSION}"
# Add or remove the Breakpad keys.
if [ "${USE_BREAKPAD}" = "1" ] ; then