squash: few tweaks

teemtee · Feb 2, 2024 · 7ac3643 · 7ac3643
1 parent 06218e9
commit 7ac3643
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 13 deletions.
diff --git a/docs/Makefile b/docs/Makefile
@@ -53,6 +53,8 @@ TMTDIR        = $(REPODIR)/tmt
 SCRIPTSDIR    = scripts
 TEMPLATESDIR  = templates
 
+PLUGINS_TEMPLATE := $(TEMPLATESDIR)/plugins.rst.j2
+
 generate: spec stories generate-lint-checks generate-plugins generate-stories generate-autodocs  ## Refresh all generated documentation sources
 
 spec:
@@ -64,23 +66,23 @@ stories:
 spec/lint.rst: $(SCRIPTSDIR)/generate-lint-checks.py $(TEMPLATESDIR)/lint-checks.rst.j2 $(TMTDIR)/base.py
 	$(SCRIPTSDIR)/generate-lint-checks.py $(TEMPLATESDIR)/lint-checks.rst.j2 $@
 
-plugins/discover.rst: $(SCRIPTSDIR)/generate-plugins.py plugins.rst.j2 $(TMTDIR)/steps/discover/*.py
-	$(SCRIPTSDIR)/generate-plugins.py discover plugins.rst.j2 $@
+plugins/discover.rst: $(SCRIPTSDIR)/generate-plugins.py $(PLUGINS_TEMPLATE) $(TMTDIR)/steps/discover/*.py
+	$(SCRIPTSDIR)/generate-plugins.py discover $(PLUGINS_TEMPLATE) $@
 
-plugins/execute.rst: $(SCRIPTSDIR)/generate-plugins.py plugins.rst.j2 $(TMTDIR)/steps/execute/*.py
-	$(SCRIPTSDIR)/generate-plugins.py execute plugins.rst.j2 $@
+plugins/execute.rst: $(SCRIPTSDIR)/generate-plugins.py $(PLUGINS_TEMPLATE) $(TMTDIR)/steps/execute/*.py
+	$(SCRIPTSDIR)/generate-plugins.py execute $(PLUGINS_TEMPLATE) $@
 
-plugins/finish.rst: $(SCRIPTSDIR)/generate-plugins.py plugins.rst.j2 $(TMTDIR)/steps/finish/*.py
-	$(SCRIPTSDIR)/generate-plugins.py finish plugins.rst.j2 $@
+plugins/finish.rst: $(SCRIPTSDIR)/generate-plugins.py $(PLUGINS_TEMPLATE) $(TMTDIR)/steps/finish/*.py
+	$(SCRIPTSDIR)/generate-plugins.py finish $(PLUGINS_TEMPLATE) $@
 
-plugins/prepare.rst: $(SCRIPTSDIR)/generate-plugins.py plugins.rst.j2 $(TMTDIR)/steps/prepare/*.py
-	$(SCRIPTSDIR)/generate-plugins.py prepare plugins.rst.j2 $@
+plugins/prepare.rst: $(SCRIPTSDIR)/generate-plugins.py $(PLUGINS_TEMPLATE) $(TMTDIR)/steps/prepare/*.py
+	$(SCRIPTSDIR)/generate-plugins.py prepare $(PLUGINS_TEMPLATE) $@
 
-plugins/provision.rst: $(SCRIPTSDIR)/generate-plugins.py plugins.rst.j2 $(TMTDIR)/steps/provision/*.py
-	$(SCRIPTSDIR)/generate-plugins.py provision plugins.rst.j2 $@
+plugins/provision.rst: $(SCRIPTSDIR)/generate-plugins.py $(PLUGINS_TEMPLATE) $(TMTDIR)/steps/provision/*.py
+	$(SCRIPTSDIR)/generate-plugins.py provision $(PLUGINS_TEMPLATE) $@
 
-plugins/report.rst: $(SCRIPTSDIR)/generate-plugins.py plugins.rst.j2 $(TMTDIR)/steps/report/*.py
-	$(SCRIPTSDIR)/generate-plugins.py report plugins.rst.j2 $@
+plugins/report.rst: $(SCRIPTSDIR)/generate-plugins.py $(PLUGINS_TEMPLATE) $(TMTDIR)/steps/report/*.py
+	$(SCRIPTSDIR)/generate-plugins.py report $(PLUGINS_TEMPLATE) $@
 
 plugins/test-checks.rst: $(SCRIPTSDIR)/generate-test-checks.py $(TEMPLATESDIR)/test-checks.rst.j2 $(TMTDIR)/checks/*.py
 	$(SCRIPTSDIR)/generate-test-checks.py $(TEMPLATESDIR)/test-checks.rst.j2 $@
@@ -90,7 +92,7 @@ generate-lint-checks: spec spec/lint.rst  ## Generate documentation sources for
 generate-stories: stories $(TEMPLATESDIR)/story.rst.j2  ## Generate documentation sources for stories
 	$(SCRIPTSDIR)/generate-stories.py $(TEMPLATESDIR)/story.rst.j2
 
-generate-plugins: plugins/discover.rst plugins/execute.rst plugins/finish.rst plugins/prepare.rst plugins/provision.rst plugins/report.rst plugins/test-checks.rst  ## Generate documentation sources for plugins
+generate-plugins: plugins/*.rst  ## Generate documentation sources for plugins
 
 generate-autodocs:  ## Generate autodocs from source docstrings
 	cd ../ && sphinx-apidoc --force --implicit-namespaces --no-toc -o docs/code/autodocs tmt

diff --git a/docs/plugins.rst.j2 → docs/templates/plugins.rst.j2 b/docs/plugins.rst.j2 → docs/templates/plugins.rst.j2