Ubuntu One Windows Installer

Merge lp:~mikemc/ubuntuone-windows-installer/gimme-u1sdtool into lp:ubuntuone-windows-installer

  1. gimme-u1sdtool
  2. Merge into trunk
Proposed by Mike McCracken on 2012-08-28
Status: Merged
Approved by: Mike McCracken on 2012-08-29
Approved revision: 145
Merged at revision: 135
Proposed branch: lp:~mikemc/ubuntuone-windows-installer/gimme-u1sdtool
Merge into: lp:ubuntuone-windows-installer
Prerequisite: lp:~mikemc/ubuntuone-windows-installer/build-sign-daemon
Diff against target: 43 lines (+8/-1)
2 files modified
scripts/data/macapp_template.plist (+2/-0)
scripts/setup-mac.py (+6/-1)
To merge this branch: bzr merge lp:~mikemc/ubuntuone-windows-installer/gimme-u1sdtool
Reviewer Review Type Date Requested Status
Roberto Alsina (community) 2012-08-28 Approve on 2012-08-28
Review via email: mp+121680@code.launchpad.net

This proposal supersedes a proposal from 2012-08-28.

Commit Message

- Add U1SDTool to the app package as a sub-app. (LP: #1042855)

Description of the Change

- Add U1SDTool to the app package as a sub-app. (LP: #1042855)

To test, build the bundle and try using u1sdtool from the command line thusly:

% ./UbuntuOne.app/Contents/Resources/UbuntuOne\ Syncdaemon\ Debug.app/Contents/MacOS/u1sdtool -h

% ./UbuntuOne.app/Contents/Resources/UbuntuOne\ Syncdaemon\ Debug.app/Contents/MacOS/u1sdtool -s

and &, etc… and so on.

To post a comment you must log in.
Roberto Alsina (ralsina) wrote :

in for a penny, in for a pound

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'scripts/data/macapp_template.plist'
2--- scripts/data/macapp_template.plist 2012-08-15 21:55:36 +0000
3+++ scripts/data/macapp_template.plist 2012-08-28 18:49:18 +0000
4@@ -12,5 +12,7 @@
5 <string>3.0.0</string>
6 <key>CFBundleVersion</key>
7 <string>3.0.0.1</string>
8+ <key>CFBundleIconFile</key>
9+ <string>u1_mac_icon.icns</string>
10 </dict>
11 </plist>
12
13=== modified file 'scripts/setup-mac.py'
14--- scripts/setup-mac.py 2012-08-28 18:49:18 +0000
15+++ scripts/setup-mac.py 2012-08-28 18:49:18 +0000
16@@ -62,6 +62,7 @@
17 'ubuntuone-syncdaemon': 'UbuntuOne Syncdaemon',
18 'ubuntuone-control-panel-qt': 'UbuntuOne',
19 'ubuntuone-proxy-tunnel': 'UbuntuOne Proxy Tunnel',
20+ 'u1sdtool': 'U1SDTool'
21 }
22
23 LOG_LEVEL = "DEBUG"
24@@ -226,7 +227,7 @@
25
26 shutil.copyfile(os.path.join(self.source_dir, "ubuntuone-client",
27 "bin", "u1sdtool"),
28- os.path.join("bin", "u1sdtool"))
29+ os.path.join("bin", "u1sdtool.py"))
30
31 dest = os.path.join("bin", "ubuntuone-proxy-tunnel.py")
32 shutil.copyfile(os.path.join(self.source_dir, "ubuntuone-client",
33@@ -594,6 +595,10 @@
34 "com.ubuntu.one.syncdaemon",
35 "ubuntuone-syncdaemon")
36
37+ u1sdtool_app_path = do_setup(True,
38+ "com.ubuntu.one.u1sdtool",
39+ "u1sdtool")
40+
41 control_panel_app_path = do_setup(False,
42 "com.ubuntu.one.controlpanel",
43 "ubuntuone-control-panel-qt",

Subscribers

People subscribed via source and target branches