Chromium Code Reviews| OLD | NEW | 
|---|---|
| 1 #!/bin/sh | 1 #!/bin/sh | 
| 2 | 2 | 
| 3 # Copyright (c) 2009 The Chromium Authors. All rights reserved. | 3 # Copyright (c) 2009 The Chromium Authors. All rights reserved. | 
| 4 # Use of this source code is governed by a BSD-style license that can be | 4 # Use of this source code is governed by a BSD-style license that can be | 
| 5 # found in the LICENSE file. | 5 # found in the LICENSE file. | 
| 6 | 6 | 
| 7 # Normally you don't want to build a dmg out of a debug build. | 7 # Normally you don't want to build a dmg out of a debug build. | 
| 8 if [ "${CONFIGURATION}" != "Release" ] ; then | 8 if [ "${CONFIGURATION}" != "Release" ] ; then | 
| 9 echo "warning: building dmg in non-release mode" >&2 | 9 echo "warning: building dmg in non-release mode" >&2 | 
| 10 fi | 10 fi | 
| 11 | 11 | 
| 12 # Make sure we got the branding passed to us | 12 # Make sure we got the branding passed to us | 
| 13 if [ $# -ne 1 ]; then | 13 if [ $# -ne 1 ]; then | 
| 14 echo "error: missing branding as an argument" >&2 | 14 echo "error: missing branding as an argument" >&2 | 
| 15 exit 1 | 15 exit 1 | 
| 16 fi | 16 fi | 
| 17 | 17 | 
| 18 # fail on anything from here out | 18 # fail on anything from here out | 
| 19 set -e | 19 set -e | 
| 20 | 20 | 
| 21 TOP="${SRCROOT}/.." | 21 TOP="${SRCROOT}/.." | 
| 22 PKG_DMG="${TOP}/build/mac/pkg-dmg" | 22 PKG_DMG="${TOP}/build/mac/pkg-dmg" | 
| 23 | 23 | 
| 24 BUILD_BRANDING=$1 | 24 BUILD_BRANDING=$1 | 
| 25 if [ "${BUILD_BRANDING}" == "Chromium" ]; then | 25 | 
| 26 APP_NAME="Chromium" | 26 # show things as we run them | 
| 27 DMG_NAME="Chromium.dmg" | 27 set -x | 
| 28 elif [ "${BUILD_BRANDING}" == "Chrome" ]; then | 28 | 
| 29 APP_NAME="Google Chrome" | 29 BRAND_SCRIPT="${TOP}/build/branding_value.sh" | 
| 
 
Mark Mentovai
2009/05/19 13:57:14
I don't think you need this in the "set -x" sectio
 
 | |
| 30 DMG_NAME="GoogleChrome.dmg" | 30 APP_NAME=$("${BRAND_SCRIPT}" "${BUILD_BRANDING}" PRODUCT_FULLNAME) | 
| 
 
Mark Mentovai
2009/05/19 13:57:14
On the other hand, this can stay in the "set -x" s
 
 | |
| 31 else | 31 DMG_NAME=$(echo "${APP_NAME}" | sed "s/ //g") | 
| 32 echo "error: unknown branding: ${BUILD_BRANDING}" >&2 | |
| 33 exit 1 | |
| 34 fi | |
| 35 | 32 | 
| 36 SRC_APP_PATH="${BUILT_PRODUCTS_DIR}/${APP_NAME}.app" | 33 SRC_APP_PATH="${BUILT_PRODUCTS_DIR}/${APP_NAME}.app" | 
| 37 VOL_NAME="${APP_NAME}" | 34 VOL_NAME="${APP_NAME}" | 
| 38 DST_DMG_PATH="${BUILT_PRODUCTS_DIR}/${DMG_NAME}" | 35 DST_DMG_PATH="${BUILT_PRODUCTS_DIR}/${DMG_NAME}" | 
| 39 | 36 | 
| 40 # show things as we run them | |
| 41 set -x | |
| 42 | |
| 43 # Call the real working | 37 # Call the real working | 
| 44 "${PKG_DMG}" --source /var/empty \ | 38 "${PKG_DMG}" --source /var/empty \ | 
| 45 --target "${DST_DMG_PATH}" \ | 39 --target "${DST_DMG_PATH}" \ | 
| 46 --format UDBZ \ | 40 --format UDBZ \ | 
| 47 --volname "${VOL_NAME}" \ | 41 --volname "${VOL_NAME}" \ | 
| 48 --tempdir "${TEMP_DIR}" \ | 42 --tempdir "${TEMP_DIR}" \ | 
| 49 --copy "${SRC_APP_PATH}/:/${APP_NAME}.app/" | 43 --copy "${SRC_APP_PATH}/:/${APP_NAME}.app/" | 
| OLD | NEW |