Make me2me_host a Mac bundle (issue 10310089)

38 views
Skip to first unread message

lambros...@chromium.org

unread,
May 9, 2012, 8:54:24 PM5/9/12
to gar...@chromium.org, chromium...@chromium.org, jamiewal...@chromium.org, dcaiaf...@chromium.org, simonmor...@chromium.org, hclam...@chromium.org, wez+...@chromium.org, am...@chromium.org, sanj...@chromium.org, garyka...@chromium.org, lambroslam...@chromium.org, alexeyp...@chromium.org, sergey...@chromium.org
Reviewers: garykac,

Description:
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


Please review this at http://codereview.chromium.org/10310089/

SVN Base: svn://svn.chromium.org/chrome/trunk/src

Affected files:
M remoting/host/installer/mac/ChromotingHostService.packproj
M
remoting/host/installer/mac/PrivilegedHelperTools/org.chromium.chromoting.me2me.sh
M remoting/host/installer/mac/do_signing.sh
M remoting/host/installer/mac/uninstaller/remoting_uninstaller.mm
M remoting/host/remoting_me2me_host-Info.plist
M remoting/remoting.gyp


Index: remoting/host/installer/mac/ChromotingHostService.packproj
diff --git a/remoting/host/installer/mac/ChromotingHostService.packproj
b/remoting/host/installer/mac/ChromotingHostService.packproj
index
15e9f0cd5559a222ed0ef0c1e1fae01d9ab6ca0a..e6edddf9a49f12dd7355a7d2cafec53c60bf432a
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>
Index:
remoting/host/installer/mac/PrivilegedHelperTools/org.chromium.chromoting.me2me.sh
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
28369e2e8d36749b6971e592f4ae5cb8a5a433c7..9e01d27d0aec56870eb86ce157bc04c794f5afa7
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

Index: remoting/host/installer/mac/do_signing.sh
diff --git a/remoting/host/installer/mac/do_signing.sh
b/remoting/host/installer/mac/do_signing.sh
index
4d46681d265b1b916d5812746aeaf0d8ad26d5d0..1dc9e4808aeb1b24cb21c2f7bdc58d6d1817f12f
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
Index: remoting/host/installer/mac/uninstaller/remoting_uninstaller.mm
diff --git
a/remoting/host/installer/mac/uninstaller/remoting_uninstaller.mm
b/remoting/host/installer/mac/uninstaller/remoting_uninstaller.mm
index
e2e0abd98c536ad3d2fcf4fa4995752142a296ea..48f64377b9203acdd3fbe4f0f39240d80e591808
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];

Index: remoting/host/remoting_me2me_host-Info.plist
diff --git a/remoting/host/remoting_me2me_host-Info.plist
b/remoting/host/remoting_me2me_host-Info.plist
index
76fb3fc5604e08b69cdef33b6bcb3cd1b11561a8..b5b9d94fe36f23036fa7229e1e2e9620262bea0e
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
Index: remoting/remoting.gyp
diff --git a/remoting/remoting.gyp b/remoting/remoting.gyp
index
e1258ef2e5a60808c206f2324dfea0cdd32000a7..7218e03622f40471f312fe64d395ec1a3fc5ed95
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"', {


gar...@chromium.org

unread,
May 9, 2012, 9:18:15 PM5/9/12
to lambros...@chromium.org, chromium...@chromium.org, jamiewal...@chromium.org, dcaiaf...@chromium.org, simonmor...@chromium.org, hclam...@chromium.org, wez+...@chromium.org, am...@chromium.org, sanj...@chromium.org, garyka...@chromium.org, lambroslam...@chromium.org, alexeyp...@chromium.org, sergey...@chromium.org
LGTM

http://codereview.chromium.org/10310089/

commi...@chromium.org

unread,
May 10, 2012, 1:03:46 PM5/10/12
to lambros...@chromium.org, gar...@chromium.org, chromium...@chromium.org, jamiewal...@chromium.org, dcaiaf...@chromium.org, simonmor...@chromium.org, hclam...@chromium.org, wez+...@chromium.org, am...@chromium.org, sanj...@chromium.org, garyka...@chromium.org, lambroslam...@chromium.org, alexeyp...@chromium.org, sergey...@chromium.org
CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/lambros...@chromium.org/10310089/1


https://chromiumcodereview.appspot.com/10310089/

commi...@chromium.org

unread,
May 10, 2012, 1:52:51 PM5/10/12
to lambros...@chromium.org, gar...@chromium.org, chromium...@chromium.org, jamiewal...@chromium.org, dcaiaf...@chromium.org, simonmor...@chromium.org, hclam...@chromium.org, wez+...@chromium.org, am...@chromium.org, sanj...@chromium.org, garyka...@chromium.org, lambroslam...@chromium.org, alexeyp...@chromium.org, sergey...@chromium.org
Try job failure for 10310089-1 (retry) on mac_rel for step "browser_tests".
It's a second try, previously, step "browser_tests" failed.
http://build.chromium.org/p/tryserver.chromium/buildstatus?builder=mac_rel&number=24387


https://chromiumcodereview.appspot.com/10310089/

commi...@chromium.org

unread,
May 10, 2012, 3:42:43 PM5/10/12
to lambros...@chromium.org, gar...@chromium.org, chromium...@chromium.org, jamiewal...@chromium.org, dcaiaf...@chromium.org, simonmor...@chromium.org, hclam...@chromium.org, wez+...@chromium.org, am...@chromium.org, sanj...@chromium.org, garyka...@chromium.org, lambroslam...@chromium.org, alexeyp...@chromium.org, sergey...@chromium.org

commi...@chromium.org

unread,
May 10, 2012, 5:26:22 PM5/10/12
to lambros...@chromium.org, gar...@chromium.org, chromium...@chromium.org, jamiewal...@chromium.org, dcaiaf...@chromium.org, simonmor...@chromium.org, hclam...@chromium.org, wez+...@chromium.org, am...@chromium.org, sanj...@chromium.org, garyka...@chromium.org, lambroslam...@chromium.org, alexeyp...@chromium.org, sergey...@chromium.org
Change committed as 136393

https://chromiumcodereview.appspot.com/10310089/
Reply all
Reply to author
Forward
0 new messages