Breezy

Merge lp:~jelmer/brz/reproducible into lp:brz

  1. reproducible
  2. Merge into trunk
Proposed by Jelmer Vernooij
Status: Merged
Approved by: Jelmer Vernooij
Approved revision: no longer in the source branch.
Merge reported by: The Breezy Bot
Merged at revision: not available
Proposed branch: lp:~jelmer/brz/reproducible
Merge into: lp:brz
Diff against target: 129 lines (+34/-30)
1 file modified
Makefile (+34/-30)
To merge this branch: bzr merge lp:~jelmer/brz/reproducible
Reviewer Review Type Date Requested Status
Martin Packman Approve
Review via email: mp+324824@code.launchpad.net

Commit message

Sort files in Makefile to make doc output consistent.

Description of the change

Sort files in Makefile to make doc output consistent.

This is necessary to make the build reproducible.

To post a comment you must log in.
Revision history for this message
Martin Packman (gz) :
review: Approve
Revision history for this message
The Breezy Bot (the-breezy-bot) wrote :

A commit message must be set
http://10.242.247.184:8080/job/brz-dev/28/

Revision history for this message
The Breezy Bot (the-breezy-bot) wrote :

A commit message must be set
http://10.242.247.184:8080/job/brz-dev/31/

Revision history for this message
The Breezy Bot (the-breezy-bot) wrote :

Running landing tests failed
http://10.242.247.184:8080/job/brz-dev/33/

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'Makefile'
--- Makefile 2017-05-24 14:51:33 +0000
+++ Makefile 2017-05-30 23:40:33 +0000
@@ -28,6 +28,10 @@
28PLUGIN_TARGET=plugin-release28PLUGIN_TARGET=plugin-release
29PYTHON_BUILDFLAGS=29PYTHON_BUILDFLAGS=
3030
31# Shorter replacement for $(sort $(wildcard <arg>)) as $(call sw,<arg>)
32sw = $(sort $(wildcard $(1)))
33
34
31.PHONY: all clean realclean extensions pyflakes api-docs check-nodocs check35.PHONY: all clean realclean extensions pyflakes api-docs check-nodocs check
3236
33all: extensions37all: extensions
@@ -106,10 +110,10 @@
106### Man-page Documentation ###110### Man-page Documentation ###
107111
108MAN_DEPENDENCIES = breezy/builtins.py \112MAN_DEPENDENCIES = breezy/builtins.py \
109 $(wildcard breezy/*.py) \113 $(call sw,breezy/*.py) \
110 $(wildcard breezy/*/*.py) \114 $(call sw,breezy/*/*.py) \
111 tools/generate_docs.py \115 tools/generate_docs.py \
112 $(wildcard $(addsuffix /*.txt, breezy/help_topics/en)) 116 $(call sw,$(addsuffix /*.txt, breezy/help_topics/en))
113117
114MAN_PAGES = man1/brz.1118MAN_PAGES = man1/brz.1
115man1/brz.1: $(MAN_DEPENDENCIES)119man1/brz.1: $(MAN_DEPENDENCIES)
@@ -145,7 +149,7 @@
145 doc/developers/Makefile \149 doc/developers/Makefile \
146 doc/developers/make.bat150 doc/developers/make.bat
147151
148NEWS_FILES = $(wildcard doc/en/release-notes/brz-*.txt)152NEWS_FILES = $(call sw,doc/en/release-notes/brz-*.txt)
149153
150doc/en/user-reference/index.txt: $(MAN_DEPENDENCIES)154doc/en/user-reference/index.txt: $(MAN_DEPENDENCIES)
151 LANGUAGE=C $(PYTHON) tools/generate_docs.py -o $@ rstx155 LANGUAGE=C $(PYTHON) tools/generate_docs.py -o $@ rstx
@@ -229,19 +233,19 @@
229 doc/en/tutorials/tutorial.txt \233 doc/en/tutorials/tutorial.txt \
230 doc/en/tutorials/using_breezy_with_launchpad.txt \234 doc/en/tutorials/using_breezy_with_launchpad.txt \
231 doc/en/tutorials/centralized_workflow.txt \235 doc/en/tutorials/centralized_workflow.txt \
232 $(wildcard doc/es/tutorials/*.txt) \236 $(call sw,doc/es/tutorials/*.txt) \
233 $(wildcard doc/ru/tutorials/*.txt) \237 $(call sw,doc/ru/tutorials/*.txt) \
234 doc/ja/tutorials/tutorial.txt \238 doc/ja/tutorials/tutorial.txt \
235 doc/ja/tutorials/using_bazaar_with_launchpad.txt \239 doc/ja/tutorials/using_bazaar_with_launchpad.txt \
236 doc/ja/tutorials/centralized_workflow.txt \240 doc/ja/tutorials/centralized_workflow.txt \
237 $(wildcard doc/*/mini-tutorial/index.txt) \241 $(call sw,doc/*/mini-tutorial/index.txt) \
238 $(wildcard doc/*/user-guide/index-plain.txt) \242 $(call sw,doc/*/user-guide/index-plain.txt) \
239 doc/en/admin-guide/index-plain.txt \243 doc/en/admin-guide/index-plain.txt \
240 $(wildcard doc/es/guia-usario/*.txt) \244 $(call sw,doc/es/guia-usario/*.txt) \
241 $(derived_txt_files) \245 $(derived_txt_files) \
242 doc/en/upgrade-guide/index.txt \246 doc/en/upgrade-guide/index.txt \
243 doc/index.txt \247 doc/index.txt \
244 $(wildcard doc/index.*.txt)248 $(call sw,doc/index.*.txt)
245txt_nohtml = \249txt_nohtml = \
246 doc/en/user-guide/index.txt \250 doc/en/user-guide/index.txt \
247 doc/es/user-guide/index.txt \251 doc/es/user-guide/index.txt \
@@ -253,16 +257,16 @@
253257
254non_txt_files = \258non_txt_files = \
255 doc/default.css \259 doc/default.css \
256 $(wildcard doc/*/brz-en-quick-reference.svg) \260 $(call sw,doc/*/brz-en-quick-reference.svg) \
257 $(wildcard doc/*/brz-en-quick-reference.png) \261 $(call sw,doc/*/brz-en-quick-reference.png) \
258 $(wildcard doc/*/brz-en-quick-reference.pdf) \262 $(call sw,doc/*/brz-en-quick-reference.pdf) \
259 $(wildcard doc/*/bzr-es-quick-reference.svg) \263 $(call sw,doc/*/bzr-es-quick-reference.svg) \
260 $(wildcard doc/*/bzr-es-quick-reference.png) \264 $(call sw,doc/*/bzr-es-quick-reference.png) \
261 $(wildcard doc/*/bzr-es-quick-reference.pdf) \265 $(call sw,doc/*/bzr-es-quick-reference.pdf) \
262 $(wildcard doc/*/bzr-ru-quick-reference.svg) \266 $(call sw,doc/*/bzr-ru-quick-reference.svg) \
263 $(wildcard doc/*/bzr-ru-quick-reference.png) \267 $(call sw,doc/*/bzr-ru-quick-reference.png) \
264 $(wildcard doc/*/bzr-ru-quick-reference.pdf) \268 $(call sw,doc/*/bzr-ru-quick-reference.pdf) \
265 $(wildcard doc/*/user-guide/images/*.png)269 $(call sw,doc/*/user-guide/images/*.png)
266270
267# doc/developers/*.txt files that should *not* be individually271# doc/developers/*.txt files that should *not* be individually
268# converted to HTML272# converted to HTML
@@ -292,20 +296,20 @@
292 doc/developers/status.txt \296 doc/developers/status.txt \
293 doc/developers/uncommit.txt297 doc/developers/uncommit.txt
294298
295dev_txt_all = $(wildcard $(addsuffix /*.txt, doc/developers))299dev_txt_all = $(call sw,$(addsuffix /*.txt, doc/developers))
296dev_txt_files = $(filter-out $(dev_txt_nohtml), $(dev_txt_all))300dev_txt_files = $(filter-out $(dev_txt_nohtml), $(dev_txt_all))
297dev_htm_files = $(patsubst %.txt, %.html, $(dev_txt_files)) 301dev_htm_files = $(patsubst %.txt, %.html, $(dev_txt_files))
298302
299doc/en/user-guide/index-plain.html: $(wildcard $(addsuffix /*.txt, doc/en/user-guide)) 303doc/en/user-guide/index-plain.html: $(call sw,$(addsuffix /*.txt, doc/en/user-guide))
300 $(rst2html) --stylesheet=../../default.css $(dir $@)index-plain.txt $@304 $(rst2html) --stylesheet=../../default.css $(dir $@)index-plain.txt $@
301305
302#doc/es/user-guide/index.html: $(wildcard $(addsuffix /*.txt, doc/es/user-guide)) 306#doc/es/user-guide/index.html: $(call sw,$(addsuffix /*.txt, doc/es/user-guide))
303# $(rst2html) --stylesheet=../../default.css $(dir $@)index.txt $@307# $(rst2html) --stylesheet=../../default.css $(dir $@)index.txt $@
304#308#
305#doc/ru/user-guide/index.html: $(wildcard $(addsuffix /*.txt, doc/ru/user-guide)) 309#doc/ru/user-guide/index.html: $(call sw,$(addsuffix /*.txt, doc/ru/user-guide))
306# $(rst2html) --stylesheet=../../default.css $(dir $@)index.txt $@310# $(rst2html) --stylesheet=../../default.css $(dir $@)index.txt $@
307#311#
308doc/en/admin-guide/index-plain.html: $(wildcard $(addsuffix /*.txt, doc/en/admin-guide)) 312doc/en/admin-guide/index-plain.html: $(call sw,$(addsuffix /*.txt, doc/en/admin-guide))
309 $(rst2html) --stylesheet=../../default.css $(dir $@)index-plain.txt $@313 $(rst2html) --stylesheet=../../default.css $(dir $@)index-plain.txt $@
310314
311doc/developers/%.html: doc/developers/%.txt315doc/developers/%.html: doc/developers/%.txt
@@ -323,7 +327,7 @@
323doc/en/release-notes/NEWS.txt: $(NEWS_FILES) tools/generate_release_notes.py327doc/en/release-notes/NEWS.txt: $(NEWS_FILES) tools/generate_release_notes.py
324 $(PYTHON) tools/generate_release_notes.py "$@" $(NEWS_FILES)328 $(PYTHON) tools/generate_release_notes.py "$@" $(NEWS_FILES)
325329
326upgrade_guide_dependencies = $(wildcard $(addsuffix /*.txt, doc/en/upgrade-guide)) 330upgrade_guide_dependencies = $(call sw,$(addsuffix /*.txt, doc/en/upgrade-guide))
327331
328doc/en/upgrade-guide/index.html: $(upgrade_guide_dependencies)332doc/en/upgrade-guide/index.html: $(upgrade_guide_dependencies)
329 $(rst2html) --stylesheet=../../default.css $(dir $@)index.txt $@333 $(rst2html) --stylesheet=../../default.css $(dir $@)index.txt $@

Subscribers

People subscribed via source and target branches