Merge lp:~jameinel/bzr/2.2-win32-include-fastimport-package into lp:bzr/2.2

Proposed by John A Meinel
Status: Merged
Approved by: Vincent Ladeuil
Approved revision: no longer in the source branch.
Merged at revision: 5132
Proposed branch: lp:~jameinel/bzr/2.2-win32-include-fastimport-package
Merge into: lp:bzr/2.2
Diff against target: 26 lines (+9/-0)
1 file modified
setup.py (+9/-0)
To merge this branch: bzr merge lp:~jameinel/bzr/2.2-win32-include-fastimport-package
Reviewer Review Type Date Requested Status
Vincent Ladeuil Approve
Review via email: mp+62286@code.launchpad.net

Commit message

When building the bzr executable, include python-fastimport as a package that needs to be bundled.

Description of the change

The 'bzr-fastimport' plugin now depends on the 'python-fastimport' module. We've had a few bugs talking about 'fastimport' not getting bundled with the bzr installers, and this should fix that.

As always, I don't like hacking bzr core code to handle distribution issues, but rewriting the setup.py infrastructure is still off the table. My 'quick hack' test shows that it worked for bzr-2.3 (I edited setup.py manually and ran 'python setup.py py2exe' and saw 'fastimport' show up in library.zip.)

I'm not going to block the bzr-2.3.3 installers on this, because it has been a bug for a while, so it isn't a regression.

The earliest installer using the new system is the bzr-2.2 series, so I'm proposing this there, and planning on merging it up into bzr-2.3 and bzr-2.4.

To post a comment you must log in.
Revision history for this message
Vincent Ladeuil (vila) wrote :

To keep the ball rolling, I'm approving this, but really, having to require a review for this kind of change is a burden for *you* and all people building the windows installers.

By the way, I think we won't build any 2.2 windows installers (we already stopped building them for OSX AFAIK) so you can just target 2.3 and merge in trunk.

review: Approve
Revision history for this message
John A Meinel (jameinel) wrote :

sent to pqm by email

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'setup.py'
2--- setup.py 2010-12-02 09:23:10 +0000
3+++ setup.py 2011-05-25 12:17:58 +0000
4@@ -468,6 +468,12 @@
5 packages.append('sqlite3')
6
7
8+def get_fastimport_py2exe_info(includes, excludes, packages):
9+ # This is the python-fastimport package, not to be confused with the
10+ # bzr-fastimport plugin.
11+ packages.append('fastimport')
12+
13+
14 if 'bdist_wininst' in sys.argv:
15 def find_docs():
16 docs = []
17@@ -660,6 +666,9 @@
18 if 'svn' in plugins:
19 get_svn_py2exe_info(includes, excludes, packages)
20
21+ if 'fastimport' in plugins:
22+ get_fastimport_py2exe_info(includes, excludes, packages)
23+
24 if "TBZR" in os.environ:
25 # TORTOISE_OVERLAYS_MSI_WIN32 must be set to the location of the
26 # TortoiseOverlays MSI installer file. It is in the TSVN svn repo and

Subscribers

People subscribed via source and target branches