[Chromoting] Cleanup branding variables in Chromoting gyp file.

remoting/remoting.gyp

 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 {
   'variables': {
     # TODO(dmaclach): can we pick this up some other way? Right now it's
     # duplicated from chrome.gyp
     'chromium_code': 1,
 
     'remoting_audio': 0,
     'remoting_multi_process%': 0,
 
-    # Use consistent strings across all platforms. Note that the plugin name
-    # is brand-dependent and is defined further down.
-    # Must match host/plugin/constants.h
-    'host_plugin_mime_type': 'application/vnd.chromium.remoting-host',
-    'host_plugin_description': 'Allow another user to access your computer securely over the Internet.',
-
     # The version is composed from major & minor versions specific to remoting
     # and build & patch versions inherited from Chrome.
     'version_py_path': '../chrome/tools/build/version.py',
     'version_path': '../remoting/VERSION',
     'chrome_version_path': '../chrome/VERSION',
     'version_full':
       '<!(python <(version_py_path) -f <(version_path) -t "@MAJOR@.@MINOR@").'
       '<!(python <(version_py_path) -f <(chrome_version_path) -t "@BUILD@.@PATCH@")',
     'version_short':
       '<!(python <(version_py_path) -f <(version_path) -t "@MAJOR@.@MINOR@").'
       '<!(python <(version_py_path) -f <(chrome_version_path) -t "@BUILD@")',
 
+    'branding_path': '../remoting/branding_<(branding)',
+    'copyright_info': '<!(python <(version_py_path) -f <(branding_path) -t "@COPYRIGHT@")',
+
+    # Use consistent strings across all platforms.
+    # These values must match host/plugin/constants.h
+    'host_plugin_mime_type': 'application/vnd.chromium.remoting-host',
+    'host_plugin_description': '<!(python <(version_py_path) -f <(branding_path) -t "@HOST_PLUGIN_FILE_DESCRIPTION@")',
+    'host_plugin_name': '<!(python <(version_py_path) -f <(branding_path) -t "@HOST_PLUGIN_FILE_NAME@")',
+
     'conditions': [
       ['OS=="mac"', {
-        'conditions': [
-          ['branding=="Chrome"', {
-            'mac_bundle_id': 'com.google.Chrome',
-            'mac_creator': 'rimZ',
-            'copyright_by': 'Google Inc.',
-          }, {  # else: branding!="Chrome"
-            'mac_bundle_id': 'org.chromium.Chromium',
-            'mac_creator': 'Cr24',
-            'copyright_by': 'The Chromium Authors.',
-          }],  # branding
-        ],  # conditions
+        'mac_bundle_id': '<!(python <(version_py_path) -f <(branding_path) -t "@MAC_BUNDLE_ID@")',
+        'mac_creator': '<!(python <(version_py_path) -f <(branding_path) -t "@MAC_CREATOR@")',
         'host_plugin_extension': 'plugin',
         'host_plugin_prefix': '',
       }],
       ['os_posix == 1 and OS != "mac" and target_arch == "ia32"', {
         # linux 32 bit
         'host_plugin_extension': 'ia32.so',
         'host_plugin_prefix': 'lib',
       }],
       ['os_posix == 1 and OS != "mac" and target_arch == "x64"', {
         # linux 64 bit
         'host_plugin_extension': 'x64.so',
         'host_plugin_prefix': 'lib',
       }],
       ['os_posix == 1 and OS != "mac" and target_arch == "arm"', {
         # linux 64 bit
         'host_plugin_extension': 'arm.so',
         'host_plugin_prefix': 'lib',
       }],
       ['OS=="win"', {
         'host_plugin_extension': 'dll',
         'host_plugin_prefix': '',
       }],
+
       ['branding=="Chrome"', {
-        # Must match host/plugin/constants.h
-        'host_plugin_name': 'Chrome Remote Desktop Host',
         'remoting_webapp_locale_files': [
           'webapp/_locales.official/ar/messages.json',
           'webapp/_locales.official/bg/messages.json',
           'webapp/_locales.official/ca/messages.json',
           'webapp/_locales.official/cs/messages.json',
           'webapp/_locales.official/da/messages.json',
           'webapp/_locales.official/de/messages.json',
           'webapp/_locales.official/el/messages.json',
           'webapp/_locales.official/en/messages.json',
           'webapp/_locales.official/en_GB/messages.json',
@@ skipping 25 matching lines @@
           'webapp/_locales.official/sr/messages.json',
           'webapp/_locales.official/sv/messages.json',
           'webapp/_locales.official/th/messages.json',
           'webapp/_locales.official/tr/messages.json',
           'webapp/_locales.official/uk/messages.json',
           'webapp/_locales.official/vi/messages.json',
           'webapp/_locales.official/zh_CN/messages.json',
           'webapp/_locales.official/zh_TW/messages.json',
         ],
       }, {  # else: branding!="Chrome"
-        # Must match host/plugin/constants.h
-        'host_plugin_name': 'Chromoting Host',
         'remoting_webapp_locale_files': [
           'webapp/_locales/en/messages.json',
         ],
       }],
     ],
     'remoting_webapp_files': [
       'resources/chromoting16.png',
       'resources/chromoting48.png',
       'resources/chromoting128.png',
       'resources/disclosure_arrow_down.png',
@@ skipping 131 matching lines @@
         },  # end of target 'linux_symbols'
       ],  # end of 'targets'
     }],  # 'OS=="linux"'
 
     ['OS=="mac"', {
       'targets': [
         {
           'target_name': 'remoting_host_uninstaller',
           'type': 'executable',
           'mac_bundle': 1,
-          'conditions': [
-            ['branding == "Chrome"', {
-              'variables': {
-                'bundle_id': 'com.google.chromeremotedesktop.host_uninstaller',
-                'bundle_name': 'Chrome Remote Desktop Host Uninstaller',
-              },
-            }, { # else branding!="Chrome"
-              'variables': {
-                'bundle_id': 'org.chromium.remoting.host_uninstaller',
-                'bundle_name': 'Chromoting Host Uninstaller',
-              },
-            }],
-          ],
+          'variables': {
+            'bundle_id': '<!(python <(version_py_path) -f <(branding_path) -t "@MAC_UNINSTALLER_BUNDLE_ID@")',
+            'bundle_name': '<!(python <(version_py_path) -f <(branding_path) -t "@MAC_UNINSTALLER_BUNDLE_NAME@")',
+          },
           'dependencies': [
             '<(DEPTH)/base/base.gyp:base',
           ],
           'sources': [
             'host/constants_mac.cc',
             'host/constants_mac.h',
             'host/installer/mac/uninstaller/remoting_uninstaller.h',
             'host/installer/mac/uninstaller/remoting_uninstaller.mm',
             'host/installer/mac/uninstaller/remoting_uninstaller_app.h',
             'host/installer/mac/uninstaller/remoting_uninstaller_app.mm',
           ],
           'xcode_settings': {
             'INFOPLIST_FILE': 'host/installer/mac/uninstaller/remoting_uninstaller-Info.plist',
             'INFOPLIST_PREPROCESS': 'YES',
-            'INFOPLIST_PREPROCESSOR_DEFINITIONS': 'VERSION_FULL="<(version_full)" VERSION_SHORT="<(version_short)" BUNDLE_NAME="<(bundle_name)" BUNDLE_ID="<(bundle_id)" COPYRIGHT_BY="<(copyright_by)"',
+            'INFOPLIST_PREPROCESSOR_DEFINITIONS': 'VERSION_FULL="<(version_full)" VERSION_SHORT="<(version_short)" BUNDLE_NAME="<(bundle_name)" BUNDLE_ID="<(bundle_id)" COPYRIGHT_INFO="<(copyright_info)"',
           },
           'mac_bundle_resources': [
             'host/installer/mac/uninstaller/remoting_uninstaller.icns',
             'host/installer/mac/uninstaller/remoting_uninstaller.xib',
             'host/installer/mac/uninstaller/remoting_uninstaller-Info.plist',
           ],
           'mac_bundle_resources!': [
             'host/installer/mac/uninstaller/remoting_uninstaller-Info.plist',
           ],
         },  # end of target 'remoting_host_uninstaller'
 
         # This packages up the files needed for the remoting host installer so
         # they can be sent off to be signed.
         # We don't build an installer here because we don't have signed binaries.
         {
           'target_name': 'remoting_me2me_host_archive',
           'type': 'none',
           'dependencies': [
             'remoting_host_prefpane',
             'remoting_host_uninstaller',
             'remoting_me2me_host',
           ],
           'sources': [
             'host/installer/build-installer-archive.py',
             '<@(remoting_host_installer_mac_files)',
           ],
-          'conditions': [
-            ['branding == "Chrome"', {
-              'variables': {
-                'host_name': 'Chrome Remote Desktop Host',
-                'host_service_name': 'Chrome Remote Desktop Host Service',
-                'host_uninstaller_name': 'Chrome Remote Desktop Host Uninstaller',
-                'bundle_prefix': 'com.google.pkg',
-              },
-            }, { # else branding!="Chrome"
-              'variables': {
-                'host_name': 'Chromoting Host',
-                'host_service_name': 'Chromoting Host Service',
-                'host_uninstaller_name': 'Chromoting Host Uninstaller',
-                'bundle_prefix': 'org.chromium.pkg',
-              },
-            }],
-          ],  # conditions
+          'variables': {
+            'host_name': '<!(python <(version_py_path) -f <(branding_path) -t "@HOST_PLUGIN_FILE_NAME@")',
+            'host_service_name': '<!(python <(version_py_path) -f <(branding_path) -t "@HOST_SERVICE_FILE_NAME@")',
+            'host_uninstaller_name': '<!(python <(version_py_path) -f <(branding_path) -t "@MAC_UNINSTALLER_NAME@")',
+            'bundle_prefix': '<!(python <(version_py_path) -f <(branding_path) -t "@MAC_UNINSTALLER_BUNDLE_PREFIX@")',
+          },
           'actions': [
             {
               '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',
                 '<(PRODUCT_DIR)/remoting_host_uninstaller.app',
               ],
               'generated_files_dst': [
                 'PreferencePanes/org.chromium.chromoting.prefPane',
                 'PrivilegedHelperTools/org.chromium.chromoting.me2me_host.app',
                 'Applications/<(host_uninstaller_name).app',
               ],
               'source_files': [
                 '<@(remoting_host_installer_mac_files)',
               ],
               'defs': [
                 'VERSION=<(version_full)',
                 'VERSION_SHORT=<(version_short)',
                 'VERSION_MAJOR=<!(python <(version_py_path) -f <(version_path) -t "@MAJOR@")',
                 'VERSION_MINOR=<!(python <(version_py_path) -f <(version_path) -t "@MINOR@")',
-                'COPYRIGHT_BY=<(copyright_by)',
+                'COPYRIGHT_INFO=<(copyright_info)',
                 'HOST_NAME=<(host_name)',
                 'HOST_SERVICE_NAME=<(host_service_name)',
                 'HOST_UNINSTALLER_NAME=<(host_uninstaller_name)',
                 'HOST_PKG=<(host_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)',
@@ skipping 31 matching lines @@
           'type': 'loadable_module',
           'mac_bundle': 1,
           'product_extension': 'prefPane',
           'defines': [
             'JSON_USE_EXCEPTION=0',
           ],
           'include_dirs': [
             '../third_party/jsoncpp/overrides/include/',
             '../third_party/jsoncpp/source/include/',
             '../third_party/jsoncpp/source/src/lib_json/',
-          ],
+          ],
 
           # These source files are included directly, instead of adding target
-          # dependencies, because the targets are not yet built for 64-bit on
-          # Mac OS X - http://crbug.com/125116.
-          #
-          # TODO(lambroslambrou): Fix this when Chrome supports building for
-          # Mac OS X 64-bit - http://crbug.com/128122.
+          # dependencies, because the targets are not yet built for 64-bit on
+          # Mac OS X - http://crbug.com/125116.
+          #
+          # TODO(lambroslambrou): Fix this when Chrome supports building for
+          # Mac OS X 64-bit - http://crbug.com/128122.
           'sources': [
-            '../third_party/jsoncpp/source/src/lib_json/json_reader.cpp',
-            '../third_party/jsoncpp/overrides/src/lib_json/json_value.cpp',
-            '../third_party/jsoncpp/source/src/lib_json/json_writer.cpp',
-            '../third_party/modp_b64/modp_b64.cc',
+            '../third_party/jsoncpp/source/src/lib_json/json_reader.cpp',
+            '../third_party/jsoncpp/overrides/src/lib_json/json_value.cpp',
+            '../third_party/jsoncpp/source/src/lib_json/json_writer.cpp',
+            '../third_party/modp_b64/modp_b64.cc',
             'host/constants_mac.cc',
             'host/constants_mac.h',
-            'host/host_config.cc',
+            'host/host_config.cc',
             'host/me2me_preference_pane.h',
             'host/me2me_preference_pane.mm',
             'host/me2me_preference_pane_confirm_pin.h',
             'host/me2me_preference_pane_confirm_pin.mm',
             'host/me2me_preference_pane_disable.h',
             'host/me2me_preference_pane_disable.mm',
           ],
           'link_settings': {
             'libraries': [
               '$(SDKROOT)/System/Library/Frameworks/Cocoa.framework',
               '$(SDKROOT)/System/Library/Frameworks/CoreFoundation.framework',
               '$(SDKROOT)/System/Library/Frameworks/PreferencePanes.framework',
               '$(SDKROOT)/System/Library/Frameworks/Security.framework',
             ],
           },
+          'variables': {
+            'bundle_id': '<!(python <(version_py_path) -f <(branding_path) -t "@MAC_PREFPANE_BUNDLE_ID@")',
+            'bundle_name': '<!(python <(version_py_path) -f <(branding_path) -t "@MAC_PREFPANE_BUNDLE_NAME@")',
+            # The XML new-line entity splits the label into two lines, which
+            # is the maximum number of lines allowed by the System Preferences
+            # applet.
+            # TODO(lambroslambrou): When these strings are localized, use "\n"

[alexeypa (please no reviews), 2012/08/14 23:50:51]

nit: Is the comment about '&#x0a' still relevant?

[garykac, 2012/08/17 18:47:26]

Yes, and we sadly cannot include comments in the branding_Chrome/Chromium file
(which is where I would have liked this comment to be).

+            # instead of "
" for linebreaks.
+            'pref_pane_icon_label': '<!(python <(version_py_path) -f <(branding_path) -t "@MAC_PREFPANE_ICON_LABEL@")',
+          },
           'xcode_settings': {
             'ARCHS': ['i386', 'x86_64'],
             'GCC_ENABLE_OBJC_GC': 'supported',
             'INFOPLIST_FILE': 'host/me2me_preference_pane-Info.plist',
             'INFOPLIST_PREPROCESS': 'YES',
-            'INFOPLIST_PREPROCESSOR_DEFINITIONS': 'VERSION_FULL="<(version_full)" VERSION_SHORT="<(version_short)" BUNDLE_NAME="<(bundle_name)" BUNDLE_ID="<(bundle_id)" COPYRIGHT_BY="<(copyright_by)" PREF_PANE_ICON_LABEL="<(pref_pane_icon_label)"',
+            'INFOPLIST_PREPROCESSOR_DEFINITIONS': 'VERSION_FULL="<(version_full)" VERSION_SHORT="<(version_short)" BUNDLE_NAME="<(bundle_name)" BUNDLE_ID="<(bundle_id)" COPYRIGHT_INFO="<(copyright_info)" PREF_PANE_ICON_LABEL="<(pref_pane_icon_label)"',
           },
           'mac_bundle_resources': [
             'host/me2me_preference_pane.xib',
             'host/me2me_preference_pane_confirm_pin.xib',
             'host/me2me_preference_pane_disable.xib',
             'host/me2me_preference_pane-Info.plist',
             'resources/chromoting128.png',
           ],
           'mac_bundle_resources!': [
             'host/me2me_preference_pane-Info.plist',
           ],
           'conditions': [
             ['mac_breakpad==1', {
               'variables': {
                 # A real .dSYM is needed for dump_syms to operate on.
                 'mac_real_dsym': 1,
               },
             }],
-            ['branding == "Chrome"', {
-              'variables': {
-                'bundle_id': 'com.google.chromeremotedesktop.preferences',
-                'bundle_name': 'Chrome Remote Desktop Host Preferences',
-
-                # The XML new-line entity splits the label into two lines,
-                # which is the maximum number of lines allowed by the System
-                # Preferences applet.
-                # TODO(lambroslambrou): When these strings are localized, use
-                # "\n" instead.
-                'pref_pane_icon_label': 'Chrome Remote&#x0a;Desktop Host',
-              },
-            }, { # else branding!="Chrome"
-              'variables': {
-                'bundle_id': 'org.chromium.remoting.preferences',
-                'bundle_name': 'Chromoting Host Preferences',
-                'pref_pane_icon_label': 'Chromoting&#x0a;Host',
-              },
-            }],
           ],  # conditions
         },  # end of target 'remoting_host_prefpane'
       ],  # end of 'targets'
     }],  # 'OS=="mac"'
 
     ['OS=="win"', {
       'targets': [
         {
           'target_name': 'remoting_breakpad_tester',
           'type': 'executable',
@@ skipping 133 matching lines @@
           },
         },  # end of target 'remoting_service'
 
         # Generates the version information resources for the Windows binaries.
         # The .RC files are generated from the "version.rc.version" template and
         # placed in the "<(SHARED_INTERMEDIATE_DIR)/remoting" folder.
         # The substitution strings are taken from:
         #   - build/util/LASTCHANGE - the last source code revision.
         #   - chrome/VERSION - the build & patch versions.
         #   - remoting/VERSION - the major & minor versions.
-        #   - xxx_branding - UI/localizable strings.
+        #   - (branding_path) - UI/localizable strings.
         #   - xxx.ver - per-binary non-localizable strings such as the binary
         #     name.
         {
           'target_name': 'remoting_version_resources',
           'type': 'none',
           'inputs': [
-            'chromium_branding',
-            'google_chrome_branding',
+            '<(branding_path)',
             'version.rc.version',
             '<(DEPTH)/build/util/LASTCHANGE',
             '<(version_path)',
             '<(chrome_version_path)',
           ],
           'direct_dependent_settings': {
             'include_dirs': [
               '<(SHARED_INTERMEDIATE_DIR)/remoting',
             ],
           },
           'sources': [
             'host/plugin/host_plugin.ver',
             'host/remoting_me2me_host.ver',
             'host/win/elevated_controller.ver',
             'host/win/host_service.ver',
           ],
           'rules': [
             {
               'rule_name': 'version',
               'extension': 'ver',
               'variables': {
                 'lastchange_path': '<(DEPTH)/build/util/LASTCHANGE',
                 'template_input_path': 'version.rc.version',
               },
-              'conditions': [
-                ['branding == "Chrome"', {
-                  'variables': {
-                     'branding_path': 'google_chrome_branding',
-                  },
-                }, { # else branding!="Chrome"
-                  'variables': {
-                     'branding_path': 'chromium_branding',
-                  },
-                }],
-              ],
               'inputs': [
                 '<(template_input_path)',
                 '<(version_path)',
                 '<(chrome_version_path)',
                 '<(branding_path)',
                 '<(lastchange_path)',
               ],
               'outputs': [
                 '<(SHARED_INTERMEDIATE_DIR)/remoting/<(RULE_INPUT_ROOT)_version.rc',
               ],
@@ skipping 769 matching lines @@
         'host/sighup_listener_mac.h',
         'host/remoting_me2me_host.cc',
         'host/usage_stats_consent.h',
         'host/usage_stats_consent_win.cc',
         'host/curtain_mode_mac.h',
         'host/curtain_mode_mac.cc',
       ],
       'conditions': [
         ['OS=="mac"', {
           'mac_bundle': 1,
-          'conditions': [
-            ['branding == "Chrome"', {
-              'variables': {
-                 'host_bundle_id': 'com.google.chrome_remote_desktop.remoting_me2me_host',
-              },
-            }, { # else branding!="Chrome"
-              'variables': {
-                'host_bundle_id': 'org.chromium.chromoting.remoting_me2me_host',
-              },
-            }],
-          ],
+          'variables': {
+             'host_bundle_id': '<!(python <(version_py_path) -f <(branding_path) -t "@MAC_HOST_BUNDLE_ID@")',
+          },
           'xcode_settings': {
             'INFOPLIST_FILE': 'host/remoting_me2me_host-Info.plist',
             'INFOPLIST_PREPROCESS': 'YES',
-            'INFOPLIST_PREPROCESSOR_DEFINITIONS': 'VERSION_FULL="<(version_full)" VERSION_SHORT="<(version_short)" BUNDLE_ID="<(host_bundle_id)" COPYRIGHT_BY="<(copyright_by)"',
+            'INFOPLIST_PREPROCESSOR_DEFINITIONS': 'VERSION_FULL="<(version_full)" VERSION_SHORT="<(version_short)" BUNDLE_ID="<(host_bundle_id)" COPYRIGHT_INFO="<(copyright_info)"',
           },
           'mac_bundle_resources': [
             'host/disconnect_window.xib',
             'host/remoting_me2me_host.icns',
             'host/remoting_me2me_host-Info.plist',
           ],
           'mac_bundle_resources!': [
             'host/remoting_me2me_host-Info.plist',
           ],
         }],
@@ skipping 353 matching lines @@
                   '../base/allocator/allocator.gyp:allocator',
                 ],
               },
             ],
           ],
         }],
       ],  # end of 'conditions'
     },  # end of target 'remoting_unittests'
   ],  # end of targets
 }