summaryrefslogtreecommitdiffstats
path: root/remoting
diff options
context:
space:
mode:
authorgarykac@chromium.org <garykac@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-05-04 04:08:15 +0000
committergarykac@chromium.org <garykac@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-05-04 04:08:15 +0000
commitcd06427f46c00392361c28b773b4a73ccae1b073 (patch)
treeda928cf30993e2d66a569fef885921fb98625529 /remoting
parentb8d6cae75a9eb62043f27445cf27de7048435566 (diff)
downloadchromium_src-cd06427f46c00392361c28b773b4a73ccae1b073.zip
chromium_src-cd06427f46c00392361c28b773b4a73ccae1b073.tar.gz
chromium_src-cd06427f46c00392361c28b773b4a73ccae1b073.tar.bz2
[Chromoting] Update installer dmg name to include version number.
After this change, the DMG file will be named ChromeRemoteDesktopHost-x.x.x.dmg The volume contained in the dmg will retain the more user-friendly name "Chrome Remote Desktop Host". Review URL: http://codereview.chromium.org/10351021 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@135291 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'remoting')
-rwxr-xr-xremoting/host/installer/mac/do_signing.sh12
-rw-r--r--remoting/remoting.gyp3
2 files changed, 8 insertions, 7 deletions
diff --git a/remoting/host/installer/mac/do_signing.sh b/remoting/host/installer/mac/do_signing.sh
index 2ceb94e..aaf6ada 100755
--- a/remoting/host/installer/mac/do_signing.sh
+++ b/remoting/host/installer/mac/do_signing.sh
@@ -35,8 +35,8 @@ PKGPROJ_HOST_UNINSTALLER='ChromotingHostUninstaller.packproj'
# Final (user-visible) mpkg name.
PKG_FINAL='@@HOST_PKG@@.mpkg'
-DMG_NAME='@@DMG_NAME@@'
-DMG_FILENAME='@@DMG_NAME@@.dmg'
+DMG_VOLUME_NAME='@@DMG_VOLUME_NAME@@'
+DMG_FILE_NAME='@@DMG_FILE_NAME@@.dmg'
# Temp directory for Iceberg output.
PKG_DIR=build
@@ -132,13 +132,13 @@ build_dmg() {
--format UDBZ \
--tempdir "${DMG_TEMP_DIR}" \
--source "${DMG_EMPTY_DIR}" \
- --target "${output_dir}/${DMG_FILENAME}" \
- --volname "${DMG_NAME}" \
+ --target "${output_dir}/${DMG_FILE_NAME}" \
+ --volname "${DMG_VOLUME_NAME}" \
--copy "${input_dir}/${PKG_DIR}/${PKG_FINAL}" \
--copy "${input_dir}/Scripts/keystone_install.sh:/.keystone_install"
- if [[ ! -f "${output_dir}/${DMG_FILENAME}" ]]; then
- err_exit "Unable to create disk image: ${DMG_FILENAME}"
+ if [[ ! -f "${output_dir}/${DMG_FILE_NAME}" ]]; then
+ err_exit "Unable to create disk image: ${DMG_FILE_NAME}"
fi
}
diff --git a/remoting/remoting.gyp b/remoting/remoting.gyp
index b406299..37eccaf 100644
--- a/remoting/remoting.gyp
+++ b/remoting/remoting.gyp
@@ -343,7 +343,8 @@
'BUNDLE_ID_HOST=<(bundle_prefix).<(host_name)',
'BUNDLE_ID_HOST_SERVICE=<(bundle_prefix).<(host_service_name)',
'BUNDLE_ID_HOST_UNINSTALLER=<(bundle_prefix).<(host_uninstaller_name)',
- 'DMG_NAME=<(host_name)',
+ 'DMG_VOLUME_NAME=<(host_name)',
+ 'DMG_FILE_NAME=<!(echo <(host_name) | sed "s/ //g")-<(version_full)',
],
'inputs': [
'host/installer/build-installer-archive.py',