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

[Mike McCracken]

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

- 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.

Unmerged revisions

=== added file 'scripts/codesign-darwin.sh'
--- scripts/codesign-darwin.sh	1970-01-01 00:00:00 +0000
+++ scripts/codesign-darwin.sh	2012-08-28 18:42:20 +0000
@@ -0,0 +1,16 @@
+#!/bin/bash
+
+set -x 
+set -e
+
+/usr/bin/codesign -f -s "$@" com.ubuntu.one.fsevents
+
+mkdir -p UbuntuOne.app/Contents/Library/LaunchServices
+
+mv com.ubuntu.one.fsevents UbuntuOne.app/Contents/Library/LaunchServices/
+
+/usr/bin/codesign -f -s "$@" UbuntuOne.app
+
+/usr/bin/codesign -vvvv -d UbuntuOne.app
+
+echo Done.

=== modified file 'scripts/data/macapp_template.plist'
--- scripts/data/macapp_template.plist	2012-08-15 21:55:36 +0000
+++ scripts/data/macapp_template.plist	2012-08-28 18:42:20 +0000
@@ -12,5 +12,7 @@
 	<string>3.0.0</string>
 	<key>CFBundleVersion</key>
 	<string>3.0.0.1</string>
+	<key>CFBundleIconFile</key>
+	<string>u1_mac_icon.icns</string>
 </dict>
 </plist>

=== modified file 'scripts/setup-mac.py'
--- scripts/setup-mac.py	2012-08-15 22:38:28 +0000
+++ scripts/setup-mac.py	2012-08-28 18:42:20 +0000
@@ -52,6 +52,8 @@
     print "or see http://bitbucket.com/ronaldoussoren/py2app/"
     sys.exit()
 
+CODESIGN_CN = "Joe Developer"
+FSEVENTS_DAEMON_NAME = "com.ubuntu.one.fsevents"
 
 APP_NAMES = {'ubuntu-sso-login': 'Ubuntu SSO Helper',
              'ubuntu-sso-login-qt': 'Ubuntu Single Sign-On',
@@ -60,6 +62,7 @@
              'ubuntuone-syncdaemon': 'UbuntuOne Syncdaemon',
              'ubuntuone-control-panel-qt': 'UbuntuOne',
              'ubuntuone-proxy-tunnel': 'UbuntuOne Proxy Tunnel',
+             'u1sdtool': 'U1SDTool'
              }
 
 LOG_LEVEL = "DEBUG"
@@ -224,7 +227,7 @@
 
         shutil.copyfile(os.path.join(self.source_dir, "ubuntuone-client",
                                      "bin", "u1sdtool"),
-                        os.path.join("bin", "u1sdtool"))
+                        os.path.join("bin", "u1sdtool.py"))
 
         dest = os.path.join("bin", "ubuntuone-proxy-tunnel.py")
         shutil.copyfile(os.path.join(self.source_dir, "ubuntuone-client",
@@ -426,6 +429,25 @@
         with open(os.path.join("data", "logging.conf"), "wb") as logconf:
             logconf.write(data)
 
+        # build fsevents daemon
+        log_file_name = os.path.join(INSTALL_DIR,
+                                     "fsevents-daemon-build.log")
+        with open(log_file_name, 'w') as logfile:
+            proj_path = os.path.join(self.source_dir,
+                                     "ubuntuone-fsevents-daemon",
+                                     "objc")
+            cmd = ("cd %s && "
+                   "xcodebuild -scheme FsEvents SYMROOT=%r clean build" %
+                   (proj_path, INSTALL_DIR))
+            retval = subprocess.call(cmd,
+                                     shell=True,
+                                     stderr=subprocess.STDOUT,
+                                     stdout=logfile
+                                     )
+            if retval != 0:
+                print "error running %r in %r. look in %r for details" %\
+                    (cmd, os.getcwd(), logfile.name)
+
         # Install fsevents_daemon client code: required because it is
         # a subpackage of ubuntuone, which all needs to be in the same
         # place for py2app to copy it
@@ -523,6 +545,14 @@
                      CFBundleExecutable=exename,
                      CFBundleName=name)
 
+        if is_main_app:
+            req_str = ("identifier %s and "
+                       "certificate leaf[subject.CN] = \"%s\"" %
+                       (FSEVENTS_DAEMON_NAME,
+                        CODESIGN_CN))
+            req_dict = {FSEVENTS_DAEMON_NAME: req_str}
+            plist.update(SMPrivilegedExecutables=req_dict)
+
         options = copy.deepcopy(master_options)
         options.update({"plist": plist,
                         "bdist_base": os.path.join("build", exename),
@@ -565,6 +595,10 @@
                                    "com.ubuntu.one.syncdaemon",
                                    "ubuntuone-syncdaemon")
 
+    u1sdtool_app_path = do_setup(True,
+                                 "com.ubuntu.one.u1sdtool",
+                                 "u1sdtool")
+
     control_panel_app_path = do_setup(False,
                                       "com.ubuntu.one.controlpanel",
                                       "ubuntuone-control-panel-qt",
@@ -751,4 +785,16 @@
 
     main_zip.close()
 
-    print "DONE. see dist/ for the .app."
+    # make a package to send for signing
+
+    sign_dir = os.path.join("dist", "build_to_sign")
+    os.makedirs(sign_dir)
+
+    shutil.move(control_panel_app_path, sign_dir)
+    daemon_build_path = os.path.join(INSTALL_DIR, "Debug",
+                                     FSEVENTS_DAEMON_NAME)
+    shutil.copy(daemon_build_path, sign_dir)
+    shutil.copy(os.path.join("codesign-darwin.sh"),
+                sign_dir)
+
+    print "Done. See %r for the signing package." % sign_dir