← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to Makefile

merge 2.0 branch rev 4647

Show diffs side-by-side

added added

removed removed

Lines of Context:
Makefile
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
24
29
PYTHON_BUILDFLAGS=
25
30
 
26
31
.PHONY: all clean extensions pyflakes api-docs check-nodocs check
85
90
derived_txt_files := \
86
91
        doc/en/user-reference/bzr_man.txt \
87
92
        doc/en/release-notes/NEWS.txt
88
 
txt_files := $(wildcard doc/en/tutorials/*.txt) \
 
93
txt_files := \
 
94
        doc/en/tutorials/tutorial.txt \
 
95
        doc/en/tutorials/using_bazaar_with_launchpad.txt \
 
96
        doc/en/tutorials/centralized_workflow.txt \
 
97
        $(wildcard doc/ru/tutorials/*.txt) \
 
98
        $(wildcard doc/*/mini-tutorial/index.txt) \
 
99
        $(wildcard doc/*/user-guide/index.txt) \
89
100
        $(derived_txt_files) \
90
 
        doc/en/user-guide/index.txt \
91
 
        doc/en/mini-tutorial/index.txt \
92
101
        doc/en/developer-guide/HACKING.txt \
 
102
        doc/en/upgrade-guide/index.txt \
93
103
        $(wildcard doc/es/guia-usario/*.txt) \
94
104
        doc/es/mini-tutorial/index.txt \
95
105
        doc/index.txt \
96
 
        doc/index.es.txt \
97
 
        doc/index.ru.txt \
98
 
        doc/ru/user-guide/index.txt \
99
 
        doc/ru/mini-tutorial/index.txt \
100
 
        $(wildcard doc/ru/tutorials/*.txt)
 
106
        $(wildcard doc/index.*.txt)
101
107
non_txt_files := \
102
108
       doc/default.css \
103
 
       doc/en/quick-reference/quick-start-summary.svg \
104
 
       doc/en/quick-reference/quick-start-summary.png \
105
 
       doc/en/quick-reference/quick-start-summary.pdf \
106
 
       $(wildcard doc/en/user-guide/images/*.png) \
107
 
       doc/es/referencia-rapida/referencia-rapida.svg \
108
 
       doc/es/referencia-rapida/referencia-rapida.png \
109
 
       doc/es/referencia-rapida/referencia-rapida.pdf \
110
 
       $(wildcard doc/es/guia-usuario/images/*.png) \
111
 
       doc/ru/quick-reference/quick-start-summary.svg \
112
 
       doc/ru/quick-reference/quick-start-summary.png \
113
 
       doc/ru/quick-reference/quick-start-summary.pdf \
114
 
       $(wildcard doc/ru/user-guide/images/*.png)
 
109
       $(wildcard doc/*/quick-reference/bzr-quick-reference.svg) \
 
110
       $(wildcard doc/*/quick-reference/bzr-quick-reference.png) \
 
111
       $(wildcard doc/*/quick-reference/bzr-quick-reference.pdf) \
 
112
       $(wildcard doc/*/user-guide/images/*.png)
115
113
htm_files := $(patsubst %.txt, %.html, $(txt_files)) 
116
114
 
117
115
# doc/developers/*.txt files that should *not* be individually
177
175
        $(rst2html) --stylesheet=../../default.css $< $@
178
176
 
179
177
MAN_DEPENDENCIES = bzrlib/builtins.py \
180
 
                 bzrlib/bundle/commands.py \
181
 
                 bzrlib/conflicts.py \
182
 
                 bzrlib/help_topics/__init__.py \
183
 
                 bzrlib/bzrdir.py \
184
 
                 bzrlib/sign_my_commits.py \
185
 
                 bzrlib/bugtracker.py \
186
 
                 generate_docs.py \
187
 
                 tools/doc_generate/__init__.py \
188
 
                 tools/doc_generate/autodoc_man.py \
189
 
                 tools/doc_generate/autodoc_rstx.py \
190
 
                 $(wildcard $(addsuffix /*.txt, bzrlib/help_topics/en)) 
 
178
        $(wildcard bzrlib/*.py) \
 
179
        $(wildcard bzrlib/*/*.py) \
 
180
        tools/generate_docs.py \
 
181
        $(wildcard $(addsuffix /*.txt, bzrlib/help_topics/en)) 
191
182
 
192
183
doc/en/user-reference/bzr_man.txt: $(MAN_DEPENDENCIES)
193
 
        $(PYTHON) generate_docs.py -o $@ rstx
 
184
        $(PYTHON) tools/generate_docs.py -o $@ rstx
194
185
 
195
186
doc/en/release-notes/NEWS.txt: NEWS
196
187
        $(PYTHON) -c "import shutil; shutil.copyfile('$<', '$@')"
197
188
 
198
189
MAN_PAGES = man1/bzr.1
199
190
man1/bzr.1: $(MAN_DEPENDENCIES)
200
 
        $(PYTHON) generate_docs.py -o $@ man
 
191
        $(PYTHON) tools/generate_docs.py -o $@ man
 
192
 
 
193
upgrade_guide_dependencies =  $(wildcard $(addsuffix /*.txt, doc/en/upgrade-guide)) 
 
194
 
 
195
doc/en/upgrade-guide/index.html: $(upgrade_guide_dependencies)
 
196
        $(rst2html) --stylesheet=../../default.css $(dir $@)index.txt $@
201
197
 
202
198
# build a png of our performance task list
203
199
# 
231
227
 
232
228
### Windows Support ###
233
229
 
 
230
# make all the installers completely from scratch, using zc.buildout
 
231
# to fetch the dependencies
 
232
# These are files that need to be copied into the build location to boostrap
 
233
# the build process.
 
234
# Note that the path is relative to tools/win32
 
235
BUILDOUT_FILES := buildout.cfg \
 
236
        buildout-templates/bin/build-installer.bat.in \
 
237
        ostools.py bootstrap.py
 
238
 
 
239
installer-all:
 
240
        @echo Make all the installers from scratch
 
241
        @# Build everything in a separate directory, to avoid cluttering the WT
 
242
        $(PYTHON) tools/win32/ostools.py makedir build-win32
 
243
        @# cd to tools/win32 so that the relative paths are copied correctly
 
244
        cd tools/win32 && $(PYTHON) ostools.py copytree $(BUILDOUT_FILES) ../../build-win32
 
245
        @# There seems to be a bug in gf.release.bzr, It doesn't correctly update
 
246
        @# existing release directories, so delete them manually before building
 
247
        @# It means things may be rebuilt that don't need to be, but at least
 
248
        @# it will be correct when they do.
 
249
        cd build-win32 && $(PYTHON) ostools.py remove release */release
 
250
        cd build-win32 && $(PYTHON) bootstrap.py
 
251
        cd build-win32 && bin/buildout
 
252
        cd build-win32 && bin/build-installer.bat $(BZR_TARGET) $(PLUGIN_TARGET)
 
253
 
 
254
 
 
255
clean-installer-all:
 
256
        $(PYTHON) tools/win32/ostools.py remove build-win32
 
257
 
234
258
# make bzr.exe for win32 with py2exe
235
259
exe:
236
260
        @echo *** Make bzr.exe
242
266
 
243
267
# win32 installer for bzr.exe
244
268
installer: exe copy-docs
245
 
        @echo *** Make windows installer
 
269
        @echo *** Make Windows installer
246
270
        $(PYTHON) tools/win32/run_script.py cog.py -d -o tools/win32/bzr.iss tools/win32/bzr.iss.cog
247
271
        iscc /Q tools/win32/bzr.iss
248
272
 
249
273
# win32 Python's distutils-based installer
250
274
# require to have Python interpreter installed on win32
251
275
py-inst-24: docs
252
 
        python24 setup.py bdist_wininst --install-script="bzr-win32-bdist-postinstall.py" -d .
 
276
        $(PYTHON24) setup.py bdist_wininst --install-script="bzr-win32-bdist-postinstall.py" -d .
253
277
 
254
278
py-inst-25: docs
255
 
        python25 setup.py bdist_wininst --install-script="bzr-win32-bdist-postinstall.py" -d .
256
 
 
257
 
python-installer: py-inst-24 py-inst-25
 
279
        $(PYTHON25) setup.py bdist_wininst --install-script="bzr-win32-bdist-postinstall.py" -d .
 
280
 
 
281
py-inst-26: docs
 
282
        $(PYTHON26) setup.py bdist_wininst --install-script="bzr-win32-bdist-postinstall.py" -d .
 
283
 
 
284
python-installer: py-inst-24 py-inst-25 py-inst-26
258
285
 
259
286
 
260
287
copy-docs: docs