← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to Makefile

  • Committer: Martin Packman
  • Date: 2012-01-05 09:50:04 UTC
  • mfrom: (6424 +trunk)
  • mto: This revision was merged to the branch mainline in revision 6426.
  • Revision ID: martin.packman@canonical.com-20120105095004-mia9xb7y0efmto0v
Merge bzr.dev to resolve conflicts in bzrlib.builtins

Show diffs side-by-side

added added

removed removed

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