Merge lp:~mikemc/ubuntuone-windows-installer/setup-mac-add-sd into lp:ubuntuone-windows-installer

[Mike McCracken]

- Add syncdaemon and storageprotocol to the darwin app package. (LP: #1019142)

- Add syncdaemon and storageprotocol to the darwin app package. (LP: #1019142)

[dobey (dobey)]

Looks ok to me.

review: Approve

[Diego Sarmentero (diegosarmentero)]

+1

review: Approve

=== modified file 'scripts/setup-mac.py'
--- scripts/setup-mac.py	2012-06-15 17:13:44 +0000
+++ scripts/setup-mac.py	2012-07-12 23:06:19 +0000
@@ -120,8 +120,8 @@
                      use buildout instead."""),
                     ("only-prepare=", None,
                      """Only do expensive stuff for the packages on
-                     this list of one or more of 'sso',
-                     'controlpanel', or 'client'.
+                     this list. Can be any of: 'sso',
+                     'controlpanel', 'client', or 'storage-protocol'.
                      (NOTE: still downloads everything if from-trunk
                      is set)"""),
                     ("source-dir=", None,
@@ -149,7 +149,7 @@
 
         if self.only_prepare is None:
             # default is to do everything:
-            self.only_prepare = "sso, controlpanel, client"
+            self.only_prepare = "sso, controlpanel, client, storage-protocol"
 
     def run(self):
         """Copy, build and munge things to prepare for packaging."""
@@ -311,19 +311,46 @@
             # Copying by hand because the install is borked
             dest_cp = os.path.join(dest_dir, "ubuntuone", "controlpanel")
             shutil.copytree(os.path.join("ubuntuone", "controlpanel"),
-                dest_cp)
+                            dest_cp)
 
         u1cp_revno = subprocess.check_output(["bzr", "revno", "."],
                                              env=BZR_ENV).strip()
 
         os.chdir(start_dir)
 
+        # build and install storage-protocol files
+        os.chdir(os.path.join(self.source_dir, "ubuntuone-storage-protocol"))
+        if 'storage-protocol' in self.only_prepare:
+            print "building ubuntuone-storage-protocol"
+            log_file_name = os.path.join(INSTALL_DIR,
+                                         "storage-protocol-build.log")
+            with open(log_file_name, 'w') as logfile:
+                cmd = "python setup.py build"
+                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)
+
+            dest_sp = os.path.join(dest_dir, "ubuntuone", "storageprotocol")
+            shutil.copytree(os.path.join("ubuntuone", "storageprotocol"),
+                            dest_sp)
+
+        sp_revno = subprocess.check_output(["bzr", "revno", "."],
+                                             env=BZR_ENV).strip()
+
+        os.chdir(start_dir)
+
         # Create revno file
         with open(os.path.join("data", "revnos.txt"), "w+") as revnos:
             revnos.write("ubuntu-sso-client: %s"
-                    "ubuntuone-client: %s"
-                    "ubuntuone-control-panel: %s" %
-                    (sso_revno, u1client_revno, u1cp_revno))
+                         "ubuntuone-client: %s"
+                         "ubuntuone-control-panel: %s"
+                         "ubuntuone-storage-protocol: %s" %
+                         (sso_revno, u1client_revno, u1cp_revno, sp_revno))
 
         # Copy storage-protocol's pem files
         shutil.copyfile(os.path.join(self.source_dir,
@@ -387,6 +414,7 @@
                                    'twisted.web.client',
                                    'ubuntu_sso.qt',
                                    'ubuntu_sso.qt.ui',
+                                   'ubuntuone.storageprotocol',
                                    'oauth'],
                       "excludes": ["fsm", "PyQt4.uic"],
                       "frameworks": dylib_paths,
@@ -451,6 +479,13 @@
                                      os.path.join("bin",
                                                   "ubuntuone-proxy-tunnel.py"))
 
+    syncdaemon_app_path = do_setup("UbuntuOne Syncdaemon",
+                                   True,
+                                   "com.ubuntu.one.syncdaemon",
+                                   "ubuntuone-syncdaemon",
+                                   os.path.join("bin",
+                                                "ubuntuone-syncdaemon.py"))
+
     control_panel_script = os.path.join("bin", "ubuntuone-control-panel-qt.py")
     control_panel_app_path = do_setup("UbuntuOne",
                                       True,
@@ -524,5 +559,6 @@
     copy_helper(sso_login_qt_app_path)
     copy_helper(sso_login_app_path)
     copy_helper(proxy_tunnel_app_path)
+    copy_helper(syncdaemon_app_path)
 
     print "DONE. see dist/ for the .app."