← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to Makefile

Update to bzr.dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
Makefile
83
83
        doc/en/user-reference/bzr_man.txt \
84
84
        doc/en/developer-guide/HACKING.txt \
85
85
        doc/en/release-notes/NEWS.txt
86
 
doc_dir := doc/en/tutorials
87
 
txt_files := $(wildcard $(addsuffix /*.txt, $(doc_dir))) $(derived_txt_files) \
 
86
txt_files := $(wildcard doc/en/tutorials/*.txt) \
 
87
        $(derived_txt_files) \
88
88
        doc/en/user-guide/index.txt \
89
89
        doc/en/mini-tutorial/index.txt \
90
 
        doc/index.txt
 
90
        $(wildcard doc/es/guia-usario/*.txt) \
 
91
        doc/es/mini-tutorial/index.txt \
 
92
        doc/index.txt \
 
93
        doc/index.es.txt
91
94
non_txt_files := \
92
95
       doc/default.css \
93
96
       doc/en/quick-reference/quick-start-summary.svg \
94
97
       doc/en/quick-reference/quick-start-summary.png \
95
98
       doc/en/quick-reference/quick-start-summary.pdf \
96
 
       $(wildcard doc/en/user-guide/images/*.png)
 
99
       $(wildcard doc/en/user-guide/images/*.png) \
 
100
       doc/es/referencia-rapida/referencia-rapida.svg \
 
101
       doc/es/referencia-rapida/referencia-rapida.png \
 
102
       doc/es/referencia-rapida/referencia-rapida.pdf \
 
103
       $(wildcard doc/es/guia-usuario/images/*.png)
97
104
htm_files := $(patsubst %.txt, %.html, $(txt_files)) 
98
105
dev_txt_files := $(wildcard $(addsuffix /*.txt, doc/developers))
99
106
dev_htm_files := $(patsubst %.txt, %.html, $(dev_txt_files)) 
210
217
dist: 
211
218
        version=`./bzr version --short` && \
212
219
        echo Building distribution of bzr $$version && \
213
 
        expbasedir=`mktemp -d` && \
 
220
        expbasedir=`mktemp -t -d tmp_bzr_dist.XXXXXXXXXX` && \
214
221
        expdir=$$expbasedir/bzr-$$version && \
215
222
        tarball=$$PWD/../bzr-$$version.tar.gz && \
216
223
        $(MAKE) clean && \
219
226
        cp bzrlib/*.c $$expdir/bzrlib/. && \
220
227
        tar cfz $$tarball -C $$expbasedir bzr-$$version && \
221
228
        gpg --detach-sign $$tarball && \
222
 
        echo $$tarball done.
 
229
        echo $$tarball done. && \
 
230
        rm -rf $$expbasedir
223
231
 
224
232
# run all tests in a previously built tarball
225
233
check-dist-tarball:
226
 
        tmpdir=`mktemp -d` && \
 
234
        tmpdir=`mktemp -t -d tmp_bzr_check_dist.XXXXXXXXXX` && \
227
235
        version=`./bzr version --short` && \
228
236
        tarball=$$PWD/../bzr-$$version.tar.gz && \
229
237
        tar Cxz $$tmpdir -f $$tarball && \
230
 
        $(MAKE) -C $$tmpdir/bzr-$$version check 
 
238
        $(MAKE) -C $$tmpdir/bzr-$$version check && \
 
239
        rm -rf $$tmpdir
231
240
 
232
241
 
233
242
# upload previously built tarball to the download directory on bazaar-vcs.org,