Bazaar

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

  1. plugin-packaging-524162
  2. Merge into 2.1
Proposed by Ian Clatworthy
Status: Merged
Approved by: Martin Pool
Approved revision: no longer in the source branch.
Merged at revision: not available
Proposed branch: lp:~ian-clatworthy/bzr/plugin-packaging-524162
Merge into: lp:bzr/2.1
Diff against target: 47 lines (+9/-3)
2 files modified
NEWS (+2/-0)
setup.py (+7/-3)
To merge this branch: bzr merge lp:~ian-clatworthy/bzr/plugin-packaging-524162
Reviewer Review Type Date Requested Status
Martin Pool Approve
Review via email: mp+20858@code.launchpad.net

Commit message

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

Description of the change

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.

To post a comment you must log in.
Revision history for this message
Martin Pool (mbp) :
review: Approve
Revision history for this message
Martin Pool (mbp) wrote :

Fed to pqm

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

Revision history for this message
Martin Pool (mbp) wrote :

should have fixed bug 524162?

Revision history for this message
Ian Clatworthy (ian-clatworthy) wrote :

Yes

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'NEWS'
2--- NEWS 2010-03-05 08:48:31 +0000
3+++ NEWS 2010-03-07 13:42:22 +0000
4@@ -14,6 +14,8 @@
5 Bug Fixes
6 *********
7
8+* Fix plugin packaging on Windows. (Ian Clatworthy, #524162)
9+
10 * Fix stub sftp test server to call os.getcwdu().
11 (Vincent Ladeuil, #526211, #526353)
12
13
14=== modified file 'setup.py'
15--- setup.py 2010-03-04 17:45:20 +0000
16+++ setup.py 2010-03-07 13:42:22 +0000
17@@ -37,7 +37,7 @@
18 'version': bzrlib.__version__,
19 'author': 'Canonical Ltd',
20 'author_email': 'bazaar@lists.canonical.com',
21- 'url': 'http://www.bazaar-vcs.org/',
22+ 'url': 'http://bazaar.canonical.com/',
23 'description': 'Friendly distributed version control system',
24 'license': 'GNU GPL v2',
25 'download_url': 'https://launchpad.net/bzr/+download',
26@@ -553,7 +553,7 @@
27 version = version_str,
28 description = META_INFO['description'],
29 author = META_INFO['author'],
30- copyright = "(c) Canonical Ltd, 2005-2009",
31+ copyright = "(c) Canonical Ltd, 2005-2010",
32 company_name = "Canonical Ltd.",
33 comments = META_INFO['description'],
34 )
35@@ -624,7 +624,11 @@
36 excludes.extend(["bzrlib.plugins." + d for d in dirs])
37 x = []
38 for i in files:
39- if os.path.splitext(i)[1] not in [".py", ".pyd", ".dll", ".mo"]:
40+ # Throw away files we don't want packaged. Note that plugins may
41+ # have data files with all sorts of extensions so we need to
42+ # be conservative here about what we ditch.
43+ ext = os.path.splitext(i)[1]
44+ if ext.endswith('~') or ext in [".pyc", ".swp"]:
45 continue
46 if i == '__init__.py' and root == 'bzrlib/plugins':
47 continue

Subscribers

People subscribed via source and target branches