← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to Makefile

  • Committer: Jelmer Vernooij
  • Date: 2012-02-18 16:55:04 UTC
  • mfrom: (6437.23.10 2.5)
  • mto: This revision was merged to the branch mainline in revision 6469.
  • Revision ID: jelmer@samba.org-20120218165504-c9oe5c5ue805y8wp
Merge bzr/2.5.

Show diffs side-by-side

added added

removed removed

Lines of Context:
Makefile
43
43
        # Generate a stream for PQM to watch.
44
44
        -$(RM) -f selftest.log
45
45
        echo `date` ": selftest starts" 1>&2
46
 
        $(PYTHON) -Werror -Wignore::ImportWarning -O ./bzr selftest --subunit $(tests) | tee selftest.log
 
46
        $(PYTHON) -Werror -Wignore::ImportWarning -O ./bzr selftest -Oselftest.timeout=120 \
 
47
          --subunit $(tests) | tee selftest.log
47
48
        echo `date` ": selftest ends" 1>&2
48
49
        # An empty log file should catch errors in the $(PYTHON)
49
50
        # command above (the '|' swallow any errors since 'make'
431
432
                )
432
433
 
433
434
po/bzr.pot: $(PYFILES) $(DOCFILES)
434
 
        $(PYTHON) ./bzr export-pot > po/bzr.pot
 
435
        $(PYTHON) ./bzr export-pot --include-duplicates > po/bzr.pot
435
436
        echo $(TRANSLATABLE_PYFILES) | xargs \
436
437
          xgettext --package-name "bzr" \
437
438
          --msgid-bugs-address "<bazaar@canonical.com>" \