Merge lp:~mikemc/ubuntuone-windows-installer/byo-libjpeg into lp:ubuntuone-windows-installer

[Mike McCracken]

- Package libjpeg for PIL so we don't break when a user doesn't have it installed. (LP: #1050534)

- Package libjpeg for PIL so we don't break when a user doesn't have it installed. (LP: #1050534)

TO TEST, build the app and check that libjpeg.?.dylib is in UbuntuOne.app/Contents/Frameworks/

also try running SSO like this:

DYLD_PRINT_LIBRARIES=1 UbuntuOne.app/Contents/Resources/Ubuntu\ Single\ Sign-On.app/Contents/MacOS/ubuntu-sso-login-qt --app_name "Ubuntu One"

you will see a ton of spam and in there should be something like these lines:

dyld: loaded: /Users/mmccrack/Documents/Canonical/Source/test-improve-buildout/scripts/dist/build_to_sign/UbuntuOne.app/Contents/Resources/Ubuntu Single Sign-On.app/Contents/Resources/lib/python2.7/lib-dynload/_imaging.so

dyld: loaded: /Users/mmccrack/Documents/Canonical/Source/test-improve-buildout/scripts/dist/build_to_sign/UbuntuOne.app/Contents/Resources/Ubuntu Single Sign-On.app/Contents/MacOS/../Frameworks/libjpeg.8.dylib

then you're good!

Prior to this branch, loading _imaging.so on a dev's machine would grab libjpeg from /usr/local/lib/, where brew installs it. but if it's on a machine without that, whoops!

[Roberto Alsina (ralsina)]

review: Approve

[dobey (dobey)]

review: Approve

=== modified file 'scripts/setup-mac.py'
--- scripts/setup-mac.py	2012-09-14 20:36:23 +0000
+++ scripts/setup-mac.py	2012-09-26 20:21:24 +0000
@@ -502,7 +502,14 @@
     qt_network_plugins = glob.glob(qt_plugin_path + "/bearer/*.dylib")
     qt_imageformat_plugins = glob.glob(qt_plugin_path +
                                        "/imageformats/*.dylib")
-    dylib_paths = qt_imageformat_plugins + qt_network_plugins
+    qt_dylib_paths = qt_imageformat_plugins + qt_network_plugins
+
+    libjpeg_paths = glob.glob("/usr/local/lib/libjpeg.*.dylib")
+    if len(libjpeg_paths) != 1:
+        print "Warning: expected to find just one version of libjpeg"
+        print "found:", libjpeg_paths
+
+    dylib_paths = qt_dylib_paths + [libjpeg_paths[0]]
 
     data_files = glob.glob("data/*")
 
@@ -618,7 +625,7 @@
                                  "com.ubuntu.one.u1sdtool",
                                  "u1sdtool")
 
-    control_panel_app_path = do_setup(False,
+    control_panel_app_path = do_setup(True,
                                       "com.ubuntu.one.controlpanel",
                                       "ubuntuone-control-panel-qt",
                                       is_main_app=True)
@@ -641,7 +648,7 @@
     control_panel_frameworks_path = os.path.join(control_panel_contents_path,
                                                  "Frameworks")
 
-    plugin_names = [os.path.basename(f) for f in dylib_paths]
+    plugin_names = [os.path.basename(f) for f in qt_dylib_paths]
 
     bearers_dir = os.path.join(control_panel_frameworks_path,
                                "plugins", "bearer")