diff options
-rw-r--r-- | doc/Makefile | 18 | ||||
-rw-r--r-- | doc/book-enea-linux-release-info/doc/main_changes.xml | 4 |
2 files changed, 18 insertions, 4 deletions
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: // | |||
25 | BUILDBOOT_XML := book-enea-linux-release-info/doc/build_boot_generated.xml | 25 | BUILDBOOT_XML := book-enea-linux-release-info/doc/build_boot_generated.xml |
26 | BUILDBOOT_TEMPLATE := book-enea-linux-release-info/doc/build_boot_template.xml | 26 | BUILDBOOT_TEMPLATE := book-enea-linux-release-info/doc/build_boot_template.xml |
27 | 27 | ||
28 | PKGDIFF_GEN_XML := book-enea-linux-release-info/doc/pkgdiff_generated.xml | ||
28 | 29 | ||
29 | 30 | ||
30 | # ----------------------------------------------------- | 31 | # ----------------------------------------------------- |
@@ -129,7 +130,7 @@ ifeq ($(DOCBOOK_TOOLS_VERSIONS),yes) | |||
129 | endif | 130 | endif |
130 | 131 | ||
131 | # We rely on make doing these in order left to right | 132 | # We rely on make doing these in order left to right |
132 | init: initbuild inittargets initpardoc initbuildboot | 133 | init: initbuild inittargets initpardoc initbuildboot initpkgdiff |
133 | pullall: pullbuild pulltargets | 134 | pullall: pullbuild pulltargets |
134 | 135 | ||
135 | # If no COMP, iterate over books-* in COMPONENTS with make doc | 136 | # If no COMP, iterate over books-* in COMPONENTS with make doc |
@@ -188,7 +189,7 @@ endif | |||
188 | endif | 189 | endif |
189 | 190 | ||
190 | # cleaninit cleans ALL tmpcommon and all s_* and generated build_boot chapter xml | 191 | # cleaninit cleans ALL tmpcommon and all s_* and generated build_boot chapter xml |
191 | clean: cleaninit cleanbuildboot | 192 | clean: cleaninit cleanbuildboot cleanpkgdiff |
192 | $(VERB)rm -rf doc tmp 2>/dev/null | 193 | $(VERB)rm -rf doc tmp 2>/dev/null |
193 | ifneq ($(filter book-%, $(COMPONENTS)),) | 194 | ifneq ($(filter book-%, $(COMPONENTS)),) |
194 | $(VERB)for comp in $(filter book-%, $(COMPONENTS)); do \ | 195 | $(VERB)for comp in $(filter book-%, $(COMPONENTS)); do \ |
@@ -281,3 +282,16 @@ $(BUILDBOOT_XML): s_targets $(BUILDBOOT_TEMPLATE) | |||
281 | fi | 282 | fi |
282 | 283 | ||
283 | # **************************************************************************** | 284 | # **************************************************************************** |
285 | # ***** Create XML section with package diff | ||
286 | |||
287 | initpkgdiff: $(PKGDIFF_GEN_XML) | ||
288 | |||
289 | cleanpkgdiff: | ||
290 | $(VERB)rm -f $(PKGDIFF_GEN_XML) 2>/dev/null | ||
291 | |||
292 | $(PKGDIFF_GEN_XML): | ||
293 | $(VERB)PREVIOUS_BL=`egrep '"prev_baseline"' docsrc_common/pardoc-distro.xml | sed 's/^.*<phrase>//;s/<\/phrase>.*$$//'` ; \ | ||
294 | echo "Generating $(PKGDIFF_GEN_XML) compared to $$PREVIOUS_BL" ; \ | ||
295 | python gen_pkgdiff.py >$(PKGDIFF_GEN_XML) | ||
296 | |||
297 | # **************************************************************************** | ||
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 @@ | |||
48 | <para>TBD <remark>FIXME or set condition hidden</remark></para> | 48 | <para>TBD <remark>FIXME or set condition hidden</remark></para> |
49 | </section> | 49 | </section> |
50 | 50 | ||
51 | <!-- <xi:include href="pkgdiff_generated.xml" | 51 | <xi:include href="pkgdiff_generated.xml" |
52 | xmlns:xi="http://www.w3.org/2001/XInclude" /> --> | 52 | xmlns:xi="http://www.w3.org/2001/XInclude" /> |
53 | </chapter> \ No newline at end of file | 53 | </chapter> \ No newline at end of file |