← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to Makefile

  • Committer: John Arbash Meinel
  • Date: 2010-01-12 22:51:31 UTC
  • mto: This revision was merged to the branch mainline in revision 4955.
  • Revision ID: john@arbash-meinel.com-20100112225131-he8h411p6aeeb947
Delay grabbing an output stream until we actually go to show a diff.

This makes the test suite happy, but it also seems to be reasonable.
If we aren't going to write anything, we don't need to hold an
output stream open.

Show diffs side-by-side

added added

removed removed

Lines of Context:
Makefile
1
 
# Copyright (C) 2005-2010 Canonical Ltd
 
1
# Copyright (C) 2005, 2006, 2007, 2008, 2009 Canonical Ltd
2
2
#
3
3
# This program is free software; you can redistribute it and/or modify
4
4
# it under the terms of the GNU General Public License as published by
39
39
check: docs check-nodocs
40
40
 
41
41
check-nodocs: extensions
42
 
        # Generate a stream for PQM to watch.
43
 
        $(PYTHON) -Werror -O ./bzr selftest --subunit $(tests) | tee selftest.log
44
 
        # Check that there were no errors reported.
45
 
        subunit-stats < selftest.log
 
42
        $(PYTHON) -Werror -O ./bzr selftest -1v $(tests)
46
43
 
47
44
# Run Python style checker (apt-get install pyflakes)
48
45
#
409
406
 
410
407
### Packaging Targets ###
411
408
 
412
 
.PHONY: dist check-dist-tarball
 
409
.PHONY: dist dist-upload-escudero check-dist-tarball
413
410
 
414
411
# build a distribution source tarball
415
412
#
437
434
        tar Cxz $$tmpdir -f $$tarball && \
438
435
        $(MAKE) -C $$tmpdir/bzr-$$version check && \
439
436
        rm -rf $$tmpdir
 
437
 
 
438
 
 
439
# upload previously built tarball to the download directory on bazaar-vcs.org,
 
440
# and verify that it can be downloaded ok.
 
441
dist-upload-escudero:
 
442
        version=`./bzr version --short` && \
 
443
        tarball=../bzr-$$version.tar.gz && \
 
444
        scp $$tarball $$tarball.sig \
 
445
            escudero.ubuntu.com:/srv/bazaar.canonical.com/www/releases/src \
 
446
                && \
 
447
        echo verifying over http... && \
 
448
        curl http://bazaar-vcs.org/releases/src/bzr-$$version.tar.gz \
 
449
                | diff -s - $$tarball && \
 
450
        curl http://bazaar-vcs.org/releases/src/bzr-$$version.tar.gz.sig \
 
451
                | diff -s - $$tarball.sig