/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to Makefile

  • Committer: Vincent Ladeuil
  • Date: 2009-12-15 20:32:34 UTC
  • mto: (4905.1.1 integration)
  • mto: This revision was merged to the branch mainline in revision 4906.
  • Revision ID: v.ladeuil+lp@free.fr-20091215203234-d8br6xqfq6pec40z
Move the _warn_if_deprecated call from repo.__init__ to
repo.lock_{read,write} so that branch.lock_{read,write} can call it. This
makes it possible to access locations.conf and branch.conf.

* bzrlib/tests/blackbox/test_exceptions.py:
(TestDeprecationWarning): Test that the suppress_warning
configuration variable is taken into account.

* bzrlib/repository.py:
(Repository.__init__): Delete very old and obsolete
comments. Don't warn about deprecations yet.
(Repository.lock_write, Repository.lock_read): The repo is about
to be locked, check deprecation.
(Repository._warn_if_deprecated): Use the branch config if
available or the global one othewrwise and check for the
suppress_warning variable.

* bzrlib/remote.py:
(RemoteRepository._warn_if_deprecated): Nothing to do here. 

* bzrlib/repofmt/pack_repo.py:
(KnitPackRepository._warn_if_deprecated): Delegate to base class
if needed.

* bzrlib/branch.py:
(BzrBranch.lock_write, BzrBranch.lock_read): Check repo
deprecation.

* bzrlib/help_topics/en/configuration.txt:
Fix the variable name and its description.

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
#
202
199
 
203
200
# translate txt docs to html
204
201
derived_txt_files = \
 
202
        doc/en/user-reference/bzr_man.txt \
205
203
        doc/en/release-notes/NEWS.txt
206
204
txt_all = \
207
205
        doc/en/tutorials/tutorial.txt \
214
212
        doc/ja/tutorials/centralized_workflow.txt \
215
213
        $(wildcard doc/*/mini-tutorial/index.txt) \
216
214
        $(wildcard doc/*/user-guide/index-plain.txt) \
217
 
        doc/en/admin-guide/index-plain.txt \
218
215
        $(wildcard doc/es/guia-usario/*.txt) \
219
216
        $(derived_txt_files) \
220
217
        doc/en/upgrade-guide/index.txt \
224
221
        doc/en/user-guide/index.txt \
225
222
        doc/es/user-guide/index.txt \
226
223
        doc/ja/user-guide/index.txt \
227
 
        doc/ru/user-guide/index.txt \
228
 
        doc/en/admin-guide/index.txt
 
224
        doc/ru/user-guide/index.txt
229
225
txt_files = $(filter-out $(txt_nohtml), $(txt_all))
230
226
htm_files = $(patsubst %.txt, %.html, $(txt_files)) 
231
227
 
283
279
#doc/ru/user-guide/index.html: $(wildcard $(addsuffix /*.txt, doc/ru/user-guide)) 
284
280
#       $(rst2html) --stylesheet=../../default.css $(dir $@)index.txt $@
285
281
#
286
 
doc/en/admin-guide/index-plain.html: $(wildcard $(addsuffix /*.txt, doc/en/admin-guide)) 
287
 
        $(rst2html) --stylesheet=../../default.css $(dir $@)index-plain.txt $@
288
 
 
289
282
doc/developers/%.html: doc/developers/%.txt
290
283
        $(rst2html) --stylesheet=../default.css $< $@
291
284
 
298
291
%.html: %.txt
299
292
        $(rst2html) --stylesheet=../../default.css $< $@
300
293
 
 
294
doc/en/user-reference/bzr_man.txt: $(MAN_DEPENDENCIES)
 
295
        $(PYTHON) tools/generate_docs.py -o $@ rstx
 
296
 
301
297
doc/en/release-notes/NEWS.txt: NEWS
302
298
        $(PYTHON) -c "import shutil; shutil.copyfile('$<', '$@')"
303
299
 
409
405
 
410
406
### Packaging Targets ###
411
407
 
412
 
.PHONY: dist check-dist-tarball
 
408
.PHONY: dist dist-upload-escudero check-dist-tarball
413
409
 
414
410
# build a distribution source tarball
415
411
#
437
433
        tar Cxz $$tmpdir -f $$tarball && \
438
434
        $(MAKE) -C $$tmpdir/bzr-$$version check && \
439
435
        rm -rf $$tmpdir
 
436
 
 
437
 
 
438
# upload previously built tarball to the download directory on bazaar-vcs.org,
 
439
# and verify that it can be downloaded ok.
 
440
dist-upload-escudero:
 
441
        version=`./bzr version --short` && \
 
442
        tarball=../bzr-$$version.tar.gz && \
 
443
        scp $$tarball $$tarball.sig \
 
444
            escudero.ubuntu.com:/srv/bazaar.canonical.com/www/releases/src \
 
445
                && \
 
446
        echo verifying over http... && \
 
447
        curl http://bazaar-vcs.org/releases/src/bzr-$$version.tar.gz \
 
448
                | diff -s - $$tarball && \
 
449
        curl http://bazaar-vcs.org/releases/src/bzr-$$version.tar.gz.sig \
 
450
                | diff -s - $$tarball.sig