diff options
| -rw-r--r-- | chrome/chrome_installer.gypi | 8 | ||||
| -rwxr-xr-x | chrome/installer/linux/debian/build.sh | 10 | ||||
| -rwxr-xr-x | chrome/installer/linux/rpm/build.sh | 10 |
3 files changed, 20 insertions, 8 deletions
diff --git a/chrome/chrome_installer.gypi b/chrome/chrome_installer.gypi index 9c9a8dc..6ed6062 100644 --- a/chrome/chrome_installer.gypi +++ b/chrome/chrome_installer.gypi @@ -459,10 +459,14 @@ 'flock_bash': ['flock', '--', '/tmp/linux_package_lock', 'bash'], 'deb_build': '<(PRODUCT_DIR)/installer/debian/build.sh', 'rpm_build': '<(PRODUCT_DIR)/installer/rpm/build.sh', + # The script expects either "google_chrome" or "chromium" for -d, + # which is also what branding_path_component contains. 'deb_cmd': ['<@(flock_bash)', '<(deb_build)', '-o' '<(PRODUCT_DIR)', - '-b', '<(PRODUCT_DIR)', '-a', '<(target_arch)'], + '-b', '<(PRODUCT_DIR)', '-a', '<(target_arch)', + '-d', '<(branding_path_component)'], 'rpm_cmd': ['<@(flock_bash)', '<(rpm_build)', '-o' '<(PRODUCT_DIR)', - '-b', '<(PRODUCT_DIR)', '-a', '<(target_arch)'], + '-b', '<(PRODUCT_DIR)', '-a', '<(target_arch)', + '-d', '<(branding_path_component)'], 'conditions': [ ['target_arch=="ia32"', { 'deb_arch': 'i386', diff --git a/chrome/installer/linux/debian/build.sh b/chrome/installer/linux/debian/build.sh index c79f036..bf84089 100755 --- a/chrome/installer/linux/debian/build.sh +++ b/chrome/installer/linux/debian/build.sh @@ -122,11 +122,12 @@ cleanup() { usage() { echo "usage: $(basename $0) [-c channel] [-a target_arch] [-o 'dir'] " - echo " [-b 'dir']" + echo " [-b 'dir'] -d branding" echo "-c channel the package channel (trunk, asan, unstable, beta, stable)" echo "-a arch package architecture (ia32 or x64)" echo "-o dir package output directory [${OUTPUTDIR}]" echo "-b dir build input directory [${BUILDDIR}]" + echo "-d brand either chromium or google_chrome" echo "-h this help message" } @@ -161,7 +162,7 @@ verify_channel() { } process_opts() { - while getopts ":o:b:c:a:h" OPTNAME + while getopts ":o:b:c:a:d:h" OPTNAME do case $OPTNAME in o ) @@ -177,6 +178,9 @@ process_opts() { a ) TARGETARCH="$OPTARG" ;; + d ) + BRANDING="$OPTARG" + ;; h ) usage exit 0 @@ -224,7 +228,7 @@ source ${BUILDDIR}/installer/common/installer.include get_version_info VERSIONFULL="${VERSION}-${PACKAGE_RELEASE}" -if [ "$CHROMIUM_BUILD" = "_google_chrome" ]; then +if [ "$BRANDING" = "google_chrome" ]; then source "${BUILDDIR}/installer/common/google-chrome.info" else source "${BUILDDIR}/installer/common/chromium-browser.info" diff --git a/chrome/installer/linux/rpm/build.sh b/chrome/installer/linux/rpm/build.sh index 4566e08..f58799b 100755 --- a/chrome/installer/linux/rpm/build.sh +++ b/chrome/installer/linux/rpm/build.sh @@ -169,11 +169,12 @@ cleanup() { usage() { echo "usage: $(basename $0) [-c channel] [-a target_arch] [-o 'dir']" - echo " [-b 'dir']" + echo " [-b 'dir'] -d branding" echo "-c channel the package channel (trunk, asan, unstable, beta, stable)" echo "-a arch package architecture (ia32 or x64)" echo "-o dir package output directory [${OUTPUTDIR}]" echo "-b dir build input directory [${BUILDDIR}]" + echo "-d brand either chromium or google_chrome" echo "-h this help message" } @@ -214,7 +215,7 @@ verify_channel() { } process_opts() { - while getopts ":o:b:c:a:h" OPTNAME + while getopts ":o:b:c:a:d:h" OPTNAME do case $OPTNAME in o ) @@ -231,6 +232,9 @@ process_opts() { a ) TARGETARCH="$OPTARG" ;; + d ) + BRANDING="$OPTARG" + ;; h ) usage exit 0 @@ -275,7 +279,7 @@ source ${BUILDDIR}/installer/common/installer.include get_version_info -if [ "$CHROMIUM_BUILD" = "_google_chrome" ]; then +if [ "$BRANDING" = "google_chrome" ]; then source "${BUILDDIR}/installer/common/google-chrome.info" else source "${BUILDDIR}/installer/common/chromium-browser.info" |