summaryrefslogtreecommitdiffstats
path: root/remoting
diff options
context:
space:
mode:
authorgarykac@chromium.org <garykac@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-05-25 21:09:09 +0000
committergarykac@chromium.org <garykac@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-05-25 21:09:09 +0000
commit358f2dfd271ae7596aff01ed2ede9e9e7028c991 (patch)
tree5021f80a73bf8612de6eeb2f782afb4dec9f4c0b /remoting
parent1e0cae563ab9453106d0aeaae788e9f036899295 (diff)
downloadchromium_src-358f2dfd271ae7596aff01ed2ede9e9e7028c991.zip
chromium_src-358f2dfd271ae7596aff01ed2ede9e9e7028c991.tar.gz
chromium_src-358f2dfd271ae7596aff01ed2ede9e9e7028c991.tar.bz2
[Chromoting] Remove spaces from Mac installer package id.
Packages (the Mac package maker that we're using to replace Iceberg) doesn't like spaces in the package id field. BUG=127267 TEST=none Review URL: https://chromiumcodereview.appspot.com/10450027 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@139116 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'remoting')
-rw-r--r--remoting/remoting.gyp15
1 files changed, 10 insertions, 5 deletions
diff --git a/remoting/remoting.gyp b/remoting/remoting.gyp
index 2a41a7a..cc56984 100644
--- a/remoting/remoting.gyp
+++ b/remoting/remoting.gyp
@@ -316,6 +316,11 @@
'action_name': 'Zip installer files for signing',
'temp_dir': '<(SHARED_INTERMEDIATE_DIR)/remoting/remoting-me2me-host',
'zip_path': '<(PRODUCT_DIR)/remoting-me2me-host-<(OS).zip',
+ 'variables': {
+ 'host_name_nospace': '<!(echo <(host_name) | sed "s/ //g")',
+ 'host_service_name_nospace': '<!(echo <(host_service_name) | sed "s/ //g")',
+ 'host_uninstaller_name_nospace': '<!(echo <(host_uninstaller_name) | sed "s/ //g")',
+ },
'generated_files': [
'<(PRODUCT_DIR)/remoting_host_prefpane.prefPane',
'<(PRODUCT_DIR)/remoting_me2me_host.app',
@@ -339,11 +344,11 @@
'HOST_SERVICE_NAME=<(host_service_name)',
'HOST_UNINSTALLER_NAME=<(host_uninstaller_name)',
'HOST_PKG=<(host_name)',
- 'HOST_SERVICE_PKG=<!(echo <(host_service_name) | sed "s/ //g")',
- 'HOST_UNINSTALLER_PKG=<!(echo <(host_uninstaller_name) | sed "s/ //g")',
- '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)',
+ 'HOST_SERVICE_PKG=<(host_service_name_nospace)',
+ 'HOST_UNINSTALLER_PKG=<(host_uninstaller_name_nospace)',
+ 'BUNDLE_ID_HOST=<(bundle_prefix).<(host_name_nospace)',
+ 'BUNDLE_ID_HOST_SERVICE=<(bundle_prefix).<(host_service_name_nospace)',
+ 'BUNDLE_ID_HOST_UNINSTALLER=<(bundle_prefix).<(host_uninstaller_name_nospace)',
'DMG_VOLUME_NAME=<(host_name) <(version_full)',
'DMG_FILE_NAME=<!(echo <(host_name) | sed "s/ //g")-<(version_full)',
],