summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoshua Watt <jpewhacker@gmail.com>2018-02-22 03:53:05 +0000
committerDenys Dmytriyenko <denys@ti.com>2018-02-26 19:42:00 -0500
commitf16e3f342f562b71901079764e81dd120751945b (patch)
tree25628d8dd483e52beb9dcf67c0a90e117200e549
parentd5ff22082c6baa39fe0f486faefcd04c9db85458 (diff)
downloadmeta-ti-f16e3f342f562b71901079764e81dd120751945b.tar.gz
ti-pdk: Allow Doxygen generation to be optional
Users can choose to completely disable doxygen generation in pdk recipes by setting TI_PDK_DOXYGEN_SUPPORT = "0" in local.conf Signed-off-by: Joshua Watt <JPEWhacker@gmail.com> Signed-off-by: Denys Dmytriyenko <denys@ti.com>
-rw-r--r--classes/ti-pdk.bbclass7
-rw-r--r--recipes-ti/ti-pdk-build/ti-pdk-build-rtos/0001-comp_mk-Allow-doxygen-support-to-be-overridden.patch50
-rw-r--r--recipes-ti/ti-pdk-build/ti-pdk-build-rtos_git.bb5
3 files changed, 61 insertions, 1 deletions
diff --git a/classes/ti-pdk.bbclass b/classes/ti-pdk.bbclass
index ab730a90..540a665c 100644
--- a/classes/ti-pdk.bbclass
+++ b/classes/ti-pdk.bbclass
@@ -59,17 +59,24 @@ TI_PDK_LIMIT_SOCS ?= ""
59TI_PDK_LIMIT_BOARDS ?= "" 59TI_PDK_LIMIT_BOARDS ?= ""
60TI_PDK_MAKE_TARGET ?= "release" 60TI_PDK_MAKE_TARGET ?= "release"
61TI_PDK_EXTRA_MAKE ?= "" 61TI_PDK_EXTRA_MAKE ?= ""
62TI_PDK_DOXYGEN_SUPPORT ?= "1"
62 63
63TI_PDK_XDC_ARGS ?= "${TI_PDK_LIMIT_SOCS}" 64TI_PDK_XDC_ARGS ?= "${TI_PDK_LIMIT_SOCS}"
64 65
65PARALLEL_XDC = "--jobs=${BB_NUMBER_THREADS}" 66PARALLEL_XDC = "--jobs=${BB_NUMBER_THREADS}"
66PARALLEL_MAKE = "" 67PARALLEL_MAKE = ""
67 68
69def get_doxygen_support(d):
70 if d.getVar('TI_PDK_DOXYGEN_SUPPORT', True) == '1':
71 return ''
72 return 'DOXYGEN_SUPPORT=no'
73
68EXTRA_OEMAKE = " \ 74EXTRA_OEMAKE = " \
69 LIMIT_SOCS="${TI_PDK_LIMIT_SOCS}" \ 75 LIMIT_SOCS="${TI_PDK_LIMIT_SOCS}" \
70 LIMIT_BOARDS="${TI_PDK_LIMIT_BOARDS}" \ 76 LIMIT_BOARDS="${TI_PDK_LIMIT_BOARDS}" \
71 LIMIT_CORES="${TI_PDK_LIMIT_CORES}" \ 77 LIMIT_CORES="${TI_PDK_LIMIT_CORES}" \
72 ${TI_PDK_EXTRA_MAKE} \ 78 ${TI_PDK_EXTRA_MAKE} \
79 ${@get_doxygen_support(d)} \
73" 80"
74 81
75do_configure() { 82do_configure() {
diff --git a/recipes-ti/ti-pdk-build/ti-pdk-build-rtos/0001-comp_mk-Allow-doxygen-support-to-be-overridden.patch b/recipes-ti/ti-pdk-build/ti-pdk-build-rtos/0001-comp_mk-Allow-doxygen-support-to-be-overridden.patch
new file mode 100644
index 00000000..2a10d37e
--- /dev/null
+++ b/recipes-ti/ti-pdk-build/ti-pdk-build-rtos/0001-comp_mk-Allow-doxygen-support-to-be-overridden.patch
@@ -0,0 +1,50 @@
1From e5dfce58161aaee80ca45c3e992a059efac459d7 Mon Sep 17 00:00:00 2001
2From: Joshua Watt <JPEWhacker@gmail.com>
3Date: Wed, 21 Feb 2018 13:38:35 -0600
4Subject: [PATCH] comp_mk: Allow doxygen support to be overridden
5
6Support for Doxygen can be globally disabled by setting the
7DOXYGEN_SUPPORT environment variable to "no"
8
9Signed-off-by: Joshua Watt <JPEWhacker@gmail.com>
10---
11 comp_top.mk | 9 +++++++--
12 1 file changed, 7 insertions(+), 2 deletions(-)
13
14diff --git a/comp_top.mk b/comp_top.mk
15index 28700ba..e331132 100644
16--- a/comp_top.mk
17+++ b/comp_top.mk
18@@ -114,6 +114,11 @@ comp_FIRM_LIST_CLEAN = $(addsuffix _clean, $($(COMP)_FIRM_LIST))
19 comp_PKG_LIST_ALL_CLEAN = $(addsuffix _clean, $(comp_PKG_LIST_ALL))
20 comp_PKG_LIST_PACKAGE = $(addsuffix _package, $(comp_PKG_LIST_ALL))
21
22+# If the component enables doxygen, this will evaluate to "yesyes" and doxygen
23+# will be built. If this value is overridden by the user to any other value, or
24+# $(COMP)_DOXYGEN_SUPPORT is not "yes", doxygen is not built.
25+DOXYGEN_SUPPORT ?= yes$($(COMP)_DOXYGEN_SUPPORT)
26+
27 .PHONY : apps appcores app_clean clean_appcores \
28 lib libcores lib_allendians lib_clean clean_libcores clean_lib_allendians \
29 all comp_libs comp_libs_clean examples examples_clean clean package $(comp_PKG_LIST_ALL) \
30@@ -230,7 +235,7 @@ xdc_meta_clean:
31 $(XDC) clean XDCBUILDCFG=config_mk.bld
32
33 doxygen:
34-ifeq ($($(COMP)_DOXYGEN_SUPPORT),yes)
35+ifeq ($(DOXYGEN_SUPPORT),yesyes)
36 $(ECHO) Creating Doxygen API guide ...
37 @doxygen docs/Doxyfile
38 else
39@@ -238,7 +243,7 @@ else
40 endif
41
42 clean_doxygen:
43-ifeq ($($(COMP)_DOXYGEN_SUPPORT),yes)
44+ifeq ($(DOXYGEN_SUPPORT),yesyes)
45 $(ECHO) cleaned Doxygen API guide ...
46 $(RM) -rf docs/doxygen
47 else
48--
492.14.3
50
diff --git a/recipes-ti/ti-pdk-build/ti-pdk-build-rtos_git.bb b/recipes-ti/ti-pdk-build/ti-pdk-build-rtos_git.bb
index 0999b5c5..fbb82ace 100644
--- a/recipes-ti/ti-pdk-build/ti-pdk-build-rtos_git.bb
+++ b/recipes-ti/ti-pdk-build/ti-pdk-build-rtos_git.bb
@@ -15,7 +15,10 @@ PDK_BUILD_GIT_BRANCH = "master"
15PDK_BUILD_SRCREV = "cbac264f08aa9cdc2cd533d1433ef57b922cccb5" 15PDK_BUILD_SRCREV = "cbac264f08aa9cdc2cd533d1433ef57b922cccb5"
16 16
17BRANCH = "${PDK_BUILD_GIT_BRANCH}" 17BRANCH = "${PDK_BUILD_GIT_BRANCH}"
18SRC_URI = "${PDK_BUILD_GIT_URI};protocol=${PDK_BUILD_GIT_PROTOCOL};branch=${BRANCH}" 18SRC_URI = "\
19 ${PDK_BUILD_GIT_URI};protocol=${PDK_BUILD_GIT_PROTOCOL};branch=${BRANCH} \
20 file://0001-comp_mk-Allow-doxygen-support-to-be-overridden.patch \
21 "
19 22
20SRCREV = "${PDK_BUILD_SRCREV}" 23SRCREV = "${PDK_BUILD_SRCREV}"
21 24