Rev 3582: * ``make dist`` now includes a number of plugins - those listed in in http://people.ubuntu.com/~robertc/baz2.0/bundled.plugins

[Robert Collins]

At http://people.ubuntu.com/~robertc/baz2.0/bundled.plugins

------------------------------------------------------------
revno: 3582
revision-id: robertc at robertcollins.net-20080728015028-msvp1rvgf9fwavmd
parent: pqm at pqm.ubuntu.com-20080725151945-kdaru30ix1m8k0h6
committer: Robert Collins <robertc at robertcollins.net>
branch nick: bundled.plugins
timestamp: Mon 2008-07-28 11:50:28 +1000
message:
   * ``make dist`` now includes a number of plugins - those listed in
     BUNDLED.PLUGINS. (Robert Collins)
added:
  BUNDLED.PLUGINS                bundled.plugins-20080728011848-knwz4aytcu24g0j5-1
modified:
  Makefile                       Makefile-20050805140406-d96e3498bb61c5bb
  NEWS                           NEWS-20050323055033-4e00b5db738777ff
=== added file 'BUNDLED.PLUGINS'
--- a/BUNDLED.PLUGINS	1970-01-01 00:00:00 +0000
+++ b/BUNDLED.PLUGINS	2008-07-28 01:50:28 +0000
@@ -0,0 +1,16 @@
+# The following plugins are not part of the bzr.dev branch but get
+# included in the release tarball. If installing bzr from bzr.dev
+# you should install them as well - they are part of our recommended
+# 'batteries included' install.
+# Name       Source branch
+bzrtools     lp:bzrtools
+email        lp:bzr-email 
+bisect       lp:bzr-bisect 
+search       lp:bzr-search 
+upload       lp:bzr-upload 
+diffstat     lp:bzr-diffstat 
+rebase       lp:bzr-rebase 
+stats        lp:bzr-stats 
+vimdiff      lp:bzr-vimdiff 
+webdav       lp:bzr.webdav 
+interactive  lp:bzr-interactive 

=== modified file 'Makefile'
--- a/Makefile	2008-07-17 22:28:50 +0000
+++ b/Makefile	2008-07-28 01:50:28 +0000
@@ -214,6 +214,9 @@
 # this method of copying the pyrex generated files is a bit ugly; it would be
 # nicer to generate it from distutils.
 #
+# The BUNDLED.PLUGINS contents are read from the tar itself to ensure there is
+# no skew between what is included and what is claimed to be included.
+#
 # these are a bit ubuntu-specific.
 dist: 
 	version=`./bzr version --short` && \
@@ -224,6 +227,7 @@
 	$(MAKE) clean && \
 	$(MAKE) && \
 	bzr export $$expdir && \
+        (sed -e 's/^\#.*$$//' < $$expdir/BUNDLED.PLUGINS | xargs -n2 bash -c "echo \$$1; bzr export $$expdir/bzrlib/plugins/\$$0 \$$1") && \
 	cp bzrlib/*.c $$expdir/bzrlib/. && \
 	tar cfz $$tarball -C $$expbasedir bzr-$$version && \
 	gpg --detach-sign $$tarball && \

=== modified file 'NEWS'
--- a/NEWS	2008-07-25 06:26:45 +0000
+++ b/NEWS	2008-07-28 01:50:28 +0000
@@ -13,7 +13,9 @@
     * Knit format repositories are deprecated and bzr will now emit
       warnings whenever it encounters one.  Use ``bzr upgrade`` to upgrade
       knit repositories to pack format.  (Andrew Bennetts)
-      
+
+    * ``make dist`` now includes a number of plugins - those listed in
+      BUNDLED.PLUGINS. (Robert Collins)
 
   FEATURES: