riscv
/
yosys
mirror of https://github.com/YosysHQ/yosys.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Makefile: Combine gen_images and gen_examples 

gen_images and gen_examples are never called on their own, CI scripts call make -C docs directly. Since calling them both in parallel seems to cause issues, let's not do that, and instead combine them into a singular `make docs/gen`.  This should resolve the parallelism problems by making them sequential while still retaining the -j support.
This commit is contained in:
Krystine Sherwin 2024-10-17 07:12:34 +13:00
parent 5d14c3017e
commit e5da0e341e
No known key found for this signature in database
2 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Makefile
View File

@ -996,12 +996,9 @@ docs/source/cell/word_add.rst: $(TARGETS) $(EXTRA_TARGETS)
docs/source/generated/cells.json: docs/source/generated $(TARGETS) $(EXTRA_TARGETS) docs/source/generated/cells.json: docs/source/generated $(TARGETS) $(EXTRA_TARGETS)
$(Q) ./$(PROGRAM_PREFIX)yosys -p 'help -dump-cells-json $@' $(Q) ./$(PROGRAM_PREFIX)yosys -p 'help -dump-cells-json $@'
PHONY: docs/gen_examples docs/gen_images docs/guidelines docs/usage docs/reqs PHONY: docs/gen docs/guidelines docs/usage docs/reqs
docs/gen_examples: $(TARGETS) docs/gen: $(TARGETS)
$(Q) $(MAKE) -C docs examples $(Q) $(MAKE) -C docs gen
docs/gen_images: $(TARGETS)
$(Q) $(MAKE) -C docs images
DOCS_GUIDELINE_FILES := GettingStarted CodingStyle DOCS_GUIDELINE_FILES := GettingStarted CodingStyle
DOCS_GUIDELINE_SOURCE := $(addprefix guidelines/,$(DOCS_GUIDELINE_FILES)) DOCS_GUIDELINE_SOURCE := $(addprefix guidelines/,$(DOCS_GUIDELINE_FILES))
@ -1037,7 +1034,7 @@ docs/reqs:
$(Q) $(MAKE) -C docs reqs $(Q) $(MAKE) -C docs reqs
.PHONY: docs/prep .PHONY: docs/prep
docs/prep: docs/source/cmd/abc.rst docs/source/generated/cells.json docs/gen_examples docs/gen_images docs/guidelines docs/usage docs/prep: docs/source/cmd/abc.rst docs/source/generated/cells.json docs/gen docs/guidelines docs/usage
DOC_TARGET ?= html DOC_TARGET ?= html
docs: docs/prep docs: docs/prep

5
docs/Makefile
View File

@ -252,6 +252,11 @@ images:
$(MAKE) -C source/_images $(MAKE) -C source/_images
$(MAKE) -C source/_images convert $(MAKE) -C source/_images convert
.PHONY: gen
gen:
$(MAKE) examples
$(MAKE) images
.PHONY: reqs .PHONY: reqs
reqs: reqs:
$(PYTHON) -m pip install -r source/requirements.txt $(PYTHON) -m pip install -r source/requirements.txt