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

[Mike McCracken]

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

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

[Brian Curtin (brian.curtin)]

review: Approve

[lp:~mikemc/ubuntuone-windows-installer/bump-mac-version-4-0-1]

164. By Mike McCracken on 2013-01-24

fix typo that breaks update checking

165. By Mike McCracken on 2013-01-24

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

166. By Mike McCracken on 2013-02-01

merge, resolve

[dobey (dobey)]

review: Approve

=== 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 @@
 Overview
 ========
 
-NOTE: you must use the python wrapper from the buildout to run
-setup-mac.py.
-
-Run 'python setup-mac.py prepare --from-trunk py2app' to download and build
-all dependencies, and package the .app bundles together into a
-standalone dist/ubuntuone-control-panel/UbuntuOne.app
-
-For development, omit --from-trunk to build from the buildout's
+Use the python wrapper from the buildout to run setup-mac.py:
+
+% cd scripts/devsetup
+% source env-mac
+
+Then add the path to a *built* fsevents.py and _fsevents.so from
+macfsevents to PYTHONPATH, as this is not currently added to the path
+automatically like everything else.
+
+% export PYTHONPATH=$PYTHONPATH:/path to fsevents.py/
+
+Set U1_CODESIGN_CN to the *full* common name of a valid code signing
+cert with correctly attached private key that is accessible in your
+system keychain.
+
+The one we use for releases can only be generated by the Canonical
+employee who is currently our Apple dev program agent. The cert itself
+will always be called "Developer ID Application: Canonical Group
+Limited"
+
+% export U1_CODESIGN_CN="Developer ID Application: Canonical Group Limited"
+
+Run the setup-mac script to complete the packaging:
+
+% cd scripts/
+% python setup-mac.py prepare py2app 
+
+At this point there is a folder dist/build_to_sign with Ubuntu
+One.app, the fsevents daemon program, and two scripts. 
+
+Before you do the code signing, run each of the executables to make
+sure python generates the .pyo file for site.py. Do something like
+this to check if you're done:
+
+% find . -name "site.py*"
+
+For each of those, run the corresponding executable until there are no
+.py without corresponding .pyo.
+
+Finally, The codesign-darwin.sh script does the actual code signing of each
+executable in the app. - there are currently ~30 things to sign. Call
+it with the same full cert name:
+
+% ./codesign-darwin.sh $U1_CODESIGN_CN
+
+NOTE: you may have to call it twice before it stops complaining about invalid signatures.
+
+
+# The prepare step
+
+'setup-mac.py prepare' builds and installs the subprojects into a
+staging directory 'installed/'.
+
+prepare --from-lp will grab the trunk of the relevant projects from
+launchpad and put them in ./sources/projectname 
+
+For development, omit --from-lp to build from the buildout's
 'parts' directory.
-
-The Prepare Step
-================
-
-Prepare builds and installs the subprojects into a staging directory
-'installed/'. 
-
-prepare --from-trunk will grab the trunk of the relevant projects from
-launchpad and put them in ./sources/projectname 
  
-prepare --only-prepare allows you to pick which of the three
+prepare --only-prepare allows you to pick which of the 
 subprojects to stage (default is all). 
-
 This is mostly only useful for development, to make the build-test loop faster. 
 
-
-The py2app Step
-===============
+# The py2app Step
 
 The py2app action does the dependency detection and .app bundle
 building.
@@ -41,29 +78,6 @@
 Testing
 =======
 
-As of June 12, 2012, none of the generated .app bundles do anything
-when double-clicked in the OS X Finder.
-
-The main UbuntuOne.app will launch the ubuntuone-control-panel but is
-pending some platform integration work.
-
-The project that is the furthest along is the ubuntu-sso-client, and
-you can test its operation from within the main package like this:
- 
-# build:
-
-% cd buildout-env/scripts/devsetup/parts/ubuntuone-windows-installer/scripts
-% PYTHONPATH=. python setup-mac.py prepare py2app
-
-
-# test:
-
-% 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
-
-# or test login only:
-% 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
-
-
-This should show the Ubuntu SSO screen (it may show behind the topmost
-window, move the terminal window to reveal it). The account creation
-and login steps should work properly.
+As of January 7, 2013, the test suites for the various components work
+on darwin, with the exception being ubuntuone-client, which should
+improve soon.

=== 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 @@
 	<key>CFBundleDevelopmentRegion</key>
 	<string>English</string>
 	<key>CFBundleShortVersionString</key>
-	<string>4.0</string>
+	<string>4.0.1</string>
 	<key>CFBundleVersion</key>
-	<string>4.0</string>
+	<string>4.0.1</string>
 </dict>
 </plist>