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

Unified Diff: build/mac/tweak_app_infoplist

Issue 113555: Adding a general script to fetch values from the BRANDING files. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' Created 11 years, 7 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
« build/mac/build_app_dmg ('K') | « build/mac/dump_app_syms ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/mac/tweak_app_infoplist
===================================================================
--- build/mac/tweak_app_infoplist (revision 16367)
+++ build/mac/tweak_app_infoplist (working copy)
@@ -54,18 +54,13 @@
TOP="${SRCROOT}/.."
BUILD_BRANDING=$1
-if [ "${BUILD_BRANDING}" == "Chromium" ]; then
- APP_NAME="Chromium"
-elif [ "${BUILD_BRANDING}" == "Chrome" ]; then
- APP_NAME="Google Chrome"
-else
- echo "error: unknown branding: ${BUILD_BRANDING}" >&2
- exit 1
-fi
-SRC_APP_PATH="${BUILT_PRODUCTS_DIR}/${APP_NAME}.app"
set -x
+BRAND_SCRIPT="${TOP}/build/branding_value.sh"
Mark Mentovai 2009/05/19 13:57:14 -x section?
+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.
@@ -79,16 +74,8 @@
FULL_VERSION="${MAJOR}.${MINOR}.${BUILD}.${PATCH}"
SHORT_VERSION="${MAJOR}.${MINOR}.${BUILD}"
-# Load the branding file
-if [ "${BUILD_BRANDING}" == "Chromium" ]; then
- BRANDING_FILE="${TOP}/chrome/app/theme/chromium/BRANDING"
-elif [ "${BUILD_BRANDING}" == "Chrome" ]; then
- BRANDING_FILE="${TOP}/chrome/app/theme/google_chrome/BRANDING"
-else
- echo "error: unknown branding: ${BUILD_BRANDING}" >&2
- exit 1
-fi
-COPYRIGHT_STRING=$(sed -n -e 's/^COPYRIGHT=\(.*\)$/\1/p' "${BRANDING_FILE}")
+# 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/mac/build_app_dmg ('K') | « build/mac/dump_app_syms ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698