Rev 4694: (mbp) stop building source zip files in file:///home/pqm/archives/thelove/bzr/%2Btrunk/

[Canonical.com Patch Queue Manager]

At file:///home/pqm/archives/thelove/bzr/%2Btrunk/

------------------------------------------------------------
revno: 4694 [merge]
revision-id: pqm at pqm.ubuntu.com-20090916085926-banjevqh63n93xqb
parent: pqm at pqm.ubuntu.com-20090916082340-tr0a0rqnswrlx7c1
parent: mbp at sourcefrog.net-20090910052534-p248t13xtgbqe5jo
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2009-09-16 09:59:26 +0100
message:
  (mbp) stop building source zip files
modified:
  Makefile                       Makefile-20050805140406-d96e3498bb61c5bb
  doc/developers/releasing.txt   releasing.txt-20080502015919-fnrcav8fwy8ccibu-1
=== modified file 'Makefile'
--- a/Makefile	2009-09-11 07:55:48 +0000
+++ b/Makefile	2009-09-16 08:59:26 +0000
@@ -396,7 +396,7 @@
 
 .PHONY: dist dist-upload-escudero check-dist-tarball
 
-# build a distribution tarball and zip file.
+# build a distribution source tarball
 #
 # this method of copying the pyrex generated files is a bit ugly; it would be
 # nicer to generate it from distutils.
@@ -406,15 +406,12 @@
 	expbasedir=`mktemp -t -d tmp_bzr_dist.XXXXXXXXXX` && \
 	expdir=$$expbasedir/bzr-$$version && \
 	tarball=$$PWD/../bzr-$$version.tar.gz && \
-	zipball=$$PWD/../bzr-$$version.zip && \
 	$(MAKE) clean && \
 	$(MAKE) && \
 	bzr export $$expdir && \
 	cp bzrlib/*.c $$expdir/bzrlib/. && \
 	tar cfz $$tarball -C $$expbasedir bzr-$$version && \
-	(cd $$expbasedir && zip -r $$zipball bzr-$$version) && \
 	gpg --detach-sign $$tarball && \
-	gpg --detach-sign $$zipball && \
 	rm -rf $$expbasedir
 
 # run all tests in a previously built tarball
@@ -432,15 +429,10 @@
 dist-upload-escudero:
 	version=`./bzr version --short` && \
 	tarball=../bzr-$$version.tar.gz && \
-	zipball=../bzr-$$version.zip && \
-	scp $$zipball $$zipball.sig $$tarball $$tarball.sig \
+	scp $$tarball $$tarball.sig \
 	    escudero.ubuntu.com:/srv/bazaar.canonical.com/www/releases/src \
 		&& \
 	echo verifying over http... && \
-	curl http://bazaar-vcs.org/releases/src/bzr-$$version.zip \
-		| diff -s - $$zipball && \
-	curl http://bazaar-vcs.org/releases/src/bzr-$$version.zip.sig \
-		| diff -s - $$zipball.sig 
 	curl http://bazaar-vcs.org/releases/src/bzr-$$version.tar.gz \
 		| diff -s - $$tarball && \
 	curl http://bazaar-vcs.org/releases/src/bzr-$$version.tar.gz.sig \

=== modified file 'doc/developers/releasing.txt'
--- a/doc/developers/releasing.txt	2009-09-16 08:23:40 +0000
+++ b/doc/developers/releasing.txt	2009-09-16 08:59:26 +0000
@@ -173,9 +173,6 @@
   
      make dist
 
-   This also makes a zip file, which is easier to access on Microsoft
-   Windows.
-
 #. Now we'll try expanding this tarball and running the test suite
    to check for packaging problems::
  
@@ -193,7 +190,7 @@
 
 #. Go to the relevant milestone page in Launchpad.
 
-#. Within that release, upload the source tarball and zipfile and the GPG
+#. Within that release, upload the source tarball and the GPG
    signature.  Or, if you prefer, use the
    ``tools/packaging/lp-upload-release`` script to do this.