Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(209)

Unified Diff: chrome/tools/build/mac/tweak_info_plist

Issue 6403004: Use the version tool to pull the version number instead of executing the data... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' Created 9 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/tools/build/mac/tweak_info_plist
===================================================================
--- chrome/tools/build/mac/tweak_info_plist (revision 72809)
+++ chrome/tools/build/mac/tweak_info_plist (working copy)
@@ -95,8 +95,11 @@
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 @@
# 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
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698