From 08c4038bf12e574289999cd12a30ec75995939f3 Mon Sep 17 00:00:00 2001 From: Lennart Johansson Date: Fri, 10 Jun 2016 19:47:22 +0200 Subject: Doc Makefile Add support for pkgdiff Makefile will autocreate pkgdiff in release-info main changes via gen_pkgdiff.py and information in pardoc-distro and a previous licenses.xml file Signed-off-by: Lennart Johansson --- doc/Makefile | 18 ++++++++++++++++-- doc/book-enea-linux-release-info/doc/main_changes.xml | 4 ++-- 2 files changed, 18 insertions(+), 4 deletions(-) (limited to 'doc') diff --git a/doc/Makefile b/doc/Makefile index 19c8a1f..f3cc297 100644 --- a/doc/Makefile +++ b/doc/Makefile @@ -25,6 +25,7 @@ CURRENTURL := $(shell git remote show origin | sed -n '/Fetch URL: /s/^.*URL: // 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 # ----------------------------------------------------- @@ -129,7 +130,7 @@ ifeq ($(DOCBOOK_TOOLS_VERSIONS),yes) endif # We rely on make doing these in order left to right -init: initbuild inittargets initpardoc initbuildboot +init: initbuild inittargets initpardoc initbuildboot initpkgdiff pullall: pullbuild pulltargets # If no COMP, iterate over books-* in COMPONENTS with make doc @@ -188,7 +189,7 @@ endif endif # cleaninit cleans ALL tmpcommon and all s_* and generated build_boot chapter xml -clean: cleaninit cleanbuildboot +clean: cleaninit cleanbuildboot cleanpkgdiff $(VERB)rm -rf doc tmp 2>/dev/null ifneq ($(filter book-%, $(COMPONENTS)),) $(VERB)for comp in $(filter book-%, $(COMPONENTS)); do \ @@ -281,3 +282,16 @@ $(BUILDBOOT_XML): s_targets $(BUILDBOOT_TEMPLATE) fi # **************************************************************************** +# ***** Create XML section with package diff + +initpkgdiff: $(PKGDIFF_GEN_XML) + +cleanpkgdiff: + $(VERB)rm -f $(PKGDIFF_GEN_XML) 2>/dev/null + +$(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" ; \ + python gen_pkgdiff.py >$(PKGDIFF_GEN_XML) + +# **************************************************************************** diff --git a/doc/book-enea-linux-release-info/doc/main_changes.xml b/doc/book-enea-linux-release-info/doc/main_changes.xml index 4739669..e1a20dd 100644 --- a/doc/book-enea-linux-release-info/doc/main_changes.xml +++ b/doc/book-enea-linux-release-info/doc/main_changes.xml @@ -48,6 +48,6 @@ TBD FIXME or set condition hidden - + \ No newline at end of file -- cgit v1.2.3-54-g00ecf