Merge lp:~ian-clatworthy/bzr/plugin-packaging-524162 into lp:bzr/2.1

[Ian Clatworthy]

(igc) include all files not specifically blacklisted when packaging plugins

setup.py is way too aggressive in throwing away files in plugins during the packaging process. As a consequence, toolbars in Explorer are missing, as are numerous other features in that plugin and perhaps others. This fixes the problem.

Note: I've managed to hack around this issue in the latest Windows Installer build scripts so we don't need to release 2.1.1 to get a good Windows installer. Even so, we need to fix the root problem so the relevant hack in the build script can be removed soon.

[Martin Pool (mbp)]

review: Approve

[Martin Pool (mbp)]

Fed to pqm

star-merge http://bazaar.launchpad.net/~ian-clatworthy/bzr/plugin-packaging-524162 http://bazaar.launchpad.net/~bzr-pqm/bzr/2.1

[Martin Pool (mbp)]

should have fixed bug 524162?

[Ian Clatworthy (ian-clatworthy)]

Yes

=== modified file 'NEWS'
--- NEWS	2010-03-05 08:48:31 +0000
+++ NEWS	2010-03-07 13:42:22 +0000
@@ -14,6 +14,8 @@
 Bug Fixes
 *********
 
+* Fix plugin packaging on Windows. (Ian Clatworthy, #524162)
+
 * Fix stub sftp test server to call os.getcwdu().
   (Vincent Ladeuil, #526211, #526353)
 

=== modified file 'setup.py'
--- setup.py	2010-03-04 17:45:20 +0000
+++ setup.py	2010-03-07 13:42:22 +0000
@@ -37,7 +37,7 @@
     'version':      bzrlib.__version__,
     'author':       'Canonical Ltd',
     'author_email': '[e-mail]',
-    'url':          'http://www.bazaar-vcs.org/',
+    'url':          'http://bazaar.canonical.com/',
     'description':  'Friendly distributed version control system',
     'license':      'GNU GPL v2',
     'download_url': 'https://launchpad.net/bzr/+download',
@@ -553,7 +553,7 @@
                                      version = version_str,
                                      description = META_INFO['description'],
                                      author = META_INFO['author'],
-                                     copyright = "(c) Canonical Ltd, 2005-2009",
+                                     copyright = "(c) Canonical Ltd, 2005-2010",
                                      company_name = "Canonical Ltd.",
                                      comments = META_INFO['description'],
                                     )
@@ -624,7 +624,11 @@
             excludes.extend(["bzrlib.plugins." + d for d in dirs])
         x = []
         for i in files:
-            if os.path.splitext(i)[1] not in [".py", ".pyd", ".dll", ".mo"]:
+            # Throw away files we don't want packaged. Note that plugins may
+            # have data files with all sorts of extensions so we need to
+            # be conservative here about what we ditch.
+            ext = os.path.splitext(i)[1]
+            if ext.endswith('~') or ext in [".pyc", ".swp"]:
                 continue
             if i == '__init__.py' and root == 'bzrlib/plugins':
                 continue