Commit d2ced047 authored by thomasvl@chromium.org's avatar thomasvl@chromium.org

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
parent 905f2dea
...@@ -95,8 +95,11 @@ if [ "${USE_SVN}" = "1" ] ; then ...@@ -95,8 +95,11 @@ if [ "${USE_SVN}" = "1" ] ; then
fi fi
# Pull in the Chrome version number. # Pull in the Chrome version number.
. "${TOP}/chrome/VERSION" VERSION_TOOL="${TOP}/chrome/tools/build/version.py"
FULL_VERSION="${MAJOR}.${MINOR}.${BUILD}.${PATCH}" 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 # I really hate how "defaults" doesn't take a real pathname but instead insists
# on appending ".plist" to everything. # on appending ".plist" to everything.
...@@ -129,7 +132,7 @@ defaults write "${TMP_INFO_PLIST_DEFAULTS}" \ ...@@ -129,7 +132,7 @@ defaults write "${TMP_INFO_PLIST_DEFAULTS}" \
# BUILD will always be an increasing value, so BUILD_PATH gives us something # BUILD will always be an increasing value, so BUILD_PATH gives us something
# unique that meetings what LS wants. # unique that meetings what LS wants.
defaults write "${TMP_INFO_PLIST_DEFAULTS}" \ defaults write "${TMP_INFO_PLIST_DEFAULTS}" \
CFBundleVersion -string "${BUILD}.${PATCH}" CFBundleVersion -string "${BUNDLE_VERSION}"
# Add or remove the Breakpad keys. # Add or remove the Breakpad keys.
if [ "${USE_BREAKPAD}" = "1" ] ; then if [ "${USE_BREAKPAD}" = "1" ] ; then
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment