Merge lp:~diegosarmentero/ubuntuone-windows-installer/bundle-script-update into lp:ubuntuone-windows-installer

[Diego Sarmentero]

Update setup.py script to create the bundle

[Roberto Alsina (ralsina)]

+1 code review + IRL test

review: Approve

=== modified file 'scripts/setup.py'
--- scripts/setup.py	2012-01-09 14:36:13 +0000
+++ scripts/setup.py	2012-01-26 13:44:24 +0000
@@ -207,13 +207,14 @@
 
         # Build UI files, copy packages.
         dest_dir = os.path.join(
-            "..", "..", "installed", "Lib", "site-packages", "ubuntu_sso")
+            "..", "..", "installed", "Lib", "site-packages")
+        dest_sso = os.path.join(dest_dir, "ubuntu_sso")
         start_dir = os.getcwd()
         os.chdir(os.path.join("sources", "ubuntu-sso-client"))
         os.system("python setup.py build")
         os.system("python setup.py install --prefix=%s" %
             os.path.join("..", "..", "installed"))
-        shutil.copytree("ubuntu_sso", dest_dir)
+        shutil.copytree("ubuntu_sso", dest_sso)
         sso_revno = subprocess.Popen(
             ["bzr", "revno", "."],
             stdout=subprocess.PIPE).communicate()[0]
@@ -222,7 +223,8 @@
         os.chdir(os.path.join("sources", "ubuntuone-client"))
         shutil.copy(os.path.join("windows", "clientdefs.py"),
             os.path.join("ubuntuone", "clientdefs.py"))
-        shutil.copytree("ubuntuone", dest_dir)
+        dest_client = os.path.join(dest_dir, "ubuntuone")
+        shutil.copytree("ubuntuone", dest_client)
         u1client_revno = subprocess.Popen(
             ["bzr", "revno", "."],
             stdout=subprocess.PIPE).communicate()[0]
@@ -231,8 +233,9 @@
         os.chdir(os.path.join("sources", "ubuntuone-control-panel"))
         os.system("python setup.py build")
         # 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_dir)
+            dest_cp)
         u1cp_revno = subprocess.Popen(
             ["bzr", "revno", "."],
             stdout=subprocess.PIPE).communicate()[0]
@@ -241,7 +244,8 @@
         os.chdir(os.path.join("sources", "ubuntuone-windows-installer"))
         os.system("python setup.py build")
         # Copying by hand because the install is borked
-        shutil.copytree("ubuntuone_installer", dest_dir)
+        dest_installer = os.path.join(dest_dir, "ubuntuone_installer")
+        shutil.copytree("ubuntuone_installer", dest_installer)
         u1inst_revno = subprocess.Popen(
             ["bzr", "revno", "."],
             stdout=subprocess.PIPE).communicate()[0]
@@ -346,9 +350,9 @@
                     'configglue',
                     'configglue.app',
                     'configglue.inischema',
-                    'configglue.pyschema.glue',
                     'configglue.inischema.glue',
                     'configglue.inischema.parsers',
+                    'comtypes',
                     ],
                 'excludes': ['fsm'],
                 "dll_excludes": [