← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to Makefile

  • Committer: Matt Nordhoff
  • Date: 2009-06-23 05:12:07 UTC
  • mto: This revision was merged to the branch mainline in revision 4474.
  • Revision ID: mnordhoff@mattnordhoff.com-20090623051207-fksdtbzkwtnrw9dd
Update _add_text docstrings that still referred to add_text.

Show diffs side-by-side

added added

removed removed

Lines of Context:
Makefile
1
 
# Copyright (C) 2005, 2006, 2007, 2008, 2009 Canonical Ltd
 
1
# Copyright (C) 2005, 2006, 2007, 2008 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
21
21
### Core Stuff ###
22
22
 
23
23
PYTHON=python
24
 
PYTHON24=python24
25
 
PYTHON25=python25
26
 
PYTHON26=python26
27
 
BZR_TARGET=release
28
 
PLUGIN_TARGET=plugin-release
29
24
PYTHON_BUILDFLAGS=
30
25
 
31
26
.PHONY: all clean extensions pyflakes api-docs check-nodocs check
40
35
 
41
36
check-nodocs: extensions
42
37
        $(PYTHON) -Werror -O ./bzr selftest -1v $(tests)
 
38
        @echo "Running all tests with no locale."
 
39
        LC_CTYPE= LANG=C LC_ALL= ./bzr selftest -1v $(tests) 2>&1 | sed -e 's/^/[ascii] /'
43
40
 
44
41
# Run Python style checker (apt-get install pyflakes)
45
42
#
88
85
derived_txt_files := \
89
86
        doc/en/user-reference/bzr_man.txt \
90
87
        doc/en/release-notes/NEWS.txt
91
 
txt_files := \
92
 
        doc/en/tutorials/tutorial.txt \
93
 
        doc/en/tutorials/using_bazaar_with_launchpad.txt \
94
 
        doc/en/tutorials/centralized_workflow.txt \
95
 
        $(wildcard doc/ru/tutorials/*.txt) \
96
 
        $(wildcard doc/*/mini-tutorial/index.txt) \
97
 
        $(wildcard doc/*/user-guide/index.txt) \
 
88
txt_files := $(wildcard doc/en/tutorials/*.txt) \
98
89
        $(derived_txt_files) \
 
90
        doc/en/user-guide/index.txt \
 
91
        doc/en/mini-tutorial/index.txt \
99
92
        doc/en/developer-guide/HACKING.txt \
100
 
        doc/en/upgrade-guide/index.txt \
101
93
        $(wildcard doc/es/guia-usario/*.txt) \
102
94
        doc/es/mini-tutorial/index.txt \
103
95
        doc/index.txt \
104
 
        $(wildcard doc/index.*.txt)
 
96
        doc/index.es.txt
105
97
non_txt_files := \
106
98
       doc/default.css \
107
 
       $(wildcard doc/*/quick-reference/bzr-quick-reference.svg) \
108
 
       $(wildcard doc/*/quick-reference/bzr-quick-reference.png) \
109
 
       $(wildcard doc/*/quick-reference/bzr-quick-reference.pdf) \
110
 
       $(wildcard doc/*/user-guide/images/*.png)
 
99
       doc/en/quick-reference/quick-start-summary.svg \
 
100
       doc/en/quick-reference/quick-start-summary.png \
 
101
       doc/en/quick-reference/quick-start-summary.pdf \
 
102
       $(wildcard doc/en/user-guide/images/*.png) \
 
103
       doc/es/referencia-rapida/referencia-rapida.svg \
 
104
       doc/es/referencia-rapida/referencia-rapida.png \
 
105
       doc/es/referencia-rapida/referencia-rapida.pdf \
 
106
       $(wildcard doc/es/guia-usuario/images/*.png)
111
107
htm_files := $(patsubst %.txt, %.html, $(txt_files)) 
112
108
 
113
109
# doc/developers/*.txt files that should *not* be individually
124
120
        doc/developers/initial-push-pull.txt \
125
121
        doc/developers/merge-scaling.txt \
126
122
        doc/developers/missing.txt \
 
123
        doc/developers/performance-contributing.txt \
127
124
        doc/developers/performance-roadmap-rationale.txt \
128
125
        doc/developers/performance-use-case-analysis.txt \
129
126
        doc/developers/planned-change-integration.txt \
136
133
dev_txt_files := $(filter-out $(dev_txt_nohtml), $(dev_txt_all))
137
134
dev_htm_files := $(patsubst %.txt, %.html, $(dev_txt_files)) 
138
135
 
139
 
doc/%/user-guide/index.html: $(wildcard $(addsuffix /*.txt, doc/%/user-guide)) 
140
 
        $(rst2html) --stylesheet=../../default.css $(dir $@)index.txt $@
 
136
doc/en/user-guide/index.html: $(wildcard $(addsuffix /*.txt, doc/en/user-guide)) 
 
137
        $(rst2html) --stylesheet=../../default.css doc/en/user-guide/index.txt $@
141
138
 
142
139
# Set the paper size for PDF files.
143
140
# Options:  'a4' (ISO A4 size), 'letter' (US Letter size)
144
141
PAPERSIZE = a4
145
 
# TODO: Add generation for Russian PDF
146
142
PDF_DOCS := doc/en/user-guide/user-guide.$(PAPERSIZE).pdf
147
143
 
148
144
# Copy and modify the RST sources, and convert SVG images to PDF
166
162
doc/index.html: doc/index.txt
167
163
        $(rst2html) --stylesheet=default.css $< $@
168
164
 
169
 
doc/index.%.html: doc/index.%.txt
170
 
        $(rst2html) --stylesheet=default.css $< $@
171
 
 
172
165
%.html: %.txt
173
166
        $(rst2html) --stylesheet=../../default.css $< $@
174
167
 
175
168
MAN_DEPENDENCIES = bzrlib/builtins.py \
176
 
        $(wildcard bzrlib/*.py) \
177
 
        $(wildcard bzrlib/*/*.py) \
178
 
        tools/generate_docs.py \
179
 
        $(wildcard $(addsuffix /*.txt, bzrlib/help_topics/en)) 
 
169
                 bzrlib/bundle/commands.py \
 
170
                 bzrlib/conflicts.py \
 
171
                 bzrlib/help_topics/__init__.py \
 
172
                 bzrlib/bzrdir.py \
 
173
                 bzrlib/sign_my_commits.py \
 
174
                 bzrlib/bugtracker.py \
 
175
                 generate_docs.py \
 
176
                 tools/doc_generate/__init__.py \
 
177
                 tools/doc_generate/autodoc_man.py \
 
178
                 tools/doc_generate/autodoc_rstx.py \
 
179
                 $(wildcard $(addsuffix /*.txt, bzrlib/help_topics/en)) 
180
180
 
181
181
doc/en/user-reference/bzr_man.txt: $(MAN_DEPENDENCIES)
182
 
        $(PYTHON) tools/generate_docs.py -o $@ rstx
 
182
        $(PYTHON) generate_docs.py -o $@ rstx
183
183
 
184
184
doc/en/release-notes/NEWS.txt: NEWS
185
185
        $(PYTHON) -c "import shutil; shutil.copyfile('$<', '$@')"
186
186
 
187
187
MAN_PAGES = man1/bzr.1
188
188
man1/bzr.1: $(MAN_DEPENDENCIES)
189
 
        $(PYTHON) tools/generate_docs.py -o $@ man
190
 
 
191
 
upgrade_guide_dependencies =  $(wildcard $(addsuffix /*.txt, doc/en/upgrade-guide)) 
192
 
 
193
 
doc/en/upgrade-guide/index.html: $(upgrade_guide_dependencies)
194
 
        $(rst2html) --stylesheet=../../default.css $(dir $@)index.txt $@
 
189
        $(PYTHON) generate_docs.py -o $@ man
195
190
 
196
191
# build a png of our performance task list
197
 
# 
198
 
# this is no longer built by default; you can build it if you want to look at it
199
192
doc/developers/performance.png: doc/developers/performance.dot
200
193
        @echo Generating $@
201
194
        @dot -Tpng $< -o$@ || echo "Dot not installed; skipping generation of $@"
202
195
 
203
 
derived_web_docs = $(htm_files) $(dev_htm_files) 
 
196
derived_web_docs = $(htm_files) $(dev_htm_files) doc/developers/performance.png
204
197
WEB_DOCS = $(derived_web_docs) $(non_txt_files)
205
198
ALL_DOCS = $(derived_web_docs) $(MAN_PAGES)
206
199
 
219
212
clean-docs:
220
213
        $(PYTHON) tools/win32/ostools.py remove $(ALL_DOCS) \
221
214
            $(HTMLDIR) $(derived_txt_files)
222
 
        rm -f doc/*/user-guide/*.pdf
223
 
        rm -rf doc/*/user-guide/latex_prepared
 
215
        rm -f doc/en/user-guide/*.pdf
 
216
        rm -rf doc/en/user-guide/latex_prepared
224
217
 
225
218
 
226
219
### Windows Support ###
227
220
 
228
 
# make all the installers completely from scratch, using zc.buildout
229
 
# to fetch the dependencies
230
 
# These are files that need to be copied into the build location to boostrap
231
 
# the build process.
232
 
# Note that the path is relative to tools/win32
233
 
BUILDOUT_FILES := buildout.cfg \
234
 
        buildout-templates/bin/build-installer.bat.in \
235
 
        ostools.py bootstrap.py
236
 
 
237
 
installer-all:
238
 
        @echo Make all the installers from scratch
239
 
        @# Build everything in a separate directory, to avoid cluttering the WT
240
 
        $(PYTHON) tools/win32/ostools.py makedir build-win32
241
 
        @# cd to tools/win32 so that the relative paths are copied correctly
242
 
        cd tools/win32 && $(PYTHON) ostools.py copytree $(BUILDOUT_FILES) ../../build-win32
243
 
        @# There seems to be a bug in gf.release.bzr, It doesn't correctly update
244
 
        @# existing release directories, so delete them manually before building
245
 
        @# It means things may be rebuilt that don't need to be, but at least
246
 
        @# it will be correct when they do.
247
 
        cd build-win32 && $(PYTHON) ostools.py remove release */release
248
 
        cd build-win32 && $(PYTHON) bootstrap.py
249
 
        cd build-win32 && bin/buildout
250
 
        cd build-win32 && bin/build-installer.bat $(BZR_TARGET) $(PLUGIN_TARGET)
251
 
 
252
 
 
253
 
clean-installer-all:
254
 
        $(PYTHON) tools/win32/ostools.py remove build-win32
255
 
 
256
221
# make bzr.exe for win32 with py2exe
257
222
exe:
258
223
        @echo *** Make bzr.exe
264
229
 
265
230
# win32 installer for bzr.exe
266
231
installer: exe copy-docs
267
 
        @echo *** Make Windows installer
 
232
        @echo *** Make windows installer
268
233
        $(PYTHON) tools/win32/run_script.py cog.py -d -o tools/win32/bzr.iss tools/win32/bzr.iss.cog
269
234
        iscc /Q tools/win32/bzr.iss
270
235
 
271
236
# win32 Python's distutils-based installer
272
237
# require to have Python interpreter installed on win32
273
238
py-inst-24: docs
274
 
        $(PYTHON24) setup.py bdist_wininst --install-script="bzr-win32-bdist-postinstall.py" -d .
 
239
        python24 setup.py bdist_wininst --install-script="bzr-win32-bdist-postinstall.py" -d .
275
240
 
276
241
py-inst-25: docs
277
 
        $(PYTHON25) setup.py bdist_wininst --install-script="bzr-win32-bdist-postinstall.py" -d .
278
 
 
279
 
py-inst-26: docs
280
 
        $(PYTHON26) setup.py bdist_wininst --install-script="bzr-win32-bdist-postinstall.py" -d .
281
 
 
282
 
python-installer: py-inst-24 py-inst-25 py-inst-26
 
242
        python25 setup.py bdist_wininst --install-script="bzr-win32-bdist-postinstall.py" -d .
 
243
 
 
244
python-installer: py-inst-24 py-inst-25
283
245
 
284
246
 
285
247
copy-docs: docs