← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to Makefile

  • Committer: Aaron Bentley
  • Date: 2011-07-06 21:37:16 UTC
  • mto: (6011.2.1 trunk)
  • mto: This revision was merged to the branch mainline in revision 6012.
  • Revision ID: aaron@aaronbentley.com-20110706213716-y287nsvoyqr77oo5
Fix shelve to always ignore roots.

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
 
        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
 
45
        $(PYTHON) -Werror -Wignore::ImportWarning -O ./bzr selftest --subunit $(tests) | tee selftest.log
49
46
        # An empty log file should catch errors in the $(PYTHON)
50
47
        # command above (the '|' swallow any errors since 'make'
51
48
        # sees the 'tee' exit code for the whole line
432
429
                )
433
430
 
434
431
po/bzr.pot: $(PYFILES) $(DOCFILES)
435
 
        $(PYTHON) ./bzr export-pot --include-duplicates > po/bzr.pot
 
432
        $(PYTHON) ./bzr export-pot > po/bzr.pot
436
433
        echo $(TRANSLATABLE_PYFILES) | xargs \
437
434
          xgettext --package-name "bzr" \
438
435
          --msgid-bugs-address "<bazaar@canonical.com>" \