← 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: 2009-12-10 17:16:19 UTC
  • mfrom: (4884 +trunk)
  • mto: This revision was merged to the branch mainline in revision 4889.
  • Revision ID: john@arbash-meinel.com-20091210171619-ehdcxjbl8afhq9g1
Bring in bzr.dev 4884

Show diffs side-by-side

added added

removed removed

Lines of Context:
Makefile
40
40
 
41
41
check-nodocs: extensions
42
42
        $(PYTHON) -Werror -O ./bzr selftest -1v $(tests)
43
 
        @echo "Running all tests with no locale."
44
 
        LC_CTYPE= LANG=C LC_ALL= ./bzr selftest -1v $(tests) 2>&1 | sed -e 's/^/[ascii] /'
45
43
 
46
44
# Run Python style checker (apt-get install pyflakes)
47
45
#
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) \
 
215
        doc/en/admin-guide/index-plain.txt \
217
216
        $(wildcard doc/es/guia-usario/*.txt) \
218
217
        $(derived_txt_files) \
219
218
        doc/en/upgrade-guide/index.txt \
223
222
        doc/en/user-guide/index.txt \
224
223
        doc/es/user-guide/index.txt \
225
224
        doc/ja/user-guide/index.txt \
226
 
        doc/ru/user-guide/index.txt
 
225
        doc/ru/user-guide/index.txt \
 
226
        doc/en/admin-guide/index.txt
227
227
txt_files = $(filter-out $(txt_nohtml), $(txt_all))
228
228
htm_files = $(patsubst %.txt, %.html, $(txt_files)) 
229
229
 
281
281
#doc/ru/user-guide/index.html: $(wildcard $(addsuffix /*.txt, doc/ru/user-guide)) 
282
282
#       $(rst2html) --stylesheet=../../default.css $(dir $@)index.txt $@
283
283
#
 
284
doc/en/admin-guide/index-plain.html: $(wildcard $(addsuffix /*.txt, doc/en/admin-guide)) 
 
285
        $(rst2html) --stylesheet=../../default.css $(dir $@)index-plain.txt $@
 
286
 
284
287
doc/developers/%.html: doc/developers/%.txt
285
288
        $(rst2html) --stylesheet=../default.css $< $@
286
289
 
409
412
 
410
413
.PHONY: dist dist-upload-escudero check-dist-tarball
411
414
 
412
 
# build a distribution tarball and zip file.
 
415
# build a distribution source tarball
413
416
#
414
417
# this method of copying the pyrex generated files is a bit ugly; it would be
415
418
# nicer to generate it from distutils.
419
422
        expbasedir=`mktemp -t -d tmp_bzr_dist.XXXXXXXXXX` && \
420
423
        expdir=$$expbasedir/bzr-$$version && \
421
424
        tarball=$$PWD/../bzr-$$version.tar.gz && \
422
 
        zipball=$$PWD/../bzr-$$version.zip && \
423
425
        $(MAKE) clean && \
424
426
        $(MAKE) && \
425
427
        bzr export $$expdir && \
426
 
        cp bzrlib/*.c $$expdir/bzrlib/. && \
 
428
        cp bzrlib/*.c bzrlib/*.h $$expdir/bzrlib/. && \
427
429
        tar cfz $$tarball -C $$expbasedir bzr-$$version && \
428
 
        (cd $$expbasedir && zip -r $$zipball bzr-$$version) && \
429
430
        gpg --detach-sign $$tarball && \
430
 
        gpg --detach-sign $$zipball && \
431
431
        rm -rf $$expbasedir
432
432
 
433
433
# run all tests in a previously built tarball
445
445
dist-upload-escudero:
446
446
        version=`./bzr version --short` && \
447
447
        tarball=../bzr-$$version.tar.gz && \
448
 
        zipball=../bzr-$$version.zip && \
449
 
        scp $$zipball $$zipball.sig $$tarball $$tarball.sig \
 
448
        scp $$tarball $$tarball.sig \
450
449
            escudero.ubuntu.com:/srv/bazaar.canonical.com/www/releases/src \
451
450
                && \
452
451
        echo verifying over http... && \
453
 
        curl http://bazaar-vcs.org/releases/src/bzr-$$version.zip \
454
 
                | diff -s - $$zipball && \
455
 
        curl http://bazaar-vcs.org/releases/src/bzr-$$version.zip.sig \
456
 
                | diff -s - $$zipball.sig 
457
452
        curl http://bazaar-vcs.org/releases/src/bzr-$$version.tar.gz \
458
453
                | diff -s - $$tarball && \
459
454
        curl http://bazaar-vcs.org/releases/src/bzr-$$version.tar.gz.sig \