From 00ec3b11303b16afc6204462b7a29220ea49bd11 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= Date: Mon, 18 May 2020 18:52:19 +0200 Subject: [PATCH] Add a patch to fix generation of user-documentation --- ...tree_build_for_Doxygen_documentation.patch | 59 +++++++++++++++++++ json-c.spec | 2 + 2 files changed, 61 insertions(+) create mode 100644 json-c-0.14-cmake_fix_out_of_tree_build_for_Doxygen_documentation.patch diff --git a/json-c-0.14-cmake_fix_out_of_tree_build_for_Doxygen_documentation.patch b/json-c-0.14-cmake_fix_out_of_tree_build_for_Doxygen_documentation.patch new file mode 100644 index 0000000..b3fb32f --- /dev/null +++ b/json-c-0.14-cmake_fix_out_of_tree_build_for_Doxygen_documentation.patch @@ -0,0 +1,59 @@ +From 8f3592b3d59874b4dd230a741fad3ffa99223a45 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= +Date: Mon, 18 May 2020 18:20:01 +0200 +Subject: [PATCH] CMake: Fix out-of-tree build for Doxygen documentation. + +--- + CMakeLists.txt | 9 +++++---- + Doxyfile => Doxyfile.in | 4 ++-- + 2 files changed, 7 insertions(+), 6 deletions(-) + rename Doxyfile => Doxyfile.in (99%) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 901eb6e364..f58301c71a 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -368,13 +368,14 @@ option(BUILD_DOCUMENTATION "Create and install the HTML based API documentation( + + if (DOXYGEN_FOUND) + ++ configure_file(${PROJECT_SOURCE_DIR}/Doxyfile.in ++ ${PROJECT_BINARY_DIR}/Doxyfile) ++ message(STATUS "Written ${PROJECT_BINARY_DIR}/Doxyfile") ++ + add_custom_target(doc +- COMMAND ${DOXYGEN_EXECUTABLE} ${PROJECT_SOURCE_DIR}/Doxyfile ++ COMMAND ${DOXYGEN_EXECUTABLE} ${PROJECT_BINARY_DIR}/Doxyfile + WORKING_DIRECTORY ${PROJECT_BINARY_DIR}) + +- # request to configure the file +- configure_file(Doxyfile Doxyfile) +- + else (DOXYGEN_FOUND) + message("Warning: doxygen not found, the 'doc' target will not be included") + endif(DOXYGEN_FOUND) +diff --git a/Doxyfile b/Doxyfile.in +similarity index 99% +rename from Doxyfile +rename to Doxyfile.in +index 06d54e661e..42a08535c2 100644 +--- a/Doxyfile ++++ b/Doxyfile.in +@@ -38,7 +38,7 @@ PROJECT_NAME = json-c + # could be handy for archiving the generated documentation or if some version + # control system is used. + +-PROJECT_NUMBER = 0.14 ++PROJECT_NUMBER = @PROJECT_VERSION@ + + # Using the PROJECT_BRIEF tag one can provide an optional one line description + # for a project that appears at the top of each page and should give viewer a +@@ -753,7 +753,7 @@ WARN_LOGFILE = + # spaces. + # Note: If this tag is empty the current directory is searched. + +-INPUT = ++INPUT = @CMAKE_SOURCE_DIR@ @CMAKE_BINARY_DIR@ + + # This tag can be used to specify the character encoding of the source files + # that doxygen parses. Internally doxygen uses the UTF-8 encoding. Doxygen uses diff --git a/json-c.spec b/json-c.spec index 7c623c2..b85b249 100644 --- a/json-c.spec +++ b/json-c.spec @@ -38,6 +38,7 @@ Patch0001: %{url}/commit/228881c8fc287182f284a58d8279a32fbeae0b7f.patch#/%{ Patch0002: %{url}/pull/603.patch#/%{name}-0.14-backport_fixes_from_master.patch Patch0003: %{url}/commit/003b58782b12798da3da8b952152988a88dfb532.patch#/%{name}-0.14-fix_usage_of_errno_in_json_parse_uint64.patch Patch0004: %{url}/pull/618.patch#/%{name}-0.14-test_deep_copy_fix_assertion_value.patch +Patch0005: %{url}/pull/619.patch#/%{name}-0.14-cmake_fix_out_of_tree_build_for_Doxygen_documentation.patch BuildRequires: cmake BuildRequires: gcc @@ -136,6 +137,7 @@ popd %changelog * Mon May 18 2020 Björn Esser - 0.14-4 - Add a patch to fix a test +- Add a patch to fix generation of user-documentation * Mon May 11 2020 Björn Esser - 0.14-3 - Add upstream patch fixing usage of errno in json_parse_uint64()