mirrors/meta-openembedded
1
0
Fork 0
mirror of https://github.com/openembedded/meta-openembedded.git synced 2026-06-03 14:19:52 +00:00
Code Issues Projects Releases Wiki Activity

doxygen: upgrade 1.9.2 -> 1.9.3

Browse Source 
refresh doxygen-native-only-check-python3.patch

Signed-off-by: Wang Mingyu <wangmy@fujitsu.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
wangmy
2022-01-07 22:27:34 +08:00
committed by Khem Raj
parent f16f628d1f
commit 9a74f83974
2 changed files with 22 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta-oe/recipes-devtools/doxygen/doxygen/doxygen-native-only-check-python3.patch
+21 -23
View File
@@ -1,4 +1,4 @@
From 7aeee92c752f8a4b2524ed6a41d60c1a3ca8bf2d Mon Sep 17 00:00:00 2001 From daf686508f2ee4711d93e96e5b100e50bf161656 Mon Sep 17 00:00:00 2001
From: Leon Anavi <leon.anavi@konsulko.com> From: Leon Anavi <leon.anavi@konsulko.com>
Date: Wed, 26 Aug 2020 10:52:10 +0300 Date: Wed, 26 Aug 2020 10:52:10 +0300
Subject: [PATCH] doxygen: Fix Python issues for doxygen-native Subject: [PATCH] doxygen: Fix Python issues for doxygen-native
@@ -39,6 +39,7 @@ Upstream-Status: Inappropriate[oe specific]
Co-Authored-By: Kai Kang <kai.kang@windriver.com> Co-Authored-By: Kai Kang <kai.kang@windriver.com>
Signed-off-by: Leon Anavi <leon.anavi@konsulko.com> Signed-off-by: Leon Anavi <leon.anavi@konsulko.com>
Signed-off-by: Randy MacLeod <Randy.MacLeod@windriver.com> Signed-off-by: Randy MacLeod <Randy.MacLeod@windriver.com>
--- ---
CMakeLists.txt | 2 +- CMakeLists.txt | 2 +-
addon/doxywizard/CMakeLists.txt | 6 +++--- addon/doxywizard/CMakeLists.txt | 6 +++---
@@ -50,10 +51,10 @@ Signed-off-by: Randy MacLeod <Randy.MacLeod@windriver.com>
7 files changed, 17 insertions(+), 17 deletions(-) 7 files changed, 17 insertions(+), 17 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt diff --git a/CMakeLists.txt b/CMakeLists.txt
index f30b46b8..50f211c8 100644 index 2455793..28f0d83 100644
--- a/CMakeLists.txt --- a/CMakeLists.txt
+++ b/CMakeLists.txt +++ b/CMakeLists.txt
@@ -101,7 +101,7 @@ else () @@ -105,7 +105,7 @@ else ()
endif () endif ()
find_program(DOT NAMES dot) find_program(DOT NAMES dot)
@@ -63,10 +64,10 @@ index f30b46b8..50f211c8 100644
find_package(BISON REQUIRED) find_package(BISON REQUIRED)
if (BISON_VERSION VERSION_LESS 2.7) if (BISON_VERSION VERSION_LESS 2.7)
diff --git a/addon/doxywizard/CMakeLists.txt b/addon/doxywizard/CMakeLists.txt diff --git a/addon/doxywizard/CMakeLists.txt b/addon/doxywizard/CMakeLists.txt
index a6f65f8d..d163aa5b 100644 index 63ac8e3..d37d1d0 100644
--- a/addon/doxywizard/CMakeLists.txt --- a/addon/doxywizard/CMakeLists.txt
+++ b/addon/doxywizard/CMakeLists.txt +++ b/addon/doxywizard/CMakeLists.txt
@@ -58,7 +58,7 @@ set_source_files_properties(${GENERATED_SRC_WIZARD}/settings.h PROPERTIES GENERA @@ -57,7 +57,7 @@ set_source_files_properties(${GENERATED_SRC_WIZARD}/settings.h PROPERTIES GENERA
# generate version.cpp # generate version.cpp
add_custom_command( add_custom_command(
@@ -75,7 +76,7 @@ index a6f65f8d..d163aa5b 100644
DEPENDS ${PROJECT_SOURCE_DIR}/VERSION ${PROJECT_SOURCE_DIR}/src/version.py DEPENDS ${PROJECT_SOURCE_DIR}/VERSION ${PROJECT_SOURCE_DIR}/src/version.py
OUTPUT ${GENERATED_SRC_WIZARD}/version.cpp OUTPUT ${GENERATED_SRC_WIZARD}/version.cpp
) )
@@ -66,7 +66,7 @@ set_source_files_properties(${GENERATED_SRC_WIZARD}/version.cpp PROPERTIES GENER @@ -65,7 +65,7 @@ set_source_files_properties(${GENERATED_SRC_WIZARD}/version.cpp PROPERTIES GENER
# generate configdoc.cpp # generate configdoc.cpp
add_custom_command( add_custom_command(
@@ -84,7 +85,7 @@ index a6f65f8d..d163aa5b 100644
DEPENDS ${PROJECT_SOURCE_DIR}/src/configgen.py ${PROJECT_SOURCE_DIR}/src/config.xml DEPENDS ${PROJECT_SOURCE_DIR}/src/configgen.py ${PROJECT_SOURCE_DIR}/src/config.xml
OUTPUT ${GENERATED_SRC_WIZARD}/configdoc.cpp OUTPUT ${GENERATED_SRC_WIZARD}/configdoc.cpp
) )
@@ -75,7 +75,7 @@ set_source_files_properties(${GENERATED_SRC_WIZARD}/configdoc.cpp PROPERTIES GEN @@ -74,7 +74,7 @@ set_source_files_properties(${GENERATED_SRC_WIZARD}/configdoc.cpp PROPERTIES GEN
set(LEX_FILES config_doxyw) set(LEX_FILES config_doxyw)
foreach(lex_file ${LEX_FILES}) foreach(lex_file ${LEX_FILES})
add_custom_command( add_custom_command(
@@ -94,10 +95,10 @@ index a6f65f8d..d163aa5b 100644
OUTPUT ${GENERATED_SRC_WIZARD}/${lex_file}.l.h OUTPUT ${GENERATED_SRC_WIZARD}/${lex_file}.l.h
) )
diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt
index f2d177ed..22a4d602 100644 index ec63ceb..49a2bda 100644
--- a/doc/CMakeLists.txt --- a/doc/CMakeLists.txt
+++ b/doc/CMakeLists.txt +++ b/doc/CMakeLists.txt
@@ -163,7 +163,7 @@ configure_file(${PROJECT_SOURCE_DIR}/doc/doxyindexer.1 ${PROJECT_BINARY_DIR @@ -168,7 +168,7 @@ configure_file(${PROJECT_SOURCE_DIR}/doc/doxyindexer.1 ${PROJECT_BINARY_DIR
# doc/language.doc (see tag Doxyfile:INPUT) # doc/language.doc (see tag Doxyfile:INPUT)
add_custom_command( add_custom_command(
@@ -106,7 +107,7 @@ index f2d177ed..22a4d602 100644
DEPENDS ${PROJECT_SOURCE_DIR}/doc/maintainers.txt ${PROJECT_SOURCE_DIR}/doc/language.tpl ${PROJECT_BINARY_DIR}/doc/translator.py ${LANG_FILES} DEPENDS ${PROJECT_SOURCE_DIR}/doc/maintainers.txt ${PROJECT_SOURCE_DIR}/doc/language.tpl ${PROJECT_BINARY_DIR}/doc/translator.py ${LANG_FILES}
OUTPUT language.doc OUTPUT language.doc
WORKING_DIRECTORY ${PROJECT_BINARY_DIR}/doc WORKING_DIRECTORY ${PROJECT_BINARY_DIR}/doc
@@ -172,7 +172,7 @@ set_source_files_properties(language.doc PROPERTIES GENERATED 1) @@ -177,7 +177,7 @@ set_source_files_properties(language.doc PROPERTIES GENERATED 1)
# doc/config.doc (see tag Doxyfile:INPUT) # doc/config.doc (see tag Doxyfile:INPUT)
add_custom_command( add_custom_command(
@@ -115,7 +116,7 @@ index f2d177ed..22a4d602 100644
DEPENDS ${TOP}/src/config.xml ${TOP}/src/configgen.py DEPENDS ${TOP}/src/config.xml ${TOP}/src/configgen.py
OUTPUT config.doc OUTPUT config.doc
WORKING_DIRECTORY ${PROJECT_BINARY_DIR}/doc/ WORKING_DIRECTORY ${PROJECT_BINARY_DIR}/doc/
@@ -223,7 +223,7 @@ add_custom_target(docs_chm @@ -228,7 +228,7 @@ add_custom_target(docs_chm
COMMAND ${CMAKE_COMMAND} -E echo " for file in files:" >> ${PROJECT_BINARY_DIR}/chm/doxygen_manual_examples_chm.py COMMAND ${CMAKE_COMMAND} -E echo " for file in files:" >> ${PROJECT_BINARY_DIR}/chm/doxygen_manual_examples_chm.py
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 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
COMMAND ${CMAKE_COMMAND} -E echo " print(os.path.join(root, file))" >> ${PROJECT_BINARY_DIR}/chm/doxygen_manual_examples_chm.py COMMAND ${CMAKE_COMMAND} -E echo " print(os.path.join(root, file))" >> ${PROJECT_BINARY_DIR}/chm/doxygen_manual_examples_chm.py
@@ -125,7 +126,7 @@ index f2d177ed..22a4d602 100644
COMMAND ${CMAKE_COMMAND} -E rename ${PROJECT_BINARY_DIR}/chm/index.chm ${PROJECT_BINARY_DIR}/chm/doxygen_manual.chm COMMAND ${CMAKE_COMMAND} -E rename ${PROJECT_BINARY_DIR}/chm/index.chm ${PROJECT_BINARY_DIR}/chm/doxygen_manual.chm
DEPENDS ${PROJECT_BINARY_DIR}/doc/language.doc ${PROJECT_BINARY_DIR}/doc/config.doc DEPENDS ${PROJECT_BINARY_DIR}/doc/language.doc ${PROJECT_BINARY_DIR}/doc/config.doc
diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt
index 194b4271..248b8076 100644 index 194b427..248b807 100644
--- a/examples/CMakeLists.txt --- a/examples/CMakeLists.txt
+++ b/examples/CMakeLists.txt +++ b/examples/CMakeLists.txt
@@ -54,7 +54,7 @@ foreach (f_inp ${BASIC_EXAMPLES}) @@ -54,7 +54,7 @@ foreach (f_inp ${BASIC_EXAMPLES})
@@ -147,7 +148,7 @@ index 194b4271..248b8076 100644
OUTPUT ${PROJECT_BINARY_DIR}/html/examples/diagrams/html/index.html ${PROJECT_BINARY_DIR}/latex/examples/diagrams/latex/refman_doc.tex OUTPUT ${PROJECT_BINARY_DIR}/html/examples/diagrams/html/index.html ${PROJECT_BINARY_DIR}/latex/examples/diagrams/latex/refman_doc.tex
) )
diff --git a/libmscgen/CMakeLists.txt b/libmscgen/CMakeLists.txt diff --git a/libmscgen/CMakeLists.txt b/libmscgen/CMakeLists.txt
index 0a239008..09849e2d 100644 index 34cf4d8..f015afc 100644
--- a/libmscgen/CMakeLists.txt --- a/libmscgen/CMakeLists.txt
+++ b/libmscgen/CMakeLists.txt +++ b/libmscgen/CMakeLists.txt
@@ -7,7 +7,7 @@ include_directories( @@ -7,7 +7,7 @@ include_directories(
@@ -160,10 +161,10 @@ index 0a239008..09849e2d 100644
OUTPUT ${GENERATED_SRC}/${lex_file}.l.h OUTPUT ${GENERATED_SRC}/${lex_file}.l.h
) )
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 5004a957..68e803f2 100644 index 0e0c5f7..c1d3ca5 100644
--- a/src/CMakeLists.txt --- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt +++ b/src/CMakeLists.txt
@@ -39,7 +39,7 @@ set_source_files_properties(${GENERATED_SRC}/settings.h PROPERTIES GENERATED 1) @@ -40,7 +40,7 @@ set_source_files_properties(${GENERATED_SRC}/settings.h PROPERTIES GENERATED 1)
# configvalues.h # configvalues.h
add_custom_command( add_custom_command(
@@ -172,7 +173,7 @@ index 5004a957..68e803f2 100644
DEPENDS ${CMAKE_CURRENT_LIST_DIR}/config.xml ${CMAKE_CURRENT_LIST_DIR}/configgen.py DEPENDS ${CMAKE_CURRENT_LIST_DIR}/config.xml ${CMAKE_CURRENT_LIST_DIR}/configgen.py
OUTPUT ${GENERATED_SRC}/configvalues.h OUTPUT ${GENERATED_SRC}/configvalues.h
) )
@@ -51,7 +51,7 @@ add_custom_target( @@ -52,7 +52,7 @@ add_custom_target(
# configvalues.cpp # configvalues.cpp
add_custom_command( add_custom_command(
@@ -181,7 +182,7 @@ index 5004a957..68e803f2 100644
DEPENDS ${CMAKE_CURRENT_LIST_DIR}/config.xml ${CMAKE_CURRENT_LIST_DIR}/configgen.py DEPENDS ${CMAKE_CURRENT_LIST_DIR}/config.xml ${CMAKE_CURRENT_LIST_DIR}/configgen.py
OUTPUT ${GENERATED_SRC}/configvalues.cpp OUTPUT ${GENERATED_SRC}/configvalues.cpp
) )
@@ -59,7 +59,7 @@ set_source_files_properties(${GENERATED_SRC}/configvalues.cpp PROPERTIES GENERAT @@ -60,7 +60,7 @@ set_source_files_properties(${GENERATED_SRC}/configvalues.cpp PROPERTIES GENERAT
# configoptions.cpp # configoptions.cpp
add_custom_command( add_custom_command(
@@ -190,7 +191,7 @@ index 5004a957..68e803f2 100644
DEPENDS ${CMAKE_CURRENT_LIST_DIR}/config.xml ${CMAKE_CURRENT_LIST_DIR}/configgen.py DEPENDS ${CMAKE_CURRENT_LIST_DIR}/config.xml ${CMAKE_CURRENT_LIST_DIR}/configgen.py
OUTPUT ${GENERATED_SRC}/configoptions.cpp OUTPUT ${GENERATED_SRC}/configoptions.cpp
) )
@@ -94,7 +94,7 @@ endif() @@ -95,7 +95,7 @@ endif()
# resources.cpp # resources.cpp
add_custom_command( add_custom_command(
COMMENT "Generating ${GENERATED_SRC}/resources.cpp" COMMENT "Generating ${GENERATED_SRC}/resources.cpp"
@@ -199,7 +200,7 @@ index 5004a957..68e803f2 100644
DEPENDS ${RESOURCES} ${CMAKE_CURRENT_LIST_DIR}/res2cc_cmd.py DEPENDS ${RESOURCES} ${CMAKE_CURRENT_LIST_DIR}/res2cc_cmd.py
OUTPUT ${GENERATED_SRC}/resources.cpp OUTPUT ${GENERATED_SRC}/resources.cpp
) )
@@ -124,7 +124,7 @@ foreach(lex_file ${LEX_FILES}) @@ -126,7 +126,7 @@ foreach(lex_file ${LEX_FILES})
set(LEX_FILES_H ${LEX_FILES_H} " " ${GENERATED_SRC}/${lex_file}.l.h CACHE INTERNAL "Stores generated files") set(LEX_FILES_H ${LEX_FILES_H} " " ${GENERATED_SRC}/${lex_file}.l.h CACHE INTERNAL "Stores generated files")
set(LEX_FILES_CPP ${LEX_FILES_CPP} " " ${GENERATED_SRC}/${lex_file}.cpp CACHE INTERNAL "Stores generated files") set(LEX_FILES_CPP ${LEX_FILES_CPP} " " ${GENERATED_SRC}/${lex_file}.cpp CACHE INTERNAL "Stores generated files")
add_custom_command( add_custom_command(
@@ -209,7 +210,7 @@ index 5004a957..68e803f2 100644
OUTPUT ${GENERATED_SRC}/${lex_file}.l.h OUTPUT ${GENERATED_SRC}/${lex_file}.l.h
) )
diff --git a/testing/CMakeLists.txt b/testing/CMakeLists.txt diff --git a/testing/CMakeLists.txt b/testing/CMakeLists.txt
index fd6912e9..0af1865b 100644 index fd6912e..0af1865 100644
--- a/testing/CMakeLists.txt --- a/testing/CMakeLists.txt
+++ b/testing/CMakeLists.txt +++ b/testing/CMakeLists.txt
@@ -1,7 +1,7 @@ @@ -1,7 +1,7 @@
@@ -229,6 +230,3 @@ index fd6912e9..0af1865b 100644
+ 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 + 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
) )
endforeach() endforeach()
--
2.27.0
meta-oe/recipes-devtools/doxygen/doxygen_1.9.2.bb → meta-oe/recipes-devtools/doxygen/doxygen_1.9.3.bb
+1 -1
View File
@@ -10,7 +10,7 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/${BP}.src.tar.gz \
file://0001-build-don-t-look-for-Iconv.patch \ file://0001-build-don-t-look-for-Iconv.patch \
" "
SRC_URI:append:class-native = " file://doxygen-native-only-check-python3.patch" SRC_URI:append:class-native = " file://doxygen-native-only-check-python3.patch"
SRC_URI[sha256sum] = "060f254bcef48673cc7ccf542736b7455b67c110b30fdaa33512a5b09bbecee5" SRC_URI[sha256sum] = "f352dbc3221af7012b7b00935f2dfdc9fb67a97d43287d2f6c81c50449d254e0"
inherit cmake python3native inherit cmake python3native