Merge lp:~mikemc/ubuntuone-windows-installer/bump-mac-version-4-0-1 into lp:ubuntuone-windows-installer

Proposed by Mike McCracken
Status: Merged
Approved by: dobey
Approved revision: 166
Merged at revision: 161
Proposed branch: lp:~mikemc/ubuntuone-windows-installer/bump-mac-version-4-0-1
Merge into: lp:ubuntuone-windows-installer
Prerequisite: lp:~mikemc/ubuntuone-windows-installer/fix-signing-certname
Diff against target: 144 lines (+64/-50)
2 files modified
scripts/README-mac.txt (+62/-48)
scripts/data/macapp_template.plist (+2/-2)
To merge this branch: bzr merge lp:~mikemc/ubuntuone-windows-installer/bump-mac-version-4-0-1
Reviewer Review Type Date Requested Status
dobey (community) Approve
Brian Curtin (community) Approve
Review via email: mp+144821@code.launchpad.net

Commit message

- Change mac client version to 4.0.1, update README-mac.

Description of the change

- Change mac client version to 4.0.1, update README-mac.

To post a comment you must log in.
Revision history for this message
Brian Curtin (brian.curtin) :
review: Approve
164. By Mike McCracken

fix typo that breaks update checking

165. By Mike McCracken

Merged fix-signing into bump-version-4-0-1.

166. By Mike McCracken

merge, resolve

Revision history for this message
dobey (dobey) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'scripts/README-mac.txt'
--- scripts/README-mac.txt 2012-06-13 15:36:52 +0000
+++ scripts/README-mac.txt 2013-02-01 21:16:19 +0000
@@ -6,33 +6,70 @@
6Overview6Overview
7========7========
88
9NOTE: you must use the python wrapper from the buildout to run9Use the python wrapper from the buildout to run setup-mac.py:
10setup-mac.py.10
1111% cd scripts/devsetup
12Run 'python setup-mac.py prepare --from-trunk py2app' to download and build12% source env-mac
13all dependencies, and package the .app bundles together into a13
14standalone dist/ubuntuone-control-panel/UbuntuOne.app14Then add the path to a *built* fsevents.py and _fsevents.so from
1515macfsevents to PYTHONPATH, as this is not currently added to the path
16For development, omit --from-trunk to build from the buildout's16automatically like everything else.
17
18% export PYTHONPATH=$PYTHONPATH:/path to fsevents.py/
19
20Set U1_CODESIGN_CN to the *full* common name of a valid code signing
21cert with correctly attached private key that is accessible in your
22system keychain.
23
24The one we use for releases can only be generated by the Canonical
25employee who is currently our Apple dev program agent. The cert itself
26will always be called "Developer ID Application: Canonical Group
27Limited"
28
29% export U1_CODESIGN_CN="Developer ID Application: Canonical Group Limited"
30
31Run the setup-mac script to complete the packaging:
32
33% cd scripts/
34% python setup-mac.py prepare py2app
35
36At this point there is a folder dist/build_to_sign with Ubuntu
37One.app, the fsevents daemon program, and two scripts.
38
39Before you do the code signing, run each of the executables to make
40sure python generates the .pyo file for site.py. Do something like
41this to check if you're done:
42
43% find . -name "site.py*"
44
45For each of those, run the corresponding executable until there are no
46.py without corresponding .pyo.
47
48Finally, The codesign-darwin.sh script does the actual code signing of each
49executable in the app. - there are currently ~30 things to sign. Call
50it with the same full cert name:
51
52% ./codesign-darwin.sh $U1_CODESIGN_CN
53
54NOTE: you may have to call it twice before it stops complaining about invalid signatures.
55
56
57# The prepare step
58
59'setup-mac.py prepare' builds and installs the subprojects into a
60staging directory 'installed/'.
61
62prepare --from-lp will grab the trunk of the relevant projects from
63launchpad and put them in ./sources/projectname
64
65For development, omit --from-lp to build from the buildout's
17'parts' directory.66'parts' directory.
18
19The Prepare Step
20================
21
22Prepare builds and installs the subprojects into a staging directory
23'installed/'.
24
25prepare --from-trunk will grab the trunk of the relevant projects from
26launchpad and put them in ./sources/projectname
27 67
28prepare --only-prepare allows you to pick which of the three68prepare --only-prepare allows you to pick which of the
29subprojects to stage (default is all). 69subprojects to stage (default is all).
30
31This is mostly only useful for development, to make the build-test loop faster. 70This is mostly only useful for development, to make the build-test loop faster.
3271
3372# The py2app Step
34The py2app Step
35===============
3673
37The py2app action does the dependency detection and .app bundle74The py2app action does the dependency detection and .app bundle
38building.75building.
@@ -41,29 +78,6 @@
41Testing78Testing
42=======79=======
4380
44As of June 12, 2012, none of the generated .app bundles do anything81As of January 7, 2013, the test suites for the various components work
45when double-clicked in the OS X Finder.82on darwin, with the exception being ubuntuone-client, which should
4683improve soon.
47The main UbuntuOne.app will launch the ubuntuone-control-panel but is
48pending some platform integration work.
49
50The project that is the furthest along is the ubuntu-sso-client, and
51you can test its operation from within the main package like this:
52
53# build:
54
55% cd buildout-env/scripts/devsetup/parts/ubuntuone-windows-installer/scripts
56% PYTHONPATH=. python setup-mac.py prepare py2app
57
58
59# test:
60
61% U1_DEBUG=1 dist/ubuntuone-control-panel/UbuntuOne.app/Contents/Resources/Ubuntu\ Single\ Sign-On.app/Contents/MacOS/ubuntu-sso-login-qt --app_name holycowmacpac
62
63# or test login only:
64% U1_DEBUG=1 dist/ubuntuone-control-panel/UbuntuOne.app/Contents/Resources/Ubuntu\ Single\ Sign-On.app/Contents/MacOS/ubuntu-sso-login-qt --app_name holycowmacpac --login_only
65
66
67This should show the Ubuntu SSO screen (it may show behind the topmost
68window, move the terminal window to reveal it). The account creation
69and login steps should work properly.
7084
=== modified file 'scripts/data/macapp_template.plist'
--- scripts/data/macapp_template.plist 2012-12-10 18:13:57 +0000
+++ scripts/data/macapp_template.plist 2013-02-01 21:16:19 +0000
@@ -9,8 +9,8 @@
9 <key>CFBundleDevelopmentRegion</key>9 <key>CFBundleDevelopmentRegion</key>
10 <string>English</string>10 <string>English</string>
11 <key>CFBundleShortVersionString</key>11 <key>CFBundleShortVersionString</key>
12 <string>4.0</string>12 <string>4.0.1</string>
13 <key>CFBundleVersion</key>13 <key>CFBundleVersion</key>
14 <string>4.0</string>14 <string>4.0.1</string>
15</dict>15</dict>
16</plist>16</plist>

Subscribers

People subscribed via source and target branches