summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--meta-oe/recipes-devtools/doxygen/doxygen/doxygen-native-only-check-python3.patch359
-rw-r--r--meta-oe/recipes-devtools/doxygen/doxygen_1.8.20.bb (renamed from meta-oe/recipes-devtools/doxygen/doxygen_1.8.17.bb)4
2 files changed, 85 insertions, 278 deletions
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 a9650c232f..53f88885f4 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,5 +1,10 @@
1It fails to compile doxygen-native when /usr/bin/python is a link to python3 on 1From aa833cf56c5cc2e87a1d91881eb2286beb34e417 Mon Sep 17 00:00:00 2001
2build host: 2From: Leon Anavi <leon.anavi@konsulko.com>
3Date: Wed, 26 Aug 2020 10:52:10 +0300
4Subject: [PATCH] doxygen: Fix Python issues for doxygen-native
5
6It fails to compile doxygen-native when /usr/bin/python is a link
7to python3 on build host:
3 8
4| Failed to import the site module 9| Failed to import the site module
5| Traceback (most recent call last): 10| Traceback (most recent call last):
@@ -21,21 +26,31 @@ build host:
21| _temp = __import__(name, globals(), locals(), ['build_time_vars'], 0) 26| _temp = __import__(name, globals(), locals(), ['build_time_vars'], 0)
22| ModuleNotFoundError: No module named '_sysconfigdata' 27| ModuleNotFoundError: No module named '_sysconfigdata'
23 28
24Replace find_package PythonInterp with Python3 to fix this issue that 29Replace find_package PythonInterp with Python3 to fix this issue
25it uses python3 from python3-native. And it also replaces the result 30that it uses python3 from python3-native. And it also replaces the
26variable PYTHON_EXECUTABLE with Python3_EXECUTABLE. 31result variable PYTHON_EXECUTABLE with Python3_EXECUTABLE.
27 32
28This patch is only needded by doxygen-native. 33This patch is only needded by doxygen-native.
29 34
30Upstream-Status: Inappropriate[oe specific] 35Upstream-Status: Inappropriate[oe specific]
31 36
32Signed-off-by: Kai Kang <kai.kang@windriver.com> 37Co-Authored-By: Kai Kang <kai.kang@windriver.com>
38Signed-off-by: Leon Anavi <leon.anavi@konsulko.com>
33--- 39---
40 CMakeLists.txt | 2 +-
41 addon/doxywizard/CMakeLists.txt | 6 +++---
42 doc/CMakeLists.txt | 6 +++---
43 examples/CMakeLists.txt | 4 ++--
44 libmscgen/CMakeLists.txt | 2 +-
45 src/CMakeLists.txt | 12 ++++++------
46 testing/CMakeLists.txt | 4 ++--
47 7 files changed, 18 insertions(+), 18 deletions(-)
48
34diff --git a/CMakeLists.txt b/CMakeLists.txt 49diff --git a/CMakeLists.txt b/CMakeLists.txt
35index 969ae58..604400f 100644 50index 35e6a0c2..9aaebbdf 100644
36--- a/CMakeLists.txt 51--- a/CMakeLists.txt
37+++ b/CMakeLists.txt 52+++ b/CMakeLists.txt
38@@ -93,7 +93,7 @@ else () 53@@ -100,7 +100,7 @@ else ()
39 endif () 54 endif ()
40 55
41 find_program(DOT NAMES dot) 56 find_program(DOT NAMES dot)
@@ -45,7 +60,7 @@ index 969ae58..604400f 100644
45 find_package(BISON REQUIRED) 60 find_package(BISON REQUIRED)
46 if (BISON_VERSION VERSION_LESS 2.7) 61 if (BISON_VERSION VERSION_LESS 2.7)
47diff --git a/addon/doxywizard/CMakeLists.txt b/addon/doxywizard/CMakeLists.txt 62diff --git a/addon/doxywizard/CMakeLists.txt b/addon/doxywizard/CMakeLists.txt
48index 6aacd8b..fa197e9 100644 63index 6aacd8b6..fa197e9e 100644
49--- a/addon/doxywizard/CMakeLists.txt 64--- a/addon/doxywizard/CMakeLists.txt
50+++ b/addon/doxywizard/CMakeLists.txt 65+++ b/addon/doxywizard/CMakeLists.txt
51@@ -58,7 +58,7 @@ set_source_files_properties(${GENERATED_SRC_WIZARD}/settings.h PROPERTIES GENERA 66@@ -58,7 +58,7 @@ set_source_files_properties(${GENERATED_SRC_WIZARD}/settings.h PROPERTIES GENERA
@@ -76,7 +91,7 @@ index 6aacd8b..fa197e9 100644
76 OUTPUT ${GENERATED_SRC_WIZARD}/${lex_file}.l.h 91 OUTPUT ${GENERATED_SRC_WIZARD}/${lex_file}.l.h
77 ) 92 )
78diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt 93diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt
79index 032c16a..332f1b2 100644 94index a094c570..8a757c20 100644
80--- a/doc/CMakeLists.txt 95--- a/doc/CMakeLists.txt
81+++ b/doc/CMakeLists.txt 96+++ b/doc/CMakeLists.txt
82@@ -132,7 +132,7 @@ configure_file(${CMAKE_SOURCE_DIR}/doc/doxyindexer.1 ${PROJECT_BINARY_DIR}/ 97@@ -132,7 +132,7 @@ configure_file(${CMAKE_SOURCE_DIR}/doc/doxyindexer.1 ${PROJECT_BINARY_DIR}/
@@ -85,7 +100,7 @@ index 032c16a..332f1b2 100644
85 add_custom_command( 100 add_custom_command(
86- COMMAND ${PYTHON_EXECUTABLE} translator.py ${CMAKE_SOURCE_DIR} 101- COMMAND ${PYTHON_EXECUTABLE} translator.py ${CMAKE_SOURCE_DIR}
87+ COMMAND ${Python3_EXECUTABLE} translator.py ${CMAKE_SOURCE_DIR} 102+ COMMAND ${Python3_EXECUTABLE} translator.py ${CMAKE_SOURCE_DIR}
88 DEPENDS ${PROJECT_BINARY_DIR}/doc/maintainers.txt ${PROJECT_BINARY_DIR}/doc/language.tpl ${PROJECT_BINARY_DIR}/doc/translator.py 103 DEPENDS ${CMAKE_SOURCE_DIR}/doc/maintainers.txt ${CMAKE_SOURCE_DIR}/doc/language.tpl ${PROJECT_BINARY_DIR}/doc/translator.py ${LANG_FILES}
89 OUTPUT language.doc 104 OUTPUT language.doc
90 WORKING_DIRECTORY ${PROJECT_BINARY_DIR}/doc 105 WORKING_DIRECTORY ${PROJECT_BINARY_DIR}/doc
91@@ -141,7 +141,7 @@ set_source_files_properties(language.doc PROPERTIES GENERATED 1) 106@@ -141,7 +141,7 @@ set_source_files_properties(language.doc PROPERTIES GENERATED 1)
@@ -107,235 +122,19 @@ index 032c16a..332f1b2 100644
107 COMMAND ${CMAKE_COMMAND} -E rename ${PROJECT_BINARY_DIR}/chm/index.chm ${PROJECT_BINARY_DIR}/chm/doxygen_manual.chm 122 COMMAND ${CMAKE_COMMAND} -E rename ${PROJECT_BINARY_DIR}/chm/index.chm ${PROJECT_BINARY_DIR}/chm/doxygen_manual.chm
108 DEPENDS ${PROJECT_BINARY_DIR}/doc/language.doc ${PROJECT_BINARY_DIR}/doc/config.doc 123 DEPENDS ${PROJECT_BINARY_DIR}/doc/language.doc ${PROJECT_BINARY_DIR}/doc/config.doc
109diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt 124diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt
110index 967f3d4..a8d1aad 100644 125index 3f1c79b8..d5866ee1 100644
111--- a/examples/CMakeLists.txt 126--- a/examples/CMakeLists.txt
112+++ b/examples/CMakeLists.txt 127+++ b/examples/CMakeLists.txt
113@@ -52,196 +52,196 @@ add_custom_target(examples 128@@ -51,7 +51,7 @@ foreach (f_inp ${BASIC_EXAMPLES})
114 129 string(REGEX REPLACE ":.*" "" f ${f_inp})
115 add_custom_command( 130 add_custom_command(
116 COMMAND ${EXECUTABLE_OUTPUT_PATH}/doxygen class.cfg 131 COMMAND ${EXECUTABLE_OUTPUT_PATH}/doxygen ${f}.cfg
117- COMMAND ${PYTHON_EXECUTABLE} ${TOP}/examples/strip_example.py < ${PROJECT_BINARY_DIR}/html/examples/class/latex/refman.tex > ${PROJECT_BINARY_DIR}/html/examples/class/latex/refman_doc.tex 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
118+ COMMAND ${Python3_EXECUTABLE} ${TOP}/examples/strip_example.py < ${PROJECT_BINARY_DIR}/html/examples/class/latex/refman.tex > ${PROJECT_BINARY_DIR}/html/examples/class/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
119 DEPENDS doxygen class.h class.cfg ${TOP}/examples/strip_example.py 134 DEPENDS doxygen ${f}.${f_ext} ${f}.cfg ${TOP}/examples/strip_example.py
120 OUTPUT ${PROJECT_BINARY_DIR}/html/examples/class/html/index.html ${PROJECT_BINARY_DIR}/html/examples/class/latex/refman_doc.tex 135 OUTPUT ${PROJECT_BINARY_DIR}/html/examples/${f}/html/index.html ${PROJECT_BINARY_DIR}/html/examples/${f}/latex/refman_doc.tex
121 ) 136 )
122 137@@ -68,7 +68,7 @@ add_custom_target(examples
123 add_custom_command(
124 COMMAND ${EXECUTABLE_OUTPUT_PATH}/doxygen define.cfg
125- COMMAND ${PYTHON_EXECUTABLE} ${TOP}/examples/strip_example.py < ${PROJECT_BINARY_DIR}/html/examples/define/latex/refman.tex > ${PROJECT_BINARY_DIR}/html/examples/define/latex/refman_doc.tex
126+ COMMAND ${Python3_EXECUTABLE} ${TOP}/examples/strip_example.py < ${PROJECT_BINARY_DIR}/html/examples/define/latex/refman.tex > ${PROJECT_BINARY_DIR}/html/examples/define/latex/refman_doc.tex
127 DEPENDS doxygen define.h define.cfg ${TOP}/examples/strip_example.py
128 OUTPUT ${PROJECT_BINARY_DIR}/html/examples/define/html/index.html ${PROJECT_BINARY_DIR}/html/examples/define/latex/refman_doc.tex
129 )
130
131 add_custom_command(
132 COMMAND ${EXECUTABLE_OUTPUT_PATH}/doxygen enum.cfg
133- COMMAND ${PYTHON_EXECUTABLE} ${TOP}/examples/strip_example.py < ${PROJECT_BINARY_DIR}/html/examples/enum/latex/refman.tex > ${PROJECT_BINARY_DIR}/html/examples/enum/latex/refman_doc.tex
134+ COMMAND ${Python3_EXECUTABLE} ${TOP}/examples/strip_example.py < ${PROJECT_BINARY_DIR}/html/examples/enum/latex/refman.tex > ${PROJECT_BINARY_DIR}/html/examples/enum/latex/refman_doc.tex
135 DEPENDS doxygen enum.h enum.cfg ${TOP}/examples/strip_example.py
136 OUTPUT ${PROJECT_BINARY_DIR}/html/examples/enum/html/index.html ${PROJECT_BINARY_DIR}/html/examples/enum/latex/refman_doc.tex
137 )
138
139 add_custom_command(
140 COMMAND ${EXECUTABLE_OUTPUT_PATH}/doxygen file.cfg
141- COMMAND ${PYTHON_EXECUTABLE} ${TOP}/examples/strip_example.py < ${PROJECT_BINARY_DIR}/html/examples/file/latex/refman.tex > ${PROJECT_BINARY_DIR}/html/examples/file/latex/refman_doc.tex
142+ COMMAND ${Python3_EXECUTABLE} ${TOP}/examples/strip_example.py < ${PROJECT_BINARY_DIR}/html/examples/file/latex/refman.tex > ${PROJECT_BINARY_DIR}/html/examples/file/latex/refman_doc.tex
143 DEPENDS doxygen file.h file.cfg ${TOP}/examples/strip_example.py
144 OUTPUT ${PROJECT_BINARY_DIR}/html/examples/file/html/index.html ${PROJECT_BINARY_DIR}/html/examples/file/latex/refman_doc.tex
145 )
146
147 add_custom_command(
148 COMMAND ${EXECUTABLE_OUTPUT_PATH}/doxygen func.cfg
149- COMMAND ${PYTHON_EXECUTABLE} ${TOP}/examples/strip_example.py < ${PROJECT_BINARY_DIR}/html/examples/func/latex/refman.tex > ${PROJECT_BINARY_DIR}/html/examples/func/latex/refman_doc.tex
150+ COMMAND ${Python3_EXECUTABLE} ${TOP}/examples/strip_example.py < ${PROJECT_BINARY_DIR}/html/examples/func/latex/refman.tex > ${PROJECT_BINARY_DIR}/html/examples/func/latex/refman_doc.tex
151 DEPENDS doxygen func.h func.cfg ${TOP}/examples/strip_example.py
152 OUTPUT ${PROJECT_BINARY_DIR}/html/examples/func/html/index.html ${PROJECT_BINARY_DIR}/html/examples/func/latex/refman_doc.tex
153 )
154
155 add_custom_command(
156 COMMAND ${EXECUTABLE_OUTPUT_PATH}/doxygen javadoc-banner.cfg
157- COMMAND ${PYTHON_EXECUTABLE} ${TOP}/examples/strip_example.py < ${PROJECT_BINARY_DIR}/html/examples/javadoc-banner/latex/refman.tex > ${PROJECT_BINARY_DIR}/html/examples/javadoc-banner/latex/refman_doc.tex
158+ COMMAND ${Python3_EXECUTABLE} ${TOP}/examples/strip_example.py < ${PROJECT_BINARY_DIR}/html/examples/javadoc-banner/latex/refman.tex > ${PROJECT_BINARY_DIR}/html/examples/javadoc-banner/latex/refman_doc.tex
159 DEPENDS doxygen javadoc-banner.h javadoc-banner.cfg ${TOP}/examples/strip_example.py
160 OUTPUT ${PROJECT_BINARY_DIR}/html/examples/javadoc-banner/html/index.html ${PROJECT_BINARY_DIR}/html/examples/javadoc-banner/latex/refman_doc.tex
161 )
162
163 add_custom_command(
164 COMMAND ${EXECUTABLE_OUTPUT_PATH}/doxygen page.cfg
165- COMMAND ${PYTHON_EXECUTABLE} ${TOP}/examples/strip_example.py < ${PROJECT_BINARY_DIR}/html/examples/page/latex/refman.tex > ${PROJECT_BINARY_DIR}/html/examples/page/latex/refman_doc.tex
166+ COMMAND ${Python3_EXECUTABLE} ${TOP}/examples/strip_example.py < ${PROJECT_BINARY_DIR}/html/examples/page/latex/refman.tex > ${PROJECT_BINARY_DIR}/html/examples/page/latex/refman_doc.tex
167 DEPENDS doxygen page.doc page.cfg ${TOP}/examples/strip_example.py
168 OUTPUT ${PROJECT_BINARY_DIR}/html/examples/page/html/index.html ${PROJECT_BINARY_DIR}/html/examples/page/latex/refman_doc.tex
169 )
170
171 add_custom_command(
172 COMMAND ${EXECUTABLE_OUTPUT_PATH}/doxygen relates.cfg
173- COMMAND ${PYTHON_EXECUTABLE} ${TOP}/examples/strip_example.py < ${PROJECT_BINARY_DIR}/html/examples/relates/latex/refman.tex > ${PROJECT_BINARY_DIR}/html/examples/relates/latex/refman_doc.tex
174+ COMMAND ${Python3_EXECUTABLE} ${TOP}/examples/strip_example.py < ${PROJECT_BINARY_DIR}/html/examples/relates/latex/refman.tex > ${PROJECT_BINARY_DIR}/html/examples/relates/latex/refman_doc.tex
175 DEPENDS doxygen relates.cpp relates.cfg ${TOP}/examples/strip_example.py
176 OUTPUT ${PROJECT_BINARY_DIR}/html/examples/relates/html/index.html ${PROJECT_BINARY_DIR}/html/examples/relates/latex/refman_doc.tex
177 )
178
179 add_custom_command(
180 COMMAND ${EXECUTABLE_OUTPUT_PATH}/doxygen author.cfg
181- COMMAND ${PYTHON_EXECUTABLE} ${TOP}/examples/strip_example.py < ${PROJECT_BINARY_DIR}/html/examples/author/latex/refman.tex > ${PROJECT_BINARY_DIR}/html/examples/author/latex/refman_doc.tex
182+ COMMAND ${Python3_EXECUTABLE} ${TOP}/examples/strip_example.py < ${PROJECT_BINARY_DIR}/html/examples/author/latex/refman.tex > ${PROJECT_BINARY_DIR}/html/examples/author/latex/refman_doc.tex
183 DEPENDS doxygen author.cpp author.cfg ${TOP}/examples/strip_example.py
184 OUTPUT ${PROJECT_BINARY_DIR}/html/examples/author/html/index.html ${PROJECT_BINARY_DIR}/html/examples/author/latex/refman_doc.tex
185 )
186
187 add_custom_command(
188 COMMAND ${EXECUTABLE_OUTPUT_PATH}/doxygen par.cfg
189- COMMAND ${PYTHON_EXECUTABLE} ${TOP}/examples/strip_example.py < ${PROJECT_BINARY_DIR}/html/examples/par/latex/refman.tex > ${PROJECT_BINARY_DIR}/html/examples/par/latex/refman_doc.tex
190+ COMMAND ${Python3_EXECUTABLE} ${TOP}/examples/strip_example.py < ${PROJECT_BINARY_DIR}/html/examples/par/latex/refman.tex > ${PROJECT_BINARY_DIR}/html/examples/par/latex/refman_doc.tex
191 DEPENDS doxygen par.cpp par.cfg ${TOP}/examples/strip_example.py
192 OUTPUT ${PROJECT_BINARY_DIR}/html/examples/par/html/index.html ${PROJECT_BINARY_DIR}/html/examples/par/latex/refman_doc.tex
193 )
194
195 add_custom_command(
196 COMMAND ${EXECUTABLE_OUTPUT_PATH}/doxygen overload.cfg
197- COMMAND ${PYTHON_EXECUTABLE} ${TOP}/examples/strip_example.py < ${PROJECT_BINARY_DIR}/html/examples/overload/latex/refman.tex > ${PROJECT_BINARY_DIR}/html/examples/overload/latex/refman_doc.tex
198+ COMMAND ${Python3_EXECUTABLE} ${TOP}/examples/strip_example.py < ${PROJECT_BINARY_DIR}/html/examples/overload/latex/refman.tex > ${PROJECT_BINARY_DIR}/html/examples/overload/latex/refman_doc.tex
199 DEPENDS doxygen overload.cpp overload.cfg ${TOP}/examples/strip_example.py
200 OUTPUT ${PROJECT_BINARY_DIR}/html/examples/overload/html/index.html ${PROJECT_BINARY_DIR}/html/examples/overload/latex/refman_doc.tex
201 )
202
203 add_custom_command(
204 COMMAND ${EXECUTABLE_OUTPUT_PATH}/doxygen example.cfg
205- COMMAND ${PYTHON_EXECUTABLE} ${TOP}/examples/strip_example.py < ${PROJECT_BINARY_DIR}/html/examples/example/latex/refman.tex > ${PROJECT_BINARY_DIR}/html/examples/example/latex/refman_doc.tex
206+ COMMAND ${Python3_EXECUTABLE} ${TOP}/examples/strip_example.py < ${PROJECT_BINARY_DIR}/html/examples/example/latex/refman.tex > ${PROJECT_BINARY_DIR}/html/examples/example/latex/refman_doc.tex
207 DEPENDS doxygen example.cpp example_test.cpp example.cfg ${TOP}/examples/strip_example.py
208 OUTPUT ${PROJECT_BINARY_DIR}/html/examples/example/html/index.html ${PROJECT_BINARY_DIR}/html/examples/example/latex/refman_doc.tex
209 )
210
211 add_custom_command(
212 COMMAND ${EXECUTABLE_OUTPUT_PATH}/doxygen include.cfg
213- COMMAND ${PYTHON_EXECUTABLE} ${TOP}/examples/strip_example.py < ${PROJECT_BINARY_DIR}/html/examples/include/latex/refman.tex > ${PROJECT_BINARY_DIR}/html/examples/include/latex/refman_doc.tex
214+ COMMAND ${Python3_EXECUTABLE} ${TOP}/examples/strip_example.py < ${PROJECT_BINARY_DIR}/html/examples/include/latex/refman.tex > ${PROJECT_BINARY_DIR}/html/examples/include/latex/refman_doc.tex
215 DEPENDS doxygen include.cpp include_test.cpp include.cfg ${TOP}/examples/strip_example.py
216 OUTPUT ${PROJECT_BINARY_DIR}/html/examples/include/html/index.html ${PROJECT_BINARY_DIR}/html/examples/include/latex/refman_doc.tex
217 )
218
219 add_custom_command(
220 COMMAND ${EXECUTABLE_OUTPUT_PATH}/doxygen qtstyle.cfg
221- COMMAND ${PYTHON_EXECUTABLE} ${TOP}/examples/strip_example.py < ${PROJECT_BINARY_DIR}/html/examples/qtstyle/latex/refman.tex > ${PROJECT_BINARY_DIR}/html/examples/qtstyle/latex/refman_doc.tex
222+ COMMAND ${Python3_EXECUTABLE} ${TOP}/examples/strip_example.py < ${PROJECT_BINARY_DIR}/html/examples/qtstyle/latex/refman.tex > ${PROJECT_BINARY_DIR}/html/examples/qtstyle/latex/refman_doc.tex
223 DEPENDS doxygen qtstyle.cpp qtstyle.cfg ${TOP}/examples/strip_example.py
224 OUTPUT ${PROJECT_BINARY_DIR}/html/examples/qtstyle/html/index.html ${PROJECT_BINARY_DIR}/html/examples/qtstyle/latex/refman_doc.tex
225 )
226
227 add_custom_command(
228 COMMAND ${EXECUTABLE_OUTPUT_PATH}/doxygen jdstyle.cfg
229- COMMAND ${PYTHON_EXECUTABLE} ${TOP}/examples/strip_example.py < ${PROJECT_BINARY_DIR}/html/examples/jdstyle/latex/refman.tex > ${PROJECT_BINARY_DIR}/html/examples/jdstyle/latex/refman_doc.tex
230+ COMMAND ${Python3_EXECUTABLE} ${TOP}/examples/strip_example.py < ${PROJECT_BINARY_DIR}/html/examples/jdstyle/latex/refman.tex > ${PROJECT_BINARY_DIR}/html/examples/jdstyle/latex/refman_doc.tex
231 DEPENDS doxygen jdstyle.cpp jdstyle.cfg ${TOP}/examples/strip_example.py
232 OUTPUT ${PROJECT_BINARY_DIR}/html/examples/jdstyle/html/index.html ${PROJECT_BINARY_DIR}/html/examples/jdstyle/latex/refman_doc.tex
233 )
234
235 add_custom_command(
236 COMMAND ${EXECUTABLE_OUTPUT_PATH}/doxygen structcmd.cfg
237- COMMAND ${PYTHON_EXECUTABLE} ${TOP}/examples/strip_example.py < ${PROJECT_BINARY_DIR}/html/examples/structcmd/latex/refman.tex > ${PROJECT_BINARY_DIR}/html/examples/structcmd/latex/refman_doc.tex
238+ COMMAND ${Python3_EXECUTABLE} ${TOP}/examples/strip_example.py < ${PROJECT_BINARY_DIR}/html/examples/structcmd/latex/refman.tex > ${PROJECT_BINARY_DIR}/html/examples/structcmd/latex/refman_doc.tex
239 DEPENDS doxygen structcmd.h structcmd.cfg ${TOP}/examples/strip_example.py
240 OUTPUT ${PROJECT_BINARY_DIR}/html/examples/structcmd/html/index.html ${PROJECT_BINARY_DIR}/html/examples/structcmd/latex/refman_doc.tex
241 )
242
243 add_custom_command(
244 COMMAND ${EXECUTABLE_OUTPUT_PATH}/doxygen autolink.cfg
245- COMMAND ${PYTHON_EXECUTABLE} ${TOP}/examples/strip_example.py < ${PROJECT_BINARY_DIR}/html/examples/autolink/latex/refman.tex > ${PROJECT_BINARY_DIR}/html/examples/autolink/latex/refman_doc.tex
246+ COMMAND ${Python3_EXECUTABLE} ${TOP}/examples/strip_example.py < ${PROJECT_BINARY_DIR}/html/examples/autolink/latex/refman.tex > ${PROJECT_BINARY_DIR}/html/examples/autolink/latex/refman_doc.tex
247 DEPENDS doxygen autolink.cpp autolink.cfg ${TOP}/examples/strip_example.py
248 OUTPUT ${PROJECT_BINARY_DIR}/html/examples/autolink/html/index.html ${PROJECT_BINARY_DIR}/html/examples/autolink/latex/refman_doc.tex
249 )
250
251 add_custom_command(
252 COMMAND ${EXECUTABLE_OUTPUT_PATH}/doxygen tag.cfg
253- COMMAND ${PYTHON_EXECUTABLE} ${TOP}/examples/strip_example.py < ${PROJECT_BINARY_DIR}/html/examples/tag/latex/refman.tex > ${PROJECT_BINARY_DIR}/html/examples/tag/latex/refman_doc.tex
254+ COMMAND ${Python3_EXECUTABLE} ${TOP}/examples/strip_example.py < ${PROJECT_BINARY_DIR}/html/examples/tag/latex/refman.tex > ${PROJECT_BINARY_DIR}/html/examples/tag/latex/refman_doc.tex
255 DEPENDS doxygen tag.cpp tag.cfg ${PROJECT_BINARY_DIR}/html/examples/example/html/index.html ${TOP}/examples/strip_example.py
256 OUTPUT ${PROJECT_BINARY_DIR}/html/examples/tag/html/index.html ${PROJECT_BINARY_DIR}/html/examples/tag/latex/refman_doc.tex
257 )
258
259 add_custom_command(
260 COMMAND ${EXECUTABLE_OUTPUT_PATH}/doxygen restypedef.cfg
261- COMMAND ${PYTHON_EXECUTABLE} ${TOP}/examples/strip_example.py < ${PROJECT_BINARY_DIR}/html/examples/restypedef/latex/refman.tex > ${PROJECT_BINARY_DIR}/html/examples/restypedef/latex/refman_doc.tex
262+ COMMAND ${Python3_EXECUTABLE} ${TOP}/examples/strip_example.py < ${PROJECT_BINARY_DIR}/html/examples/restypedef/latex/refman.tex > ${PROJECT_BINARY_DIR}/html/examples/restypedef/latex/refman_doc.tex
263 DEPENDS doxygen restypedef.cpp restypedef.cfg ${TOP}/examples/strip_example.py
264 OUTPUT ${PROJECT_BINARY_DIR}/html/examples/restypedef/html/index.html ${PROJECT_BINARY_DIR}/html/examples/restypedef/latex/refman_doc.tex
265 )
266
267 add_custom_command(
268 COMMAND ${EXECUTABLE_OUTPUT_PATH}/doxygen afterdoc.cfg
269- COMMAND ${PYTHON_EXECUTABLE} ${TOP}/examples/strip_example.py < ${PROJECT_BINARY_DIR}/html/examples/afterdoc/latex/refman.tex > ${PROJECT_BINARY_DIR}/html/examples/afterdoc/latex/refman_doc.tex
270+ COMMAND ${Python3_EXECUTABLE} ${TOP}/examples/strip_example.py < ${PROJECT_BINARY_DIR}/html/examples/afterdoc/latex/refman.tex > ${PROJECT_BINARY_DIR}/html/examples/afterdoc/latex/refman_doc.tex
271 DEPENDS doxygen afterdoc.h afterdoc.cfg ${TOP}/examples/strip_example.py
272 OUTPUT ${PROJECT_BINARY_DIR}/html/examples/afterdoc/html/index.html ${PROJECT_BINARY_DIR}/html/examples/afterdoc/latex/refman_doc.tex
273 )
274
275 add_custom_command(
276 COMMAND ${EXECUTABLE_OUTPUT_PATH}/doxygen templ.cfg
277- COMMAND ${PYTHON_EXECUTABLE} ${TOP}/examples/strip_example.py < ${PROJECT_BINARY_DIR}/html/examples/template/latex/refman.tex > ${PROJECT_BINARY_DIR}/html/examples/template/latex/refman_doc.tex
278+ COMMAND ${Python3_EXECUTABLE} ${TOP}/examples/strip_example.py < ${PROJECT_BINARY_DIR}/html/examples/template/latex/refman.tex > ${PROJECT_BINARY_DIR}/html/examples/template/latex/refman_doc.tex
279 DEPENDS doxygen templ.cpp templ.cfg ${TOP}/examples/strip_example.py
280 OUTPUT ${PROJECT_BINARY_DIR}/html/examples/template/html/index.html ${PROJECT_BINARY_DIR}/html/examples/template/latex/refman_doc.tex
281 )
282
283 add_custom_command(
284 COMMAND ${EXECUTABLE_OUTPUT_PATH}/doxygen group.cfg
285- COMMAND ${PYTHON_EXECUTABLE} ${TOP}/examples/strip_example.py < ${PROJECT_BINARY_DIR}/html/examples/group/latex/refman.tex > ${PROJECT_BINARY_DIR}/html/examples/group/latex/refman_doc.tex
286+ COMMAND ${Python3_EXECUTABLE} ${TOP}/examples/strip_example.py < ${PROJECT_BINARY_DIR}/html/examples/group/latex/refman.tex > ${PROJECT_BINARY_DIR}/html/examples/group/latex/refman_doc.tex
287 DEPENDS doxygen group.cpp group.cfg ${TOP}/examples/strip_example.py
288 OUTPUT ${PROJECT_BINARY_DIR}/html/examples/group/html/index.html ${PROJECT_BINARY_DIR}/html/examples/group/latex/refman_doc.tex
289 )
290
291 add_custom_command(
292 COMMAND ${EXECUTABLE_OUTPUT_PATH}/doxygen memgrp.cfg
293- COMMAND ${PYTHON_EXECUTABLE} ${TOP}/examples/strip_example.py < ${PROJECT_BINARY_DIR}/html/examples/memgrp/latex/refman.tex > ${PROJECT_BINARY_DIR}/html/examples/memgrp/latex/refman_doc.tex
294+ COMMAND ${Python3_EXECUTABLE} ${TOP}/examples/strip_example.py < ${PROJECT_BINARY_DIR}/html/examples/memgrp/latex/refman.tex > ${PROJECT_BINARY_DIR}/html/examples/memgrp/latex/refman_doc.tex
295 DEPENDS doxygen memgrp.cpp memgrp.cfg ${TOP}/examples/strip_example.py
296 OUTPUT ${PROJECT_BINARY_DIR}/html/examples/memgrp/html/index.html ${PROJECT_BINARY_DIR}/html/examples/memgrp/latex/refman_doc.tex
297 )
298
299 add_custom_command(
300 COMMAND ${EXECUTABLE_OUTPUT_PATH}/doxygen pyexample.cfg
301- COMMAND ${PYTHON_EXECUTABLE} ${TOP}/examples/strip_example.py < ${PROJECT_BINARY_DIR}/html/examples/pyexample/latex/refman.tex > ${PROJECT_BINARY_DIR}/html/examples/pyexample/latex/refman_doc.tex
302+ COMMAND ${Python3_EXECUTABLE} ${TOP}/examples/strip_example.py < ${PROJECT_BINARY_DIR}/html/examples/pyexample/latex/refman.tex > ${PROJECT_BINARY_DIR}/html/examples/pyexample/latex/refman_doc.tex
303 DEPENDS doxygen pyexample.py pyexample.cfg ${TOP}/examples/strip_example.py
304 OUTPUT ${PROJECT_BINARY_DIR}/html/examples/pyexample/html/index.html ${PROJECT_BINARY_DIR}/html/examples/pyexample/latex/refman_doc.tex
305 )
306
307 add_custom_command(
308 COMMAND ${EXECUTABLE_OUTPUT_PATH}/doxygen tclexample.cfg
309- COMMAND ${PYTHON_EXECUTABLE} ${TOP}/examples/strip_example.py < ${PROJECT_BINARY_DIR}/html/examples/tclexample/latex/refman.tex > ${PROJECT_BINARY_DIR}/html/examples/tclexample/latex/refman_doc.tex
310+ COMMAND ${Python3_EXECUTABLE} ${TOP}/examples/strip_example.py < ${PROJECT_BINARY_DIR}/html/examples/tclexample/latex/refman.tex > ${PROJECT_BINARY_DIR}/html/examples/tclexample/latex/refman_doc.tex
311 DEPENDS doxygen tclexample.tcl tclexample.cfg ${TOP}/examples/strip_example.py
312 OUTPUT ${PROJECT_BINARY_DIR}/html/examples/tclexample/html/index.html ${PROJECT_BINARY_DIR}/html/examples/tclexample/latex/refman_doc.tex
313 )
314
315 add_custom_command(
316 COMMAND ${EXECUTABLE_OUTPUT_PATH}/doxygen mux.cfg
317- COMMAND ${PYTHON_EXECUTABLE} ${TOP}/examples/strip_example.py < ${PROJECT_BINARY_DIR}/html/examples/mux/latex/refman.tex > ${PROJECT_BINARY_DIR}/html/examples/mux/latex/refman_doc.tex
318+ COMMAND ${Python3_EXECUTABLE} ${TOP}/examples/strip_example.py < ${PROJECT_BINARY_DIR}/html/examples/mux/latex/refman.tex > ${PROJECT_BINARY_DIR}/html/examples/mux/latex/refman_doc.tex
319 DEPENDS doxygen mux.vhdl mux.cfg ${TOP}/examples/strip_example.py
320 OUTPUT ${PROJECT_BINARY_DIR}/html/examples/mux/html/index.html ${PROJECT_BINARY_DIR}/html/examples/mux/latex/refman_doc.tex
321 )
322
323 add_custom_command(
324 COMMAND ${EXECUTABLE_OUTPUT_PATH}/doxygen manual.cfg
325- COMMAND ${PYTHON_EXECUTABLE} ${TOP}/examples/strip_example.py < ${PROJECT_BINARY_DIR}/html/examples/manual/latex/refman.tex > ${PROJECT_BINARY_DIR}/html/examples/manual/latex/refman_doc.tex
326+ COMMAND ${Python3_EXECUTABLE} ${TOP}/examples/strip_example.py < ${PROJECT_BINARY_DIR}/html/examples/manual/latex/refman.tex > ${PROJECT_BINARY_DIR}/html/examples/manual/latex/refman_doc.tex
327 DEPENDS doxygen manual.c manual.cfg ${TOP}/examples/strip_example.py
328 OUTPUT ${PROJECT_BINARY_DIR}/html/examples/manual/html/index.html ${PROJECT_BINARY_DIR}/html/examples/manual/latex/refman_doc.tex
329 )
330
331 add_custom_command(
332 COMMAND ${EXECUTABLE_OUTPUT_PATH}/doxygen docstring.cfg
333- COMMAND ${PYTHON_EXECUTABLE} ${TOP}/examples/strip_example.py < ${PROJECT_BINARY_DIR}/html/examples/docstring/latex/refman.tex > ${PROJECT_BINARY_DIR}/html/examples/docstring/latex/refman_doc.tex
334+ COMMAND ${Python3_EXECUTABLE} ${TOP}/examples/strip_example.py < ${PROJECT_BINARY_DIR}/html/examples/docstring/latex/refman.tex > ${PROJECT_BINARY_DIR}/html/examples/docstring/latex/refman_doc.tex
335 DEPENDS doxygen docstring.py docstring.cfg ${TOP}/examples/strip_example.py
336 OUTPUT ${PROJECT_BINARY_DIR}/html/examples/docstring/html/index.html ${PROJECT_BINARY_DIR}/html/examples/docstring/latex/refman_doc.tex
337 )
338@@ -249,7 +249,7 @@ add_custom_command(
339 if (DOT) 138 if (DOT)
340 add_custom_command( 139 add_custom_command(
341 COMMAND ${EXECUTABLE_OUTPUT_PATH}/doxygen diagrams.cfg 140 COMMAND ${EXECUTABLE_OUTPUT_PATH}/doxygen diagrams.cfg
@@ -345,7 +144,7 @@ index 967f3d4..a8d1aad 100644
345 OUTPUT ${PROJECT_BINARY_DIR}/html/examples/diagrams/html/index.html ${PROJECT_BINARY_DIR}/html/examples/diagrams/latex/refman_doc.tex 144 OUTPUT ${PROJECT_BINARY_DIR}/html/examples/diagrams/html/index.html ${PROJECT_BINARY_DIR}/html/examples/diagrams/latex/refman_doc.tex
346 ) 145 )
347diff --git a/libmscgen/CMakeLists.txt b/libmscgen/CMakeLists.txt 146diff --git a/libmscgen/CMakeLists.txt b/libmscgen/CMakeLists.txt
348index 079fcfc..e6d86f6 100644 147index 079fcfc8..e6d86f61 100644
349--- a/libmscgen/CMakeLists.txt 148--- a/libmscgen/CMakeLists.txt
350+++ b/libmscgen/CMakeLists.txt 149+++ b/libmscgen/CMakeLists.txt
351@@ -7,7 +7,7 @@ include_directories( 150@@ -7,7 +7,7 @@ include_directories(
@@ -358,76 +157,84 @@ index 079fcfc..e6d86f6 100644
358 OUTPUT ${GENERATED_SRC}/${lex_file}.l.h 157 OUTPUT ${GENERATED_SRC}/${lex_file}.l.h
359 ) 158 )
360diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt 159diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
361index 23460d0..58f679a 100644 160index cb289116..356741ff 100644
362--- a/src/CMakeLists.txt 161--- a/src/CMakeLists.txt
363+++ b/src/CMakeLists.txt 162+++ b/src/CMakeLists.txt
364@@ -35,7 +35,7 @@ set_source_files_properties(${GENERATED_SRC}/settings.h PROPERTIES GENERATED 1) 163@@ -39,7 +39,7 @@ set_source_files_properties(${GENERATED_SRC}/settings.h PROPERTIES GENERATED 1)
365 164
366 # configvalues.h 165 # configvalues.h
367 add_custom_command( 166 add_custom_command(
368- COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_SOURCE_DIR}/src/configgen.py -maph ${CMAKE_SOURCE_DIR}/src/config.xml > ${GENERATED_SRC}/configvalues.h 167- COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_LIST_DIR}/configgen.py -maph ${CMAKE_CURRENT_LIST_DIR}/config.xml > ${GENERATED_SRC}/configvalues.h
369+ COMMAND ${Python3_EXECUTABLE} ${CMAKE_SOURCE_DIR}/src/configgen.py -maph ${CMAKE_SOURCE_DIR}/src/config.xml > ${GENERATED_SRC}/configvalues.h 168+ COMMAND ${Python3_EXECUTABLE} ${CMAKE_CURRENT_LIST_DIR}/configgen.py -maph ${CMAKE_CURRENT_LIST_DIR}/config.xml > ${GENERATED_SRC}/configvalues.h
370 DEPENDS ${CMAKE_SOURCE_DIR}/src/config.xml ${CMAKE_SOURCE_DIR}/src/configgen.py 169 DEPENDS ${CMAKE_CURRENT_LIST_DIR}/config.xml ${CMAKE_CURRENT_LIST_DIR}/configgen.py
371 OUTPUT ${GENERATED_SRC}/configvalues.h 170 OUTPUT ${GENERATED_SRC}/configvalues.h
372 ) 171 )
373@@ -47,7 +47,7 @@ add_custom_target( 172@@ -51,7 +51,7 @@ add_custom_target(
374 173
375 # configvalues.cpp 174 # configvalues.cpp
376 add_custom_command( 175 add_custom_command(
377- COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_SOURCE_DIR}/src/configgen.py -maps ${CMAKE_SOURCE_DIR}/src/config.xml > ${GENERATED_SRC}/configvalues.cpp 176- COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_LIST_DIR}/configgen.py -maps ${CMAKE_CURRENT_LIST_DIR}/config.xml > ${GENERATED_SRC}/configvalues.cpp
378+ COMMAND ${Python3_EXECUTABLE} ${CMAKE_SOURCE_DIR}/src/configgen.py -maps ${CMAKE_SOURCE_DIR}/src/config.xml > ${GENERATED_SRC}/configvalues.cpp 177+ COMMAND ${Python3_EXECUTABLE} ${CMAKE_CURRENT_LIST_DIR}/configgen.py -maps ${CMAKE_CURRENT_LIST_DIR}/config.xml > ${GENERATED_SRC}/configvalues.cpp
379 DEPENDS ${CMAKE_SOURCE_DIR}/src/config.xml ${CMAKE_SOURCE_DIR}/src/configgen.py 178 DEPENDS ${CMAKE_CURRENT_LIST_DIR}/config.xml ${CMAKE_CURRENT_LIST_DIR}/configgen.py
380 OUTPUT ${GENERATED_SRC}/configvalues.cpp 179 OUTPUT ${GENERATED_SRC}/configvalues.cpp
381 ) 180 )
382@@ -55,7 +55,7 @@ set_source_files_properties(${GENERATED_SRC}/configvalues.cpp PROPERTIES GENERAT 181@@ -59,7 +59,7 @@ set_source_files_properties(${GENERATED_SRC}/configvalues.cpp PROPERTIES GENERAT
383 182
384 # configoptions.cpp 183 # configoptions.cpp
385 add_custom_command( 184 add_custom_command(
386- COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_SOURCE_DIR}/src/configgen.py -cpp ${CMAKE_SOURCE_DIR}/src/config.xml > ${GENERATED_SRC}/configoptions.cpp 185- COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_LIST_DIR}/configgen.py -cpp ${CMAKE_CURRENT_LIST_DIR}/config.xml > ${GENERATED_SRC}/configoptions.cpp
387+ COMMAND ${Python3_EXECUTABLE} ${CMAKE_SOURCE_DIR}/src/configgen.py -cpp ${CMAKE_SOURCE_DIR}/src/config.xml > ${GENERATED_SRC}/configoptions.cpp 186+ COMMAND ${Python3_EXECUTABLE} ${CMAKE_CURRENT_LIST_DIR}/configgen.py -cpp ${CMAKE_CURRENT_LIST_DIR}/config.xml > ${GENERATED_SRC}/configoptions.cpp
388 DEPENDS ${CMAKE_SOURCE_DIR}/src/config.xml ${CMAKE_SOURCE_DIR}/src/configgen.py 187 DEPENDS ${CMAKE_CURRENT_LIST_DIR}/config.xml ${CMAKE_CURRENT_LIST_DIR}/configgen.py
389 OUTPUT ${GENERATED_SRC}/configoptions.cpp 188 OUTPUT ${GENERATED_SRC}/configoptions.cpp
390 ) 189 )
391@@ -86,7 +86,7 @@ file(GLOB RESOURCES ${CMAKE_SOURCE_DIR}/templates/*/*) 190@@ -94,7 +94,7 @@ endif()
392 # resources.cpp 191 # resources.cpp
393 add_custom_command( 192 add_custom_command(
394 COMMENT "Generating ${GENERATED_SRC}/resources.cpp" 193 COMMENT "Generating ${GENERATED_SRC}/resources.cpp"
395- COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_SOURCE_DIR}/src/res2cc_cmd.py ${CMAKE_SOURCE_DIR}/templates ${GENERATED_SRC}/resources.cpp 194- COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_LIST_DIR}/res2cc_cmd.py ${CMAKE_SOURCE_DIR}/templates ${GENERATED_SRC}/resources.cpp
396+ COMMAND ${Python3_EXECUTABLE} ${CMAKE_SOURCE_DIR}/src/res2cc_cmd.py ${CMAKE_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
397 DEPENDS ${RESOURCES} 196 DEPENDS ${RESOURCES} ${CMAKE_CURRENT_LIST_DIR}/res2cc_cmd.py
398 OUTPUT ${GENERATED_SRC}/resources.cpp 197 OUTPUT ${GENERATED_SRC}/resources.cpp
399 ) 198 )
400@@ -94,7 +94,7 @@ set_source_files_properties(${GENERATED_SRC}/resources.cpp PROPERTIES GENERATED 199@@ -102,7 +102,7 @@ set_source_files_properties(${GENERATED_SRC}/resources.cpp PROPERTIES GENERATED
401 200
402 # layout_default.xml 201 # layout_default.xml
403 add_custom_command( 202 add_custom_command(
404- COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_SOURCE_DIR}/src/to_c_cmd.py < ${CMAKE_SOURCE_DIR}/src/layout_default.xml > ${GENERATED_SRC}/layout_default.xml.h 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
405+ COMMAND ${Python3_EXECUTABLE} ${CMAKE_SOURCE_DIR}/src/to_c_cmd.py < ${CMAKE_SOURCE_DIR}/src/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
406 DEPENDS ${CMAKE_SOURCE_DIR}/src/layout_default.xml 205 DEPENDS ${CMAKE_CURRENT_LIST_DIR}/layout_default.xml ${CMAKE_CURRENT_LIST_DIR}/to_c_cmd.py
407 OUTPUT ${GENERATED_SRC}/layout_default.xml.h 206 OUTPUT ${GENERATED_SRC}/layout_default.xml.h
408 ) 207 )
409@@ -124,7 +124,7 @@ foreach(lex_file ${LEX_FILES}) 208@@ -131,7 +131,7 @@ foreach(lex_file ${LEX_FILES})
410 set(LEX_FILES_H ${LEX_FILES_H} " " ${GENERATED_SRC}/${lex_file}.l.h CACHE INTERNAL "Stores generated files") 209 set(LEX_FILES_H ${LEX_FILES_H} " " ${GENERATED_SRC}/${lex_file}.l.h CACHE INTERNAL "Stores generated files")
411 set(LEX_FILES_CPP ${LEX_FILES_CPP} " " ${GENERATED_SRC}/${lex_file}.cpp CACHE INTERNAL "Stores generated files") 210 set(LEX_FILES_CPP ${LEX_FILES_CPP} " " ${GENERATED_SRC}/${lex_file}.cpp CACHE INTERNAL "Stores generated files")
412 add_custom_command( 211 add_custom_command(
413- COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_SOURCE_DIR}/src/scan_states.py ${CMAKE_SOURCE_DIR}/src/${lex_file}.l > ${GENERATED_SRC}/${lex_file}.l.h 212- COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_LIST_DIR}/scan_states.py ${CMAKE_CURRENT_LIST_DIR}/${lex_file}.l > ${GENERATED_SRC}/${lex_file}.l.h
414+ COMMAND ${Python3_EXECUTABLE} ${CMAKE_SOURCE_DIR}/src/scan_states.py ${CMAKE_SOURCE_DIR}/src/${lex_file}.l > ${GENERATED_SRC}/${lex_file}.l.h 213+ COMMAND ${Python3_EXECUTABLE} ${CMAKE_CURRENT_LIST_DIR}/scan_states.py ${CMAKE_CURRENT_LIST_DIR}/${lex_file}.l > ${GENERATED_SRC}/${lex_file}.l.h
415 DEPENDS ${CMAKE_SOURCE_DIR}/src/scan_states.py ${CMAKE_SOURCE_DIR}/src/${lex_file}.l 214 DEPENDS ${CMAKE_CURRENT_LIST_DIR}/scan_states.py ${CMAKE_CURRENT_LIST_DIR}/${lex_file}.l
416 OUTPUT ${GENERATED_SRC}/${lex_file}.l.h 215 OUTPUT ${GENERATED_SRC}/${lex_file}.l.h
417 ) 216 )
418diff --git a/testing/CMakeLists.txt b/testing/CMakeLists.txt 217diff --git a/testing/CMakeLists.txt b/testing/CMakeLists.txt
419index 40cb40b..a301acd 100644 218index b354e78f..28d45e11 100644
420--- a/testing/CMakeLists.txt 219--- a/testing/CMakeLists.txt
421+++ b/testing/CMakeLists.txt 220+++ b/testing/CMakeLists.txt
422@@ -1,9 +1,9 @@ 221@@ -1,7 +1,7 @@
222 # run all tests sequentially (keep for backward compatibility)
423 add_custom_target(tests 223 add_custom_target(tests
424 COMMENT "Running doxygen tests..." 224 COMMENT "Running doxygen tests..."
425- 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 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
426+ 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 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
427 DEPENDS doxygen 227 DEPENDS doxygen
428 ) 228 )
429 add_test(NAME suite 229
430- COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_SOURCE_DIR}/testing/runtests.py --doxygen $<TARGET_FILE:doxygen> --inputdir ${CMAKE_SOURCE_DIR}/testing --outputdir ${PROJECT_BINARY_DIR}/testing 230@@ -19,6 +19,6 @@ foreach(TEST_FILE ${TEST_FILES})
431+ COMMAND ${Python3_EXECUTABLE} ${CMAKE_SOURCE_DIR}/testing/runtests.py --doxygen $<TARGET_FILE:doxygen> --inputdir ${CMAKE_SOURCE_DIR}/testing --outputdir ${PROJECT_BINARY_DIR}/testing 231 string(REGEX REPLACE "^.*/([0-9][0-9][0-9]*).*$" "\\1" TEST_ID "${TEST_FILE}")
432 ) 232 # add a test target for each test
433 233 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
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
236 )
237 endforeach()
238--
2392.17.1
240
diff --git a/meta-oe/recipes-devtools/doxygen/doxygen_1.8.17.bb b/meta-oe/recipes-devtools/doxygen/doxygen_1.8.20.bb
index 45de718265..d4ac3b7207 100644
--- a/meta-oe/recipes-devtools/doxygen/doxygen_1.8.17.bb
+++ b/meta-oe/recipes-devtools/doxygen/doxygen_1.8.20.bb
@@ -10,8 +10,8 @@ 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] = "7997a15c73a8bd6d003eaba5c2ee2b47" 13SRC_URI[md5sum] = "8729936a843232a66fe970ef65f3c3e4"
14SRC_URI[sha256sum] = "2cba988af2d495541cbbe5541b3bee0ee11144dcb23a81eada19f5501fd8b599" 14SRC_URI[sha256sum] = "e0db6979286fd7ccd3a99af9f97397f2bae50532e4ecb312aa18862f8401ddec"
15 15
16inherit cmake python3native 16inherit cmake python3native
17 17
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2025-05-21 17:15:39 +0000