diff options
| author | lambroslambrou@chromium.org <lambroslambrou@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-10 21:26:20 +0000 |
|---|---|---|
| committer | lambroslambrou@chromium.org <lambroslambrou@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-10 21:26:20 +0000 |
| commit | d1ca226e6dd4091918844d44f9c7c6503406f676 (patch) | |
| tree | 1bd14f5ce0d5f95a1100e037997123e033a23966 /remoting | |
| parent | 1953f41fe9518b8eea972e94fef627eebb00a8fa (diff) | |
| download | chromium_src-d1ca226e6dd4091918844d44f9c7c6503406f676.zip chromium_src-d1ca226e6dd4091918844d44f9c7c6503406f676.tar.gz chromium_src-d1ca226e6dd4091918844d44f9c7c6503406f676.tar.bz2 | |
Make me2me_host a Mac bundle
This is a prerequisite for showing the Disconnect window in Mac Me2Me host.
BUG=127322
TEST=manual: install/run/uninstall Me2Me
Review URL: https://chromiumcodereview.appspot.com/10310089
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@136393 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'remoting')
6 files changed, 17 insertions, 31 deletions
diff --git a/remoting/host/installer/mac/ChromotingHostService.packproj b/remoting/host/installer/mac/ChromotingHostService.packproj index 15e9f0c..e6edddf 100644 --- a/remoting/host/installer/mac/ChromotingHostService.packproj +++ b/remoting/host/installer/mac/ChromotingHostService.packproj @@ -305,7 +305,7 @@ <key>GID</key> <integer>80</integer> <key>Path</key> - <string>PrivilegedHelperTools/org.chromium.chromoting.me2me_host</string> + <string>PrivilegedHelperTools/org.chromium.chromoting.me2me_host.app</string> <key>Path Type</key> <integer>2</integer> <key>Privileges</key> diff --git a/remoting/host/installer/mac/PrivilegedHelperTools/org.chromium.chromoting.me2me.sh b/remoting/host/installer/mac/PrivilegedHelperTools/org.chromium.chromoting.me2me.sh index 28369e2..9e01d27 100755 --- a/remoting/host/installer/mac/PrivilegedHelperTools/org.chromium.chromoting.me2me.sh +++ b/remoting/host/installer/mac/PrivilegedHelperTools/org.chromium.chromoting.me2me.sh @@ -6,7 +6,7 @@ NAME=org.chromium.chromoting CONFIG_DIR=/Library/PrivilegedHelperTools -HOST_EXE=$CONFIG_DIR/$NAME.me2me_host +HOST_EXE=$CONFIG_DIR/$NAME.me2me_host.app/Contents/MacOS/remoting_me2me_host ENABLED_FILE=$CONFIG_DIR/$NAME.me2me_enabled CONFIG_FILE=$CONFIG_DIR/$NAME.json diff --git a/remoting/host/installer/mac/do_signing.sh b/remoting/host/installer/mac/do_signing.sh index 2bbe2fa..12e8a19 100755 --- a/remoting/host/installer/mac/do_signing.sh +++ b/remoting/host/installer/mac/do_signing.sh @@ -20,7 +20,7 @@ readonly ME declare -a g_cleanup_dirs # Binaries to sign. -ME2ME_HOST='PrivilegedHelperTools/org.chromium.chromoting.me2me_host' +ME2ME_HOST='PrivilegedHelperTools/org.chromium.chromoting.me2me_host.app' UNINSTALLER='Applications/@@HOST_UNINSTALLER_NAME@@.app' # The Chromoting Host installer is a meta-package that consists of 3 diff --git a/remoting/host/installer/mac/uninstaller/remoting_uninstaller.mm b/remoting/host/installer/mac/uninstaller/remoting_uninstaller.mm index e2e0abd..48f6437 100644 --- a/remoting/host/installer/mac/uninstaller/remoting_uninstaller.mm +++ b/remoting/host/installer/mac/uninstaller/remoting_uninstaller.mm @@ -148,7 +148,7 @@ NSString* const kKeystonePID = @"com.google.chrome_remote_desktop"; kLaunchAgentsDir, kServiceName]; [self sudoDelete:[plist UTF8String] usingAuth:authRef]; - NSString* host_binary = [NSString stringWithFormat:@"%@/%@.me2me_host", + NSString* host_binary = [NSString stringWithFormat:@"%@/%@.me2me_host.app", kHelperToolsDir, kServiceName]; [self sudoDelete:[host_binary UTF8String] usingAuth:authRef]; diff --git a/remoting/host/remoting_me2me_host-Info.plist b/remoting/host/remoting_me2me_host-Info.plist index 76fb3fc..b5b9d94 100644 --- a/remoting/host/remoting_me2me_host-Info.plist +++ b/remoting/host/remoting_me2me_host-Info.plist @@ -14,5 +14,7 @@ <string>@VERSION_FULL@</string> <key>CFBundleShortVersionString</key> <string>@VERSION_SHORT@</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 e1258ef..7218e03 100644 --- a/remoting/remoting.gyp +++ b/remoting/remoting.gyp @@ -320,12 +320,12 @@ 'zip_path': '<(PRODUCT_DIR)/remoting-me2me-host-<(OS).zip', 'generated_files': [ '<(PRODUCT_DIR)/remoting_host_prefpane.prefPane', - '<(PRODUCT_DIR)/remoting_me2me_host', + '<(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', + 'PrivilegedHelperTools/org.chromium.chromoting.me2me_host.app', 'Applications/<(host_uninstaller_name).app', ], 'source_files': [ @@ -1348,9 +1348,7 @@ ], }], ['OS=="mac"', { - 'sources': [ - 'host/remoting_me2me_host-Info.plist', - ], + 'mac_bundle': 1, 'conditions': [ ['branding == "Chrome"', { 'variables': { @@ -1363,29 +1361,15 @@ }], ], 'xcode_settings': { - 'OTHER_LDFLAGS': [ - '-Wl,-sectcreate,__TEXT,__info_plist,<(INTERMEDIATE_DIR)/remoting_me2me_host-Info.plist' - ], + '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)"', }, - 'rules': [ - { - 'rule_name': 'brand_mac', - 'extension': 'plist', - 'inputs': [ ], - 'outputs': [ - '<(INTERMEDIATE_DIR)/remoting_me2me_host-Info.plist', - ], - 'action': [ - 'python', '<(version_py_path)', - '-i', 'host/remoting_me2me_host-Info.plist', - '-o', '<(INTERMEDIATE_DIR)/remoting_me2me_host-Info.plist', - '-e', 'VERSION_FULL="<(version_full)"', - '-e', 'VERSION_SHORT="<(version_short)"', - '-e', 'BUNDLE_ID="<(host_bundle_id)"', - ], - 'process_outputs_as_sources': 1, - 'message': 'Branding and versioning remoting_me2me_host.', - }, + 'mac_bundle_resources': [ + 'host/remoting_me2me_host-Info.plist', + ], + 'mac_bundle_resources!': [ + 'host/remoting_me2me_host-Info.plist', ], }], ['OS=="win"', { |