[eclipse-yocto] [PATCH] generate-doc.sh: remove non-existent yocto-project-qs doc target

Chin Huat Ang chin.huat.ang at intel.com
Tue Apr 10 20:26:00 PDT 2018


yocto-project-qs documentation is being replaced by brief-yoctoprojectqs
(see yocto-docs commit aadec4a70fa89e4dcd233c337d8971c8353ee26d) for sumo
release. This broke eclipse documentation plugin build for sumo, so we'll
remove yocto-project-qs from eclipse build.

[YOCTO #12669]

Signed-off-by: Chin Huat Ang <chin.huat.ang at intel.com>
---
 scripts/generate-doc.sh | 26 ++------------------------
 1 file changed, 2 insertions(+), 24 deletions(-)

diff --git a/scripts/generate-doc.sh b/scripts/generate-doc.sh
index 45ae818..5a4b057 100755
--- a/scripts/generate-doc.sh
+++ b/scripts/generate-doc.sh
@@ -22,15 +22,6 @@ fail ()
   exit ${retval}
 }
 
-safe_sed()
-{
-  if [ "$1" ] && [ "$2" ]; then
-     sed -e "$1" $2 > $2.tmp && mv $2.tmp $2 || fail $? "safe_sed $1 $2"
-  else
-     fail 1 "usage: safe_sed \"s/from/to/\" /path/to/file"
-  fi
-}
-
 CHECKOUT_TAG=0
 while getopts ":h" opt; do
 	case $opt in
@@ -62,21 +53,8 @@ cd ${DOC_DIR}
 git checkout $1 || fail $? "git checkout $1"
 COMMIT_ID=`git rev-parse HEAD`
 
-# check yocto-docs branch/tag and build sdk-manual or adt-manual accordingly
-# [YOCTO #9622]
-if [ "$1" = "master" ] || [ "$1" = "krogoth" ] || [ "$1" = "yocto-2.1" ]; then
-  DOCS="yocto-project-qs sdk-manual kernel-dev \
-        bsp-guide ref-manual dev-manual profile-manual"
-else
-  DOCS="yocto-project-qs adt-manual kernel-dev \
-        bsp-guide ref-manual dev-manual profile-manual"
-  safe_sed "s/sdk-manual/adt-manual/" ${DOC_PLUGIN_DIR}/plugin.xml
-  safe_sed "s/sdk-manual/adt-manual/" ${DOC_PLUGIN_DIR}/about.html.in
-  safe_sed "s/Software Development Kit (SDK)/Application/" ${DOC_PLUGIN_DIR}/about.html.in
-  safe_sed "s/(SDK)/(ADT)/" ${DOC_PLUGIN_DIR}/about.html.in
-  safe_sed "s/sdk-manual/adt-manual/" ${DOC_PLUGIN_DIR}/toc.xml
-  safe_sed "s/Software Development Kit (SDK)/Application/" ${DOC_PLUGIN_DIR}/toc.xml
-fi
+DOCS="sdk-manual kernel-dev \
+      bsp-guide ref-manual dev-manual profile-manual"
 
 # build and copy
 cd documentation
-- 
2.7.4



More information about the eclipse-yocto mailing list