From 70edcf9cf3c3798306803b93fb00270d677af99a Mon Sep 17 00:00:00 2001 From: Scott Rifenbark Date: Wed, 26 Dec 2018 16:07:14 -0800 Subject: mega-manual: Updates to support BitBake User Manual Fixes [YOCTO #12399] Fixes made to have the BitBake User Manual included in the build of the mega-manual. I placed this manual at the end of the mega-manual. Following changes made: * Makefile - Modified to include two PNG files. All PNG files in a given manual are listed in the area that makes the mega-manual so that the tarfile is complete. * mega-manual.xml - Updated the front wording to tell the user that the BitBake User Manual is included in the Mega-Manual. Also, added a last section to actually include the bitbake-title.png file and the *.xml files. Note that I could not add the title figure from the same figures folder of the local "bitbake" folder. Would not include in the build. So, I pulled the file from the figures folder of the mega-manual, which is what I do for all the other book titles used in the mega-manual. * mega-manual.sed - Modified to clean out the old stuff that had been carried along for older books not supported for the release. Modified to include link processing for the newly included BitBake User Manual. * New Figures - Moved copies of the "bb_multiconfig_files.png" and "bitbake-title.png" figures into the figures folder of the mega-manual. (From yocto-docs rev: 78a1ae0ca92bb7f8a9d3a32a320299371d0ed361) Signed-off-by: Scott Rifenbark Signed-off-by: Richard Purdie --- documentation/tools/mega-manual.sed | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) (limited to 'documentation/tools') diff --git a/documentation/tools/mega-manual.sed b/documentation/tools/mega-manual.sed index 373d3b9b40..79bbeef575 100644 --- a/documentation/tools/mega-manual.sed +++ b/documentation/tools/mega-manual.sed @@ -1,16 +1,12 @@ -# Processes poky-ref-manual and yocto-project-qs manual (-- style). -# This style is for manual folders like "yocto-project-qs" and "poky-ref-manual". -# This is the old way that did it. Can't do that now that we have "bitbake-user-manual" strings -# in the mega-manual. +# Processes bitbake-user-manual (-- style). +# This style is for manual three-word folders, which currently is only the BitBake User Manual. +# We used to have the "yocto-project-qs" and "poky-ref-manual" folders but no longer do. # s@"ulink" href="http://www.yoctoproject.org/docs/2.7/[a-z]*-[a-z]*-[a-z]*/[a-z]*-[a-z]*-[a-z]*.html#@"link" href="#@g -s@"ulink" href="http://www.yoctoproject.org/docs/2.7/yocto-project-qs/yocto-project-qs.html#@"link" href="#@g -s@"ulink" href="http://www.yoctoproject.org/docs/2.7/poky-ref-manual/poky-ref-manual.html#@"link" href="#@g +s@"ulink" href="http://www.yoctoproject.org/docs/2.7/bitbake-user-manual/bitbake-user-manual.html#@"link" href="#@g -# Processes all other manuals (- style) except for the BitBake User Manual because -# it is not included in the mega-manual. +# Processes all other manuals (- style). # This style is for manual folders that use two word, which is the standard now (e.g. "ref-manual"). -# This was the one-liner that worked before we introduced the BitBake User Manual, which is -# not in the mega-manual. +# Here is the one-liner: # s@"ulink" href="http://www.yoctoproject.org/docs/2.7/[a-z]*-[a-z]*/[a-z]*-[a-z]*.html#@"link" href="#@g s@"ulink" href="http://www.yoctoproject.org/docs/2.7/sdk-manual/sdk-manual.html#@"link" href="#@g @@ -25,7 +21,7 @@ s@"ulink" href="http://www.yoctoproject.org/docs/2.7/toaster-manual/toaster-manu # Process cases where just an external manual is referenced without an id anchor s@Yocto Project Quick Build@Yocto Project Quick Build@g -s@Yocto Project Quick Start@Yocto Project Quick Start@g +s@BitBake User Manual@BitBake User Manual@g s@Yocto Project Development Tasks Manual@Yocto Project Development Tasks Manual@g s@Yocto Project Overview and Concepts Manual@Yocto project Overview and Concepts Manual@g s@Yocto Project Application Development and the Extensible Software Development Kit (eSDK)@Yocto Project Application Development and the Extensible Software Development Kit (eSDK)@g -- cgit v1.2.3-54-g00ecf