Ubuntu One Windows Installer

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

  1. bundle-script-update
  2. Merge into trunk
Proposed by Diego Sarmentero on 2012-01-26
Status: Merged
Approved by: Diego Sarmentero on 2012-01-27
Approved revision: 103
Merged at revision: 103
Proposed branch: lp:~diegosarmentero/ubuntuone-windows-installer/bundle-script-update
Merge into: lp:ubuntuone-windows-installer
Diff against target: 62 lines (+10/-6)
1 file modified
scripts/setup.py (+10/-6)
To merge this branch: bzr merge lp:~diegosarmentero/ubuntuone-windows-installer/bundle-script-update
Reviewer Review Type Date Requested Status
Roberto Alsina (community) 2012-01-26 Approve on 2012-01-26
Review via email: mp+90262@code.launchpad.net

Commit Message

Update setup.py script to create the bundle

To post a comment you must log in.
Roberto Alsina (ralsina) wrote :

+1 code review + IRL test

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'scripts/setup.py'
2--- scripts/setup.py 2012-01-09 14:36:13 +0000
3+++ scripts/setup.py 2012-01-26 13:44:24 +0000
4@@ -207,13 +207,14 @@
5
6 # Build UI files, copy packages.
7 dest_dir = os.path.join(
8- "..", "..", "installed", "Lib", "site-packages", "ubuntu_sso")
9+ "..", "..", "installed", "Lib", "site-packages")
10+ dest_sso = os.path.join(dest_dir, "ubuntu_sso")
11 start_dir = os.getcwd()
12 os.chdir(os.path.join("sources", "ubuntu-sso-client"))
13 os.system("python setup.py build")
14 os.system("python setup.py install --prefix=%s" %
15 os.path.join("..", "..", "installed"))
16- shutil.copytree("ubuntu_sso", dest_dir)
17+ shutil.copytree("ubuntu_sso", dest_sso)
18 sso_revno = subprocess.Popen(
19 ["bzr", "revno", "."],
20 stdout=subprocess.PIPE).communicate()[0]
21@@ -222,7 +223,8 @@
22 os.chdir(os.path.join("sources", "ubuntuone-client"))
23 shutil.copy(os.path.join("windows", "clientdefs.py"),
24 os.path.join("ubuntuone", "clientdefs.py"))
25- shutil.copytree("ubuntuone", dest_dir)
26+ dest_client = os.path.join(dest_dir, "ubuntuone")
27+ shutil.copytree("ubuntuone", dest_client)
28 u1client_revno = subprocess.Popen(
29 ["bzr", "revno", "."],
30 stdout=subprocess.PIPE).communicate()[0]
31@@ -231,8 +233,9 @@
32 os.chdir(os.path.join("sources", "ubuntuone-control-panel"))
33 os.system("python setup.py build")
34 # Copying by hand because the install is borked
35+ dest_cp = os.path.join(dest_dir, "ubuntuone", "controlpanel")
36 shutil.copytree(os.path.join("ubuntuone", "controlpanel"),
37- dest_dir)
38+ dest_cp)
39 u1cp_revno = subprocess.Popen(
40 ["bzr", "revno", "."],
41 stdout=subprocess.PIPE).communicate()[0]
42@@ -241,7 +244,8 @@
43 os.chdir(os.path.join("sources", "ubuntuone-windows-installer"))
44 os.system("python setup.py build")
45 # Copying by hand because the install is borked
46- shutil.copytree("ubuntuone_installer", dest_dir)
47+ dest_installer = os.path.join(dest_dir, "ubuntuone_installer")
48+ shutil.copytree("ubuntuone_installer", dest_installer)
49 u1inst_revno = subprocess.Popen(
50 ["bzr", "revno", "."],
51 stdout=subprocess.PIPE).communicate()[0]
52@@ -346,9 +350,9 @@
53 'configglue',
54 'configglue.app',
55 'configglue.inischema',
56- 'configglue.pyschema.glue',
57 'configglue.inischema.glue',
58 'configglue.inischema.parsers',
59+ 'comtypes',
60 ],
61 'excludes': ['fsm'],
62 "dll_excludes": [

Subscribers

People subscribed via source and target branches