[Chromoting] Fixup the me2me_host plist so that the application is valid.

Fix the plist file by removing the '@'s from the version strings.

This is required for the .app bundle to be recognized as a valid app by the OS.
Without this fix, the official signing fails and the app icon is displayed as
the "broken app" icon.

In addition, this adds a default icon and sets the human readable copyright
message. And moves the COPYRIGHT_BY variable to the top of the .gyp so that
it can be shared by multiple targets.
Review URL: https://chromiumcodereview.appspot.com/10381113

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@136662 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 32 insertions, 23 deletions

diff --git a/remoting/host/remoting_me2me_host-Info.plist b/remoting/host/remoting_me2me_host-Info.plist
index b5b9d94..c8af611 100644
--- a/remoting/host/remoting_me2me_host-Info.plist
+++ b/remoting/host/remoting_me2me_host-Info.plist
@@ -1,20 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
-    <key>CFBundleDevelopmentRegion</key>
-    <string>English</string>
-    <key>CFBundleIdentifier</key>
-    <string>@BUNDLE_ID@</string>
-    <key>CFBundleInfoDictionaryVersion</key>
-    <string>6.0</string>
-    <key>CFBundleName</key>
-    <string>remoting_me2me_host</string>
-    <key>CFBundlePackageType</key>
-    <string>APPL</string>
-    <key>CFBundleVersion</key>
-    <string>@VERSION_FULL@</string>
-    <key>CFBundleShortVersionString</key>
-    <string>@VERSION_SHORT@</string>
-    <key>LSUIElement</key>
-    <string>1</string>
+  <key>CFBundleDevelopmentRegion</key>
+  <string>English</string>
+  <key>CFBundleExecutable</key>
+  <string>${EXECUTABLE_NAME}</string>
+  <key>CFBundleIconFile</key>
+  <string>remoting_me2me_host</string>
+  <key>CFBundleIdentifier</key>
+  <string>BUNDLE_ID</string>
+  <key>CFBundleInfoDictionaryVersion</key>
+  <string>6.0</string>
+  <key>CFBundleName</key>
+  <string>remoting_me2me_host</string>
+  <key>CFBundlePackageType</key>
+  <string>APPL</string>
+  <key>CFBundleSignature</key>
+  <string>????</string>
+  <key>CFBundleVersion</key>
+  <string>VERSION_FULL</string>
+  <key>CFBundleShortVersionString</key>
+  <string>VERSION_SHORT</string>
+  <key>LSMinimumSystemVersion</key>
+  <string>${MACOSX_DEPLOYMENT_TARGET}</string>
+  <key>NSHumanReadableCopyright</key>
+  <string>Copyright © 2012 COPYRIGHT_BY All rights reserved.</string>
+  <key>LSUIElement</key>
+  <string>1</string>
 </dict>
 </plist>
\ No newline at end of file
diff --git a/remoting/remoting.gyp b/remoting/remoting.gyp
index 0195b5a..4ffaf97 100644
--- a/remoting/remoting.gyp
+++ b/remoting/remoting.gyp
@@ -31,9 +31,11 @@
           ['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
         'host_plugin_extension': 'plugin',
@@ -245,13 +247,11 @@
           'conditions': [
             ['branding == "Chrome"', {
               'variables': {
-                'copyright_by': 'Google Inc.',
                 'bundle_id': 'com.google.chromeremotedesktop.host_uninstaller',
                 'bundle_name': 'Chrome Remote Desktop Host Uninstaller',
               },
             }, { # else branding!="Chrome"
               'variables': {
-                'copyright_by': 'The Chromium Authors.',
                 'bundle_id': 'org.chromium.remoting.host_uninstaller',
                 'bundle_name': 'Chromoting Host Uninstaller',
               },
@@ -297,7 +297,6 @@
           'conditions': [
             ['branding == "Chrome"', {
               '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',
@@ -305,7 +304,6 @@
               },
             }, { # 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',
@@ -416,13 +414,11 @@
             }],
             ['branding == "Chrome"', {
               'variables': {
-                'copyright_by': 'Google Inc.',
                 'bundle_id': 'com.google.chromeremotedesktop.preferences',
                 'bundle_name': 'Chrome Remote Desktop Host Preferences',
               },
             }, { # else branding!="Chrome"
               'variables': {
-                'copyright_by': 'The Chromium Authors.',
                 'bundle_id': 'org.chromium.remoting.preferences',
                 'bundle_name': 'Chromoting Host Preferences',
               },
@@ -1361,9 +1357,10 @@
           '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)"',
+            'INFOPLIST_PREPROCESSOR_DEFINITIONS': 'VERSION_FULL="<(version_full)" VERSION_SHORT="<(version_short)" BUNDLE_ID="<(host_bundle_id)" COPYRIGHT_BY="<(copyright_by)"',
           },
           'mac_bundle_resources': [
+            'host/remoting_me2me_host.icns',
             'host/remoting_me2me_host-Info.plist',
           ],
           'mac_bundle_resources!': [