summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--meta-oe/recipes-devtools/doxygen/doxygen/0001-build-don-t-look-for-Iconv.patch9
-rw-r--r--meta-oe/recipes-devtools/doxygen/doxygen/doxygen-native-only-check-python3.patch116
-rw-r--r--meta-oe/recipes-devtools/doxygen/doxygen_1.9.1.bb (renamed from meta-oe/recipes-devtools/doxygen/doxygen_1.8.20.bb)3
3 files changed, 61 insertions, 67 deletions
diff --git a/meta-oe/recipes-devtools/doxygen/doxygen/0001-build-don-t-look-for-Iconv.patch b/meta-oe/recipes-devtools/doxygen/doxygen/0001-build-don-t-look-for-Iconv.patch
index c86dc1691e..6906efd1c0 100644
--- a/meta-oe/recipes-devtools/doxygen/doxygen/0001-build-don-t-look-for-Iconv.patch
+++ b/meta-oe/recipes-devtools/doxygen/doxygen/0001-build-don-t-look-for-Iconv.patch
@@ -8,6 +8,7 @@ native build but all modern systems supply it as part of the standard
8C library. We don't need this check in meta-openembedded. 8C library. We don't need this check in meta-openembedded.
9 9
10Signed-off-by: Bartosz Golaszewski <brgl@bgdev.pl> 10Signed-off-by: Bartosz Golaszewski <brgl@bgdev.pl>
11Signed-off-by: Randy MacLeod <Randy.MacLeod@windriver.com>
11 12
12Upstream-status: Inappropriate 13Upstream-status: Inappropriate
13- upstream doxygen must build on many architectures, this change is 14- upstream doxygen must build on many architectures, this change is
@@ -17,10 +18,10 @@ Upstream-status: Inappropriate
17 1 file changed, 4 deletions(-) 18 1 file changed, 4 deletions(-)
18 19
19diff --git a/CMakeLists.txt b/CMakeLists.txt 20diff --git a/CMakeLists.txt b/CMakeLists.txt
20index 45c2f2c1..22cf0144 100644 21index 06b9696f..f30b46b8 100644
21--- a/CMakeLists.txt 22--- a/CMakeLists.txt
22+++ b/CMakeLists.txt 23+++ b/CMakeLists.txt
23@@ -92,10 +92,6 @@ if (sqlite3) 24@@ -117,10 +117,6 @@ if (sqlite3)
24 endif() 25 endif()
25 endif() 26 endif()
26 27
@@ -28,9 +29,9 @@ index 45c2f2c1..22cf0144 100644
28-include_directories(${ICONV_INCLUDE_DIR}) 29-include_directories(${ICONV_INCLUDE_DIR})
29- 30-
30- 31-
31 #set(DOXYDOCS ${CMAKE_SOURCE_DIR}/doc CACHE INTERNAL "Path to doxygen docs") 32 #set(DOXYDOCS ${PROJECT_SOURCE_DIR}/doc CACHE INTERNAL "Path to doxygen docs")
32 set(DOXYDOCS ${PROJECT_BINARY_DIR}/doc) 33 set(DOXYDOCS ${PROJECT_BINARY_DIR}/doc)
33 set(ENV{DOXYGEN_DOCDIR} ${DOXYDOCS}) 34 set(ENV{DOXYGEN_DOCDIR} ${DOXYDOCS})
34-- 35--
352.17.1 362.27.0
36 37
diff --git a/meta-oe/recipes-devtools/doxygen/doxygen/doxygen-native-only-check-python3.patch b/meta-oe/recipes-devtools/doxygen/doxygen/doxygen-native-only-check-python3.patch
index 53f88885f4..9d1a5a93d0 100644
--- a/meta-oe/recipes-devtools/doxygen/doxygen/doxygen-native-only-check-python3.patch
+++ b/meta-oe/recipes-devtools/doxygen/doxygen/doxygen-native-only-check-python3.patch
@@ -1,4 +1,4 @@
1From aa833cf56c5cc2e87a1d91881eb2286beb34e417 Mon Sep 17 00:00:00 2001 1From 7aeee92c752f8a4b2524ed6a41d60c1a3ca8bf2d Mon Sep 17 00:00:00 2001
2From: Leon Anavi <leon.anavi@konsulko.com> 2From: Leon Anavi <leon.anavi@konsulko.com>
3Date: Wed, 26 Aug 2020 10:52:10 +0300 3Date: Wed, 26 Aug 2020 10:52:10 +0300
4Subject: [PATCH] doxygen: Fix Python issues for doxygen-native 4Subject: [PATCH] doxygen: Fix Python issues for doxygen-native
@@ -32,25 +32,28 @@ result variable PYTHON_EXECUTABLE with Python3_EXECUTABLE.
32 32
33This patch is only needded by doxygen-native. 33This patch is only needded by doxygen-native.
34 34
35Updated to apply to release 1.9.1.
36
35Upstream-Status: Inappropriate[oe specific] 37Upstream-Status: Inappropriate[oe specific]
36 38
37Co-Authored-By: Kai Kang <kai.kang@windriver.com> 39Co-Authored-By: Kai Kang <kai.kang@windriver.com>
38Signed-off-by: Leon Anavi <leon.anavi@konsulko.com> 40Signed-off-by: Leon Anavi <leon.anavi@konsulko.com>
41Signed-off-by: Randy MacLeod <Randy.MacLeod@windriver.com>
39--- 42---
40 CMakeLists.txt | 2 +- 43 CMakeLists.txt | 2 +-
41 addon/doxywizard/CMakeLists.txt | 6 +++--- 44 addon/doxywizard/CMakeLists.txt | 6 +++---
42 doc/CMakeLists.txt | 6 +++--- 45 doc/CMakeLists.txt | 6 +++---
43 examples/CMakeLists.txt | 4 ++-- 46 examples/CMakeLists.txt | 4 ++--
44 libmscgen/CMakeLists.txt | 2 +- 47 libmscgen/CMakeLists.txt | 2 +-
45 src/CMakeLists.txt | 12 ++++++------ 48 src/CMakeLists.txt | 10 +++++-----
46 testing/CMakeLists.txt | 4 ++-- 49 testing/CMakeLists.txt | 4 ++--
47 7 files changed, 18 insertions(+), 18 deletions(-) 50 7 files changed, 17 insertions(+), 17 deletions(-)
48 51
49diff --git a/CMakeLists.txt b/CMakeLists.txt 52diff --git a/CMakeLists.txt b/CMakeLists.txt
50index 35e6a0c2..9aaebbdf 100644 53index f30b46b8..50f211c8 100644
51--- a/CMakeLists.txt 54--- a/CMakeLists.txt
52+++ b/CMakeLists.txt 55+++ b/CMakeLists.txt
53@@ -100,7 +100,7 @@ else () 56@@ -101,7 +101,7 @@ else ()
54 endif () 57 endif ()
55 58
56 find_program(DOT NAMES dot) 59 find_program(DOT NAMES dot)
@@ -60,50 +63,50 @@ index 35e6a0c2..9aaebbdf 100644
60 find_package(BISON REQUIRED) 63 find_package(BISON REQUIRED)
61 if (BISON_VERSION VERSION_LESS 2.7) 64 if (BISON_VERSION VERSION_LESS 2.7)
62diff --git a/addon/doxywizard/CMakeLists.txt b/addon/doxywizard/CMakeLists.txt 65diff --git a/addon/doxywizard/CMakeLists.txt b/addon/doxywizard/CMakeLists.txt
63index 6aacd8b6..fa197e9e 100644 66index a6f65f8d..d163aa5b 100644
64--- a/addon/doxywizard/CMakeLists.txt 67--- a/addon/doxywizard/CMakeLists.txt
65+++ b/addon/doxywizard/CMakeLists.txt 68+++ b/addon/doxywizard/CMakeLists.txt
66@@ -58,7 +58,7 @@ set_source_files_properties(${GENERATED_SRC_WIZARD}/settings.h PROPERTIES GENERA 69@@ -58,7 +58,7 @@ set_source_files_properties(${GENERATED_SRC_WIZARD}/settings.h PROPERTIES GENERA
67 70
68 # generate version.cpp 71 # generate version.cpp
69 add_custom_command( 72 add_custom_command(
70- COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_SOURCE_DIR}/src/version.py ${VERSION} > ${GENERATED_SRC_WIZARD}/version.cpp 73- COMMAND ${PYTHON_EXECUTABLE} ${PROJECT_SOURCE_DIR}/src/version.py ${VERSION} > ${GENERATED_SRC_WIZARD}/version.cpp
71+ COMMAND ${Python3_EXECUTABLE} ${CMAKE_SOURCE_DIR}/src/version.py ${VERSION} > ${GENERATED_SRC_WIZARD}/version.cpp 74+ COMMAND ${Python3_EXECUTABLE} ${PROJECT_SOURCE_DIR}/src/version.py ${VERSION} > ${GENERATED_SRC_WIZARD}/version.cpp
72 DEPENDS ${CMAKE_SOURCE_DIR}/VERSION ${CMAKE_SOURCE_DIR}/src/version.py 75 DEPENDS ${PROJECT_SOURCE_DIR}/VERSION ${PROJECT_SOURCE_DIR}/src/version.py
73 OUTPUT ${GENERATED_SRC_WIZARD}/version.cpp 76 OUTPUT ${GENERATED_SRC_WIZARD}/version.cpp
74 ) 77 )
75@@ -66,7 +66,7 @@ set_source_files_properties(${GENERATED_SRC_WIZARD}/version.cpp PROPERTIES GENER 78@@ -66,7 +66,7 @@ set_source_files_properties(${GENERATED_SRC_WIZARD}/version.cpp PROPERTIES GENER
76 79
77 # generate configdoc.cpp 80 # generate configdoc.cpp
78 add_custom_command( 81 add_custom_command(
79-COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_SOURCE_DIR}/src/configgen.py -wiz ${CMAKE_SOURCE_DIR}/src/config.xml > ${GENERATED_SRC_WIZARD}/configdoc.cpp 82- COMMAND ${PYTHON_EXECUTABLE} ${PROJECT_SOURCE_DIR}/src/configgen.py -wiz ${PROJECT_SOURCE_DIR}/src/config.xml > ${GENERATED_SRC_WIZARD}/configdoc.cpp
80+COMMAND ${Python3_EXECUTABLE} ${CMAKE_SOURCE_DIR}/src/configgen.py -wiz ${CMAKE_SOURCE_DIR}/src/config.xml > ${GENERATED_SRC_WIZARD}/configdoc.cpp 83+ COMMAND ${Python3_EXECUTABLE} ${PROJECT_SOURCE_DIR}/src/configgen.py -wiz ${PROJECT_SOURCE_DIR}/src/config.xml > ${GENERATED_SRC_WIZARD}/configdoc.cpp
81 OUTPUT ${GENERATED_SRC_WIZARD}/configdoc.cpp 84 DEPENDS ${PROJECT_SOURCE_DIR}/src/configgen.py ${PROJECT_SOURCE_DIR}/src/config.xml
85 OUTPUT ${GENERATED_SRC_WIZARD}/configdoc.cpp
82 ) 86 )
83 set_source_files_properties(${GENERATED_SRC_WIZARD}/configdoc.cpp PROPERTIES GENERATED 1) 87@@ -75,7 +75,7 @@ set_source_files_properties(${GENERATED_SRC_WIZARD}/configdoc.cpp PROPERTIES GEN
84@@ -74,7 +74,7 @@ set_source_files_properties(${GENERATED_SRC_WIZARD}/configdoc.cpp PROPERTIES GEN 88 set(LEX_FILES config_doxyw)
85 set(LEX_FILES config_doxyw)
86 foreach(lex_file ${LEX_FILES}) 89 foreach(lex_file ${LEX_FILES})
87 add_custom_command( 90 add_custom_command(
88- COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_SOURCE_DIR}/src/scan_states.py ${CMAKE_SOURCE_DIR}/addon/doxywizard/${lex_file}.l > ${GENERATED_SRC_WIZARD}/${lex_file}.l.h 91- COMMAND ${PYTHON_EXECUTABLE} ${PROJECT_SOURCE_DIR}/src/scan_states.py ${PROJECT_SOURCE_DIR}/addon/doxywizard/${lex_file}.l > ${GENERATED_SRC_WIZARD}/${lex_file}.l.h
89+ COMMAND ${Python3_EXECUTABLE} ${CMAKE_SOURCE_DIR}/src/scan_states.py ${CMAKE_SOURCE_DIR}/addon/doxywizard/${lex_file}.l > ${GENERATED_SRC_WIZARD}/${lex_file}.l.h 92+ COMMAND ${Python3_EXECUTABLE} ${PROJECT_SOURCE_DIR}/src/scan_states.py ${PROJECT_SOURCE_DIR}/addon/doxywizard/${lex_file}.l > ${GENERATED_SRC_WIZARD}/${lex_file}.l.h
90 DEPENDS ${CMAKE_SOURCE_DIR}/src/scan_states.py ${CMAKE_SOURCE_DIR}/addon/doxywizard/${lex_file}.l 93 DEPENDS ${PROJECT_SOURCE_DIR}/src/scan_states.py ${PROJECT_SOURCE_DIR}/addon/doxywizard/${lex_file}.l
91 OUTPUT ${GENERATED_SRC_WIZARD}/${lex_file}.l.h 94 OUTPUT ${GENERATED_SRC_WIZARD}/${lex_file}.l.h
92 ) 95 )
93diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt 96diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt
94index a094c570..8a757c20 100644 97index f2d177ed..22a4d602 100644
95--- a/doc/CMakeLists.txt 98--- a/doc/CMakeLists.txt
96+++ b/doc/CMakeLists.txt 99+++ b/doc/CMakeLists.txt
97@@ -132,7 +132,7 @@ configure_file(${CMAKE_SOURCE_DIR}/doc/doxyindexer.1 ${PROJECT_BINARY_DIR}/ 100@@ -163,7 +163,7 @@ configure_file(${PROJECT_SOURCE_DIR}/doc/doxyindexer.1 ${PROJECT_BINARY_DIR
98 101
99 # doc/language.doc (see tag Doxyfile:INPUT) 102 # doc/language.doc (see tag Doxyfile:INPUT)
100 add_custom_command( 103 add_custom_command(
101- COMMAND ${PYTHON_EXECUTABLE} translator.py ${CMAKE_SOURCE_DIR} 104- COMMAND ${PYTHON_EXECUTABLE} translator.py ${PROJECT_SOURCE_DIR}
102+ COMMAND ${Python3_EXECUTABLE} translator.py ${CMAKE_SOURCE_DIR} 105+ COMMAND ${Python3_EXECUTABLE} translator.py ${PROJECT_SOURCE_DIR}
103 DEPENDS ${CMAKE_SOURCE_DIR}/doc/maintainers.txt ${CMAKE_SOURCE_DIR}/doc/language.tpl ${PROJECT_BINARY_DIR}/doc/translator.py ${LANG_FILES} 106 DEPENDS ${PROJECT_SOURCE_DIR}/doc/maintainers.txt ${PROJECT_SOURCE_DIR}/doc/language.tpl ${PROJECT_BINARY_DIR}/doc/translator.py ${LANG_FILES}
104 OUTPUT language.doc 107 OUTPUT language.doc
105 WORKING_DIRECTORY ${PROJECT_BINARY_DIR}/doc 108 WORKING_DIRECTORY ${PROJECT_BINARY_DIR}/doc
106@@ -141,7 +141,7 @@ set_source_files_properties(language.doc PROPERTIES GENERATED 1) 109@@ -172,7 +172,7 @@ set_source_files_properties(language.doc PROPERTIES GENERATED 1)
107 110
108 # doc/config.doc (see tag Doxyfile:INPUT) 111 # doc/config.doc (see tag Doxyfile:INPUT)
109 add_custom_command( 112 add_custom_command(
@@ -112,7 +115,7 @@ index a094c570..8a757c20 100644
112 DEPENDS ${TOP}/src/config.xml ${TOP}/src/configgen.py 115 DEPENDS ${TOP}/src/config.xml ${TOP}/src/configgen.py
113 OUTPUT config.doc 116 OUTPUT config.doc
114 WORKING_DIRECTORY ${PROJECT_BINARY_DIR}/doc/ 117 WORKING_DIRECTORY ${PROJECT_BINARY_DIR}/doc/
115@@ -192,7 +192,7 @@ add_custom_target(docs_chm 118@@ -223,7 +223,7 @@ add_custom_target(docs_chm
116 COMMAND ${CMAKE_COMMAND} -E echo " for file in files:" >> ${PROJECT_BINARY_DIR}/chm/doxygen_manual_examples_chm.py 119 COMMAND ${CMAKE_COMMAND} -E echo " for file in files:" >> ${PROJECT_BINARY_DIR}/chm/doxygen_manual_examples_chm.py
117 COMMAND ${CMAKE_COMMAND} -E echo " if file.endswith('.html') or file.endswith('.png') or file.endswith('.css') or file.endswith('.gif'):" >> ${PROJECT_BINARY_DIR}/chm/doxygen_manual_examples_chm.py 120 COMMAND ${CMAKE_COMMAND} -E echo " if file.endswith('.html') or file.endswith('.png') or file.endswith('.css') or file.endswith('.gif'):" >> ${PROJECT_BINARY_DIR}/chm/doxygen_manual_examples_chm.py
118 COMMAND ${CMAKE_COMMAND} -E echo " print(os.path.join(root, file))" >> ${PROJECT_BINARY_DIR}/chm/doxygen_manual_examples_chm.py 121 COMMAND ${CMAKE_COMMAND} -E echo " print(os.path.join(root, file))" >> ${PROJECT_BINARY_DIR}/chm/doxygen_manual_examples_chm.py
@@ -122,42 +125,42 @@ index a094c570..8a757c20 100644
122 COMMAND ${CMAKE_COMMAND} -E rename ${PROJECT_BINARY_DIR}/chm/index.chm ${PROJECT_BINARY_DIR}/chm/doxygen_manual.chm 125 COMMAND ${CMAKE_COMMAND} -E rename ${PROJECT_BINARY_DIR}/chm/index.chm ${PROJECT_BINARY_DIR}/chm/doxygen_manual.chm
123 DEPENDS ${PROJECT_BINARY_DIR}/doc/language.doc ${PROJECT_BINARY_DIR}/doc/config.doc 126 DEPENDS ${PROJECT_BINARY_DIR}/doc/language.doc ${PROJECT_BINARY_DIR}/doc/config.doc
124diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt 127diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt
125index 3f1c79b8..d5866ee1 100644 128index 194b4271..248b8076 100644
126--- a/examples/CMakeLists.txt 129--- a/examples/CMakeLists.txt
127+++ b/examples/CMakeLists.txt 130+++ b/examples/CMakeLists.txt
128@@ -51,7 +51,7 @@ foreach (f_inp ${BASIC_EXAMPLES}) 131@@ -54,7 +54,7 @@ foreach (f_inp ${BASIC_EXAMPLES})
129 string(REGEX REPLACE ":.*" "" f ${f_inp}) 132 COMMAND ${CMAKE_COMMAND} -E make_directory ${PROJECT_BINARY_DIR}/html/examples/${f}
130 add_custom_command( 133 COMMAND ${CMAKE_COMMAND} -E make_directory ${PROJECT_BINARY_DIR}/latex/examples/${f}
131 COMMAND ${EXECUTABLE_OUTPUT_PATH}/doxygen ${f}.cfg 134 COMMAND ${EXECUTABLE_OUTPUT_PATH}/doxygen ${f}.cfg
132- COMMAND ${PYTHON_EXECUTABLE} ${TOP}/examples/strip_example.py < ${PROJECT_BINARY_DIR}/html/examples/${f}/latex/refman.tex > ${PROJECT_BINARY_DIR}/html/examples/${f}/latex/refman_doc.tex 135- COMMAND ${PYTHON_EXECUTABLE} ${TOP}/examples/strip_example.py < ${PROJECT_BINARY_DIR}/latex/examples/${f}/latex/refman.tex > ${PROJECT_BINARY_DIR}/latex/examples/${f}/latex/refman_doc.tex
133+ COMMAND ${Python3_EXECUTABLE} ${TOP}/examples/strip_example.py < ${PROJECT_BINARY_DIR}/html/examples/${f}/latex/refman.tex > ${PROJECT_BINARY_DIR}/html/examples/${f}/latex/refman_doc.tex 136+ COMMAND ${Python3_EXECUTABLE} ${TOP}/examples/strip_example.py < ${PROJECT_BINARY_DIR}/latex/examples/${f}/latex/refman.tex > ${PROJECT_BINARY_DIR}/latex/examples/${f}/latex/refman_doc.tex
134 DEPENDS doxygen ${f}.${f_ext} ${f}.cfg ${TOP}/examples/strip_example.py 137 DEPENDS doxygen ${f}.${f_ext} ${f}.cfg ${TOP}/examples/strip_example.py
135 OUTPUT ${PROJECT_BINARY_DIR}/html/examples/${f}/html/index.html ${PROJECT_BINARY_DIR}/html/examples/${f}/latex/refman_doc.tex 138 OUTPUT ${PROJECT_BINARY_DIR}/html/examples/${f}/html/index.html ${PROJECT_BINARY_DIR}/latex/examples/${f}/latex/refman_doc.tex
136 ) 139 )
137@@ -68,7 +68,7 @@ add_custom_target(examples 140@@ -73,7 +73,7 @@ if (DOT)
138 if (DOT) 141 COMMAND ${CMAKE_COMMAND} -E make_directory ${PROJECT_BINARY_DIR}/html/examples/diagrams
139 add_custom_command( 142 COMMAND ${CMAKE_COMMAND} -E make_directory ${PROJECT_BINARY_DIR}/latex/examples/diagrams
140 COMMAND ${EXECUTABLE_OUTPUT_PATH}/doxygen diagrams.cfg 143 COMMAND ${EXECUTABLE_OUTPUT_PATH}/doxygen diagrams.cfg
141- COMMAND ${PYTHON_EXECUTABLE} ${TOP}/examples/strip_example.py < ${PROJECT_BINARY_DIR}/html/examples/diagrams/latex/refman.tex > ${PROJECT_BINARY_DIR}/html/examples/diagrams/latex/refman_doc.tex 144- COMMAND ${PYTHON_EXECUTABLE} ${TOP}/examples/strip_example.py < ${PROJECT_BINARY_DIR}/latex/examples/diagrams/latex/refman.tex > ${PROJECT_BINARY_DIR}/latex/examples/diagrams/latex/refman_doc.tex
142+ COMMAND ${Python3_EXECUTABLE} ${TOP}/examples/strip_example.py < ${PROJECT_BINARY_DIR}/html/examples/diagrams/latex/refman.tex > ${PROJECT_BINARY_DIR}/html/examples/diagrams/latex/refman_doc.tex 145+ COMMAND ${Python3_EXECUTABLE} ${TOP}/examples/strip_example.py < ${PROJECT_BINARY_DIR}/html/examples/diagrams/latex/refman.tex > ${PROJECT_BINARY_DIR}/html/examples/diagrams/latex/refman_doc.tex
143 DEPENDS doxygen diagrams_a.h diagrams_b.h diagrams_c.h diagrams_d.h diagrams_e.h diagrams.cfg ${TOP}/examples/strip_example.py 146 DEPENDS doxygen diagrams_a.h diagrams_b.h diagrams_c.h diagrams_d.h diagrams_e.h diagrams.cfg ${TOP}/examples/strip_example.py
144 OUTPUT ${PROJECT_BINARY_DIR}/html/examples/diagrams/html/index.html ${PROJECT_BINARY_DIR}/html/examples/diagrams/latex/refman_doc.tex 147 OUTPUT ${PROJECT_BINARY_DIR}/html/examples/diagrams/html/index.html ${PROJECT_BINARY_DIR}/latex/examples/diagrams/latex/refman_doc.tex
145 ) 148 )
146diff --git a/libmscgen/CMakeLists.txt b/libmscgen/CMakeLists.txt 149diff --git a/libmscgen/CMakeLists.txt b/libmscgen/CMakeLists.txt
147index 079fcfc8..e6d86f61 100644 150index 0a239008..09849e2d 100644
148--- a/libmscgen/CMakeLists.txt 151--- a/libmscgen/CMakeLists.txt
149+++ b/libmscgen/CMakeLists.txt 152+++ b/libmscgen/CMakeLists.txt
150@@ -7,7 +7,7 @@ include_directories( 153@@ -7,7 +7,7 @@ include_directories(
151 set(LEX_FILES mscgen_lexer) 154 set(LEX_FILES mscgen_lexer)
152 foreach(lex_file ${LEX_FILES}) 155 foreach(lex_file ${LEX_FILES})
153 add_custom_command( 156 add_custom_command(
154- COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_SOURCE_DIR}/src/scan_states.py ${CMAKE_SOURCE_DIR}/libmscgen/${lex_file}.l > ${GENERATED_SRC}/${lex_file}.l.h 157- COMMAND ${PYTHON_EXECUTABLE} ${PROJECT_SOURCE_DIR}/src/scan_states.py ${PROJECT_SOURCE_DIR}/libmscgen/${lex_file}.l > ${GENERATED_SRC}/${lex_file}.l.h
155+ COMMAND ${Python3_EXECUTABLE} ${CMAKE_SOURCE_DIR}/src/scan_states.py ${CMAKE_SOURCE_DIR}/libmscgen/${lex_file}.l > ${GENERATED_SRC}/${lex_file}.l.h 158+ COMMAND ${Python3_EXECUTABLE} ${PROJECT_SOURCE_DIR}/src/scan_states.py ${PROJECT_SOURCE_DIR}/libmscgen/${lex_file}.l > ${GENERATED_SRC}/${lex_file}.l.h
156 DEPENDS ${CMAKE_SOURCE_DIR}/src/scan_states.py ${CMAKE_SOURCE_DIR}/libmscgen/${lex_file}.l 159 DEPENDS ${PROJECT_SOURCE_DIR}/src/scan_states.py ${PROJECT_SOURCE_DIR}/libmscgen/${lex_file}.l
157 OUTPUT ${GENERATED_SRC}/${lex_file}.l.h 160 OUTPUT ${GENERATED_SRC}/${lex_file}.l.h
158 ) 161 )
159diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt 162diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
160index cb289116..356741ff 100644 163index 5004a957..68e803f2 100644
161--- a/src/CMakeLists.txt 164--- a/src/CMakeLists.txt
162+++ b/src/CMakeLists.txt 165+++ b/src/CMakeLists.txt
163@@ -39,7 +39,7 @@ set_source_files_properties(${GENERATED_SRC}/settings.h PROPERTIES GENERATED 1) 166@@ -39,7 +39,7 @@ set_source_files_properties(${GENERATED_SRC}/settings.h PROPERTIES GENERATED 1)
@@ -191,21 +194,12 @@ index cb289116..356741ff 100644
191 # resources.cpp 194 # resources.cpp
192 add_custom_command( 195 add_custom_command(
193 COMMENT "Generating ${GENERATED_SRC}/resources.cpp" 196 COMMENT "Generating ${GENERATED_SRC}/resources.cpp"
194- COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_LIST_DIR}/res2cc_cmd.py ${CMAKE_SOURCE_DIR}/templates ${GENERATED_SRC}/resources.cpp 197- COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_LIST_DIR}/res2cc_cmd.py ${PROJECT_SOURCE_DIR}/templates ${GENERATED_SRC}/resources.cpp
195+ COMMAND ${Python3_EXECUTABLE} ${CMAKE_CURRENT_LIST_DIR}/res2cc_cmd.py ${CMAKE_SOURCE_DIR}/templates ${GENERATED_SRC}/resources.cpp 198+ COMMAND ${Python3_EXECUTABLE} ${CMAKE_CURRENT_LIST_DIR}/res2cc_cmd.py ${PROJECT_SOURCE_DIR}/templates ${GENERATED_SRC}/resources.cpp
196 DEPENDS ${RESOURCES} ${CMAKE_CURRENT_LIST_DIR}/res2cc_cmd.py 199 DEPENDS ${RESOURCES} ${CMAKE_CURRENT_LIST_DIR}/res2cc_cmd.py
197 OUTPUT ${GENERATED_SRC}/resources.cpp 200 OUTPUT ${GENERATED_SRC}/resources.cpp
198 ) 201 )
199@@ -102,7 +102,7 @@ set_source_files_properties(${GENERATED_SRC}/resources.cpp PROPERTIES GENERATED 202@@ -124,7 +124,7 @@ foreach(lex_file ${LEX_FILES})
200
201 # layout_default.xml
202 add_custom_command(
203- COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_LIST_DIR}/to_c_cmd.py < ${CMAKE_CURRENT_LIST_DIR}/layout_default.xml > ${GENERATED_SRC}/layout_default.xml.h
204+ COMMAND ${Python3_EXECUTABLE} ${CMAKE_CURRENT_LIST_DIR}/to_c_cmd.py < ${CMAKE_CURRENT_LIST_DIR}/layout_default.xml > ${GENERATED_SRC}/layout_default.xml.h
205 DEPENDS ${CMAKE_CURRENT_LIST_DIR}/layout_default.xml ${CMAKE_CURRENT_LIST_DIR}/to_c_cmd.py
206 OUTPUT ${GENERATED_SRC}/layout_default.xml.h
207 )
208@@ -131,7 +131,7 @@ foreach(lex_file ${LEX_FILES})
209 set(LEX_FILES_H ${LEX_FILES_H} " " ${GENERATED_SRC}/${lex_file}.l.h CACHE INTERNAL "Stores generated files") 203 set(LEX_FILES_H ${LEX_FILES_H} " " ${GENERATED_SRC}/${lex_file}.l.h CACHE INTERNAL "Stores generated files")
210 set(LEX_FILES_CPP ${LEX_FILES_CPP} " " ${GENERATED_SRC}/${lex_file}.cpp CACHE INTERNAL "Stores generated files") 204 set(LEX_FILES_CPP ${LEX_FILES_CPP} " " ${GENERATED_SRC}/${lex_file}.cpp CACHE INTERNAL "Stores generated files")
211 add_custom_command( 205 add_custom_command(
@@ -215,15 +209,15 @@ index cb289116..356741ff 100644
215 OUTPUT ${GENERATED_SRC}/${lex_file}.l.h 209 OUTPUT ${GENERATED_SRC}/${lex_file}.l.h
216 ) 210 )
217diff --git a/testing/CMakeLists.txt b/testing/CMakeLists.txt 211diff --git a/testing/CMakeLists.txt b/testing/CMakeLists.txt
218index b354e78f..28d45e11 100644 212index fd6912e9..0af1865b 100644
219--- a/testing/CMakeLists.txt 213--- a/testing/CMakeLists.txt
220+++ b/testing/CMakeLists.txt 214+++ b/testing/CMakeLists.txt
221@@ -1,7 +1,7 @@ 215@@ -1,7 +1,7 @@
222 # run all tests sequentially (keep for backward compatibility) 216 # run all tests sequentially (keep for backward compatibility)
223 add_custom_target(tests 217 add_custom_target(tests
224 COMMENT "Running doxygen tests..." 218 COMMENT "Running doxygen tests..."
225- COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_SOURCE_DIR}/testing/runtests.py --doxygen ${PROJECT_BINARY_DIR}/bin/doxygen --inputdir ${CMAKE_SOURCE_DIR}/testing --outputdir ${PROJECT_BINARY_DIR}/testing 219- COMMAND ${PYTHON_EXECUTABLE} ${PROJECT_SOURCE_DIR}/testing/runtests.py --doxygen ${PROJECT_BINARY_DIR}/bin/doxygen --inputdir ${PROJECT_SOURCE_DIR}/testing --outputdir ${PROJECT_BINARY_DIR}/testing
226+ COMMAND ${Python3_EXECUTABLE} ${CMAKE_SOURCE_DIR}/testing/runtests.py --doxygen ${PROJECT_BINARY_DIR}/bin/doxygen --inputdir ${CMAKE_SOURCE_DIR}/testing --outputdir ${PROJECT_BINARY_DIR}/testing 220+ COMMAND ${Python3_EXECUTABLE} ${PROJECT_SOURCE_DIR}/testing/runtests.py --doxygen ${PROJECT_BINARY_DIR}/bin/doxygen --inputdir ${PROJECT_SOURCE_DIR}/testing --outputdir ${PROJECT_BINARY_DIR}/testing
227 DEPENDS doxygen 221 DEPENDS doxygen
228 ) 222 )
229 223
@@ -231,10 +225,10 @@ index b354e78f..28d45e11 100644
231 string(REGEX REPLACE "^.*/([0-9][0-9][0-9]*).*$" "\\1" TEST_ID "${TEST_FILE}") 225 string(REGEX REPLACE "^.*/([0-9][0-9][0-9]*).*$" "\\1" TEST_ID "${TEST_FILE}")
232 # add a test target for each test 226 # add a test target for each test
233 add_test(NAME ${TEST_NAME} 227 add_test(NAME ${TEST_NAME}
234- COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_SOURCE_DIR}/testing/runtests.py --id ${TEST_ID} --doxygen $<TARGET_FILE:doxygen> --inputdir ${CMAKE_SOURCE_DIR}/testing --outputdir ${PROJECT_BINARY_DIR}/testing 228- COMMAND ${PYTHON_EXECUTABLE} ${PROJECT_SOURCE_DIR}/testing/runtests.py --id ${TEST_ID} --doxygen $<TARGET_FILE:doxygen> --inputdir ${PROJECT_SOURCE_DIR}/testing --outputdir ${PROJECT_BINARY_DIR}/testing
235+ COMMAND ${Python3_EXECUTABLE} ${CMAKE_SOURCE_DIR}/testing/runtests.py --id ${TEST_ID} --doxygen $<TARGET_FILE:doxygen> --inputdir ${CMAKE_SOURCE_DIR}/testing --outputdir ${PROJECT_BINARY_DIR}/testing 229+ COMMAND ${Python3_EXECUTABLE} ${PROJECT_SOURCE_DIR}/testing/runtests.py --id ${TEST_ID} --doxygen $<TARGET_FILE:doxygen> --inputdir ${PROJECT_SOURCE_DIR}/testing --outputdir ${PROJECT_BINARY_DIR}/testing
236 ) 230 )
237 endforeach() 231 endforeach()
238-- 232--
2392.17.1 2332.27.0
240 234
diff --git a/meta-oe/recipes-devtools/doxygen/doxygen_1.8.20.bb b/meta-oe/recipes-devtools/doxygen/doxygen_1.9.1.bb
index d4ac3b7207..3370a13132 100644
--- a/meta-oe/recipes-devtools/doxygen/doxygen_1.8.20.bb
+++ b/meta-oe/recipes-devtools/doxygen/doxygen_1.9.1.bb
@@ -10,8 +10,7 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/${BP}.src.tar.gz \
10 file://0001-build-don-t-look-for-Iconv.patch \ 10 file://0001-build-don-t-look-for-Iconv.patch \
11" 11"
12SRC_URI_append_class-native = " file://doxygen-native-only-check-python3.patch" 12SRC_URI_append_class-native = " file://doxygen-native-only-check-python3.patch"
13SRC_URI[md5sum] = "8729936a843232a66fe970ef65f3c3e4" 13SRC_URI[sha256sum] = "67aeae1be4e1565519898f46f1f7092f1973cce8a767e93101ee0111717091d1"
14SRC_URI[sha256sum] = "e0db6979286fd7ccd3a99af9f97397f2bae50532e4ecb312aa18862f8401ddec"
15 14
16inherit cmake python3native 15inherit cmake python3native
17 16
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2025-11-01 17:24:49 +0000