From 9b1a3e7321df253a6e1c54b5c5ed4ae937501b0a Mon Sep 17 00:00:00 2001 From: Lennart Johansson Date: Mon, 13 Jun 2016 11:52:51 +0200 Subject: Doc Makefile autofetch buglist from Jira at init Makefile: Add autofetch buglist from Jira via initissues. add cleanissues, add initissues to init. Add autocreated XML as section in known_bugs chapter. gen_known_issues.py: Correct DOCTYPE, remove empty lines in created XML file, move the Jira search parameters into hidden remark. Adjust known_bugs chapter to correct xmlmind format Delete the known_bugs doc issue with special characters that are not used any more (checkmarks and crosses). Signed-off-by: Lennart Johansson --- doc/Makefile | 28 +++++++++++++++++++++------- 1 file changed, 21 insertions(+), 7 deletions(-) (limited to 'doc/Makefile') diff --git a/doc/Makefile b/doc/Makefile index f3cc297..aa26339 100644 --- a/doc/Makefile +++ b/doc/Makefile @@ -22,10 +22,11 @@ CURRENTHASH := $(shell git log -1 --pretty=format:%H 2>/dev/null) CURRENTURL := $(shell git remote show origin | sed -n '/Fetch URL: /s/^.*URL: //p' 2>/dev/null) # ******************* AutoGenerated chapter from template and target READMEs ******* -BUILDBOOT_XML := book-enea-linux-release-info/doc/build_boot_generated.xml -BUILDBOOT_TEMPLATE := book-enea-linux-release-info/doc/build_boot_template.xml +BUILDBOOT_XML := book-enea-linux-release-info/doc/build_boot_generated.xml +BUILDBOOT_TEMPLATE := book-enea-linux-release-info/doc/build_boot_template.xml -PKGDIFF_GEN_XML := book-enea-linux-release-info/doc/pkgdiff_generated.xml +PKGDIFF_GEN_XML := book-enea-linux-release-info/doc/pkgdiff_generated.xml +JIRA_ISSUES_GEN_XML := book-enea-linux-release-info/doc/jiraissues_generated.xml # ----------------------------------------------------- @@ -130,7 +131,7 @@ ifeq ($(DOCBOOK_TOOLS_VERSIONS),yes) endif # We rely on make doing these in order left to right -init: initbuild inittargets initpardoc initbuildboot initpkgdiff +init: initbuild inittargets initpardoc initbuildboot initpkgdiff initissues pullall: pullbuild pulltargets # If no COMP, iterate over books-* in COMPONENTS with make doc @@ -189,7 +190,7 @@ endif endif # cleaninit cleans ALL tmpcommon and all s_* and generated build_boot chapter xml -clean: cleaninit cleanbuildboot cleanpkgdiff +clean: cleaninit cleanbuildboot cleanpkgdiff cleanissues $(VERB)rm -rf doc tmp 2>/dev/null ifneq ($(filter book-%, $(COMPONENTS)),) $(VERB)for comp in $(filter book-%, $(COMPONENTS)); do \ @@ -282,7 +283,7 @@ $(BUILDBOOT_XML): s_targets $(BUILDBOOT_TEMPLATE) fi # **************************************************************************** -# ***** Create XML section with package diff +# ***** Create Package DIFF XML section initpkgdiff: $(PKGDIFF_GEN_XML) @@ -291,7 +292,20 @@ cleanpkgdiff: $(PKGDIFF_GEN_XML): $(VERB)PREVIOUS_BL=`egrep '"prev_baseline"' docsrc_common/pardoc-distro.xml | sed 's/^.*//;s/<\/phrase>.*$$//'` ; \ - echo "Generating $(PKGDIFF_GEN_XML) compared to $$PREVIOUS_BL" ; \ + echo "Generating $(PKGDIFF_GEN_XML) compared to $$PREVIOUS_BL, using gen_pkgdiff.py" ; \ python gen_pkgdiff.py >$(PKGDIFF_GEN_XML) + +# **************************************************************************** +# ***** Create Jira Issues XML section for the known bugs chapter + +initissues: $(JIRA_ISSUES_GEN_XML) + +cleanissues: + $(VERB)rm -f $(JIRA_ISSUES_GEN_XML) 2>/dev/null + +$(JIRA_ISSUES_GEN_XML): + @echo "Generating $(JIRA_ISSUES_GEN_XML), fetching from Jira using gen_known_issues.py" + $(VERB)python gen_known_issues.py >$(JIRA_ISSUES_GEN_XML) + # **************************************************************************** -- cgit v1.2.3-54-g00ecf