Adding a general script to fetch values from the BRANDING files.

Adding a general script to fetch values from the BRANDING files.
Update the scripts to fetch values from the BRANDING files instead of hardcoding the values.

Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=16372

[TVL, 2009-05-19 13:25:04]

Here go, this gets more of the hardcoded stuff out of script files which seems
better/safer.

[Mark Mentovai, 2009-05-19 13:38:03]

http://codereview.chromium.org/113555/diff/4/5
File build/branding_value.sh (right):

http://codereview.chromium.org/113555/diff/4/5#newcode25
Line 25: BUILD_DIR=$(dirname "$(echo $0 | sed -e "s,^\([^/]\),$(pwd)/\1,")")
RE for path manipulation is fragile.

What you probably want to do is

pushd $(dirname ${0})/..
BUILD_DIR=$(pwd)
popd

Or maybe you can adjust things so that the first argument is a pathname to a
branding file instead of a branding key name?

http://codereview.chromium.org/113555/diff/4/5#newcode28
Line 28: # Load the branding file
case ${BUILD_BRANDING} in
  Chromium)
    BRANDING_FILE=...
    ;;
  Chrome)
    BRANDING_FILE=...
    ;;
  *)
    echo ... >&2
    exit 1
    ;;
esac

http://codereview.chromium.org/113555/diff/4/5#newcode38
Line 38: BRANDING_VALUE=$(sed -n -e "s/^${REQUESTED_KEY}=\(.*\)\$/\1/p"
"${BRANDING_FILE}")
80

http://codereview.chromium.org/113555/diff/4/8
File build/mac/build_app_dmg (right):

http://codereview.chromium.org/113555/diff/4/8#newcode29
Line 29: APP_NAME=$("${TOP}/build/branding_value.sh" "${BUILD_BRANDING}"
PRODUCT_FULLNAME)
80

http://codereview.chromium.org/113555/diff/4/6
File build/mac/dump_app_syms (right):

http://codereview.chromium.org/113555/diff/4/6#newcode23
Line 23: SRC_APP_NAME=$("${TOP}/build/branding_value.sh" "${BUILD_BRANDING}"
PRODUCT_FULLNAME)
80

http://codereview.chromium.org/113555/diff/4/7
File build/mac/tweak_app_infoplist (right):

http://codereview.chromium.org/113555/diff/4/7#newcode60
Line 60: APP_NAME=$("${TOP}/build/branding_value.sh" "${BUILD_BRANDING}"
PRODUCT_FULLNAME)
80

http://codereview.chromium.org/113555/diff/4/7#newcode77
Line 77: COPYRIGHT_STRING=$("${TOP}/build/branding_value.sh" "${BUILD_BRANDING}"
COPYRIGHT)
80

[TVL, 2009-05-19 13:47:32]

http://codereview.chromium.org/113555/diff/4/5
File build/branding_value.sh (right):

http://codereview.chromium.org/113555/diff/4/5#newcode25
Line 25: BUILD_DIR=$(dirname "$(echo $0 | sed -e "s,^\([^/]\),$(pwd)/\1,")")
On 2009/05/19 13:38:03, Mark Mentovai wrote:
> RE for path manipulation is fragile.
> 
> What you probably want to do is
> 
> pushd $(dirname ${0})/..
> BUILD_DIR=$(pwd)
> popd
> 
> Or maybe you can adjust things so that the first argument is a pathname to a
> branding file instead of a branding key name?

I want to keep it easy for scripts to get passed the GYP branding and directly
relay it here.

changed with redirects for what pushd/popd output

http://codereview.chromium.org/113555/diff/4/5#newcode28
Line 28: # Load the branding file
On 2009/05/19 13:38:03, Mark Mentovai wrote:
> case ${BUILD_BRANDING} in
>   Chromium)
>     BRANDING_FILE=...
>     ;;
>   Chrome)
>     BRANDING_FILE=...
>     ;;
>   *)
>     echo ... >&2
>     exit 1
>     ;;
> esac

why do i always forget about case?

[Mark Mentovai, 2009-05-19 13:57:14]

LGTM

http://codereview.chromium.org/113555/diff/16/20
File build/mac/build_app_dmg (right):

http://codereview.chromium.org/113555/diff/16/20#newcode29
Line 29: BRAND_SCRIPT="${TOP}/build/branding_value.sh"
I don't think you need this in the "set -x" section, it seems more like it
belongs with PKG_DMG=.

http://codereview.chromium.org/113555/diff/16/20#newcode30
Line 30: APP_NAME=$("${BRAND_SCRIPT}" "${BUILD_BRANDING}" PRODUCT_FULLNAME)
On the other hand, this can stay in the "set -x" section, and should be more
than enough to share the value of BRAND_SCRIPT.

http://codereview.chromium.org/113555/diff/16/19
File build/mac/tweak_app_infoplist (right):

http://codereview.chromium.org/113555/diff/16/19#newcode60
Line 60: BRAND_SCRIPT="${TOP}/build/branding_value.sh"
-x section?