[Chromoting] Sign, brand and version the me2me_host

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,
@@ skipping 152 matching lines @@
       'resources/chromoting48.png',
       'resources/chromoting128.png',
       'resources/disclosure_arrow_down.png',
       'resources/disclosure_arrow_right.png',
       'resources/infographic_my_computers.png',
       'resources/infographic_remote_assistance.png',
       'resources/tick.png',
     ],
     'remoting_host_installer_mac_root': 'host/installer/mac/',
     'remoting_host_installer_mac_files': [
-      'host/installer/mac/ChromeRemoteDesktop.packproj',
-      'host/installer/mac/Chromoting.packproj',
+      'host/installer/mac/sign_and_build.sh',
+      'host/installer/mac/ChromotingHost.packproj',
+      'host/installer/mac/ChromotingHostService.packproj',
+      'host/installer/mac/ChromotingHostUninstaller.packproj',
       'host/installer/mac/LaunchAgents/org.chromium.chromoting.plist',
-      'host/installer/mac/PrivilegedHelperTools/org.chromium.chromoting.json',
       'host/installer/mac/PrivilegedHelperTools/org.chromium.chromoting.me2me.sh',
       'host/installer/mac/Scripts/keystone_install.sh',
       'host/installer/mac/Scripts/remoting_postflight.sh',
+      'host/installer/mac/Scripts/remoting_preflight.sh',
       'host/installer/mac/Keystone/GoogleSoftwareUpdate.pkg.zip',
     ],
   },
 
   'target_defaults': {
     'defines': [
     ],
     'include_dirs': [
       '..',  # Root of Chrome checkout
     ],
@@ skipping 967 matching lines @@
     {
       'target_name': 'remoting_me2me_host_archive',
       'type': 'none',
       'dependencies': [
         'remoting_me2me_host',
       ],
       'sources': [
         'host/installer/build-installer-archive.py',
       ],
       'conditions': [
+        ['branding == "Chrome"', {

[alexeypa (please no reviews), 2012/04/24 16:06:19]

nit: we have way to many way to do branding. Windows port is using
../chrome/tools/build/version.py to do string substituting in files. Let's talk
offline about it.

[garykac, 2012/04/24 19:48:21]

Agreed. I considered using version.py here, but that would have required a
separate action or target to pre-process the files before sending them to the
archive script for more processing. It seemed like overkill for this case, but
we should definitely unify our branding, copyrights and versioning.

+          'variables': {
+            'copyright_by': 'Google Inc.',
+            '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': {
+            'copyright_by': 'The Chromium Authors.',
+            'host_name': 'Chromoting Host',
+            'host_service_name': 'Chromoting Host Service',
+            'host_uninstaller_name': 'Chromoting Host Uninstaller',
+            'bundle_prefix': 'org.chromium.pkg',
+          },
+        }],
         ['OS=="mac"', {
           'sources': [
             '<@(remoting_host_installer_mac_files)',
           ],
+          'dependencies': [
+            'remoting_host_uninstaller',
+          ],
         }],  # OS=="mac"
         ['OS=="win"', {
           'dependencies': [
             # TODO(garykac)
           ],
         }],  # OS=="win"
       ],  # conditions
       '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',
           'generated_files': [],
           'generated_files_dst': [],
           'source_files_root': '',
           'source_files': [],
+          'defs': [],
           'conditions': [
             ['OS=="mac"', {
               'generated_files': [
                 '<(PRODUCT_DIR)/remoting_me2me_host',
+                '<(PRODUCT_DIR)/remoting_host_uninstaller.app',
               ],
               'generated_files_dst': [
                 'PrivilegedHelperTools/org.chromium.chromoting.me2me_host',
+                'Applications/<(host_uninstaller_name).app',
               ],
               'source_files_root': '<(remoting_host_installer_mac_root)',
               '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)',
+                'HOST_NAME=<(host_name)',
+                'HOST_SERVICE_NAME=<(host_service_name)',
+                'HOST_UNINSTALLER_NAME=<(host_uninstaller_name)',
+                'HOST_PKG=<!(echo <(host_name) | sed "s/ //g")',
+                '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)',
+              ],
             }],  # OS=="mac"
             ['OS=="win"', {
               'generated_files': [
                 '<(PRODUCT_DIR)/remoting_me2me_host.exe',
               ],
+              'generated_files_dst': [
+                'remoting_me2me_host.exe',
+              ],
             }],  # OS=="win"
             ['OS=="linux"', {
               'generated_files': [
                 '<(PRODUCT_DIR)/remoting_me2me_host',
               ],
+              'generated_files_dst': [
+                'remoting_me2me_host',
+              ],
             }],  # OS=="linux"
           ],  # conditions
           'inputs': [
             'host/installer/build-installer-archive.py',
             '<@(_source_files)',
           ],
           'outputs': [
             '<(_zip_path)',
           ],
           'action': [
             'python',
             'host/installer/build-installer-archive.py',
             '<(_temp_dir)',
             '<(_zip_path)',
             '<(_source_files_root)',
             '--source-files',
             '<@(_source_files)',
             '--generated-files',
             '<@(_generated_files)',
             '--generated-files-dst',
             '<@(_generated_files_dst)',
+            '--defs',
+            '<@(_defs)',
           ],
         },
       ],  # actions
     }, # end of target 'remoting_me2me_host_archive'
 
     {
       'target_name': 'remoting_jingle_glue',
       'type': 'static_library',
       'variables': { 'enable_wexit_time_destructors': 1, },
       'dependencies': [
@@ skipping 300 matching lines @@
                   '../base/allocator/allocator.gyp:allocator',
                 ],
               },
             ],
           ],
         }],
       ],  # end of 'conditions'
     },  # end of target 'remoting_unittests'
   ],  # end of targets
 }