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

[John A Meinel]

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

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.

[Vincent Ladeuil (vila)]

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

[John A Meinel (jameinel)]

sent to pqm by email

=== modified file 'setup.py'
--- setup.py	2010-12-02 09:23:10 +0000
+++ setup.py	2011-05-25 12:17:58 +0000
@@ -468,6 +468,12 @@
     packages.append('sqlite3')
 
 
+def get_fastimport_py2exe_info(includes, excludes, packages):
+    # This is the python-fastimport package, not to be confused with the
+    # bzr-fastimport plugin.
+    packages.append('fastimport')
+
+
 if 'bdist_wininst' in sys.argv:
     def find_docs():
         docs = []
@@ -660,6 +666,9 @@
     if 'svn' in plugins:
         get_svn_py2exe_info(includes, excludes, packages)
 
+    if 'fastimport' in plugins:
+        get_fastimport_py2exe_info(includes, excludes, packages)
+
     if "TBZR" in os.environ:
         # TORTOISE_OVERLAYS_MSI_WIN32 must be set to the location of the
         # TortoiseOverlays MSI installer file. It is in the TSVN svn repo and