From ad07839db90b8d7239cb355e2fc4df93ae971981 Mon Sep 17 00:00:00 2001 From: Alex Fabijanic Date: Mon, 5 Feb 2024 19:04:21 +0100 Subject: [PATCH] fix(CppParser): Documentation generation (some minor fixes, WiP) #4441 --- PocoDoc/cfg/mkdoc-poco.xml | 5 ++++- PocoDoc/src/DocWriter.cpp | 2 -- release/script/mkrelease | 1 - 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/PocoDoc/cfg/mkdoc-poco.xml b/PocoDoc/cfg/mkdoc-poco.xml index 31669d789..e74b2081d 100644 --- a/PocoDoc/cfg/mkdoc-poco.xml +++ b/PocoDoc/cfg/mkdoc-poco.xml @@ -7,6 +7,7 @@ ${PocoBuild}/*/include/Poco/*/*/*.h ${PocoBuild}/*/include/Poco/*/*.h ${PocoBuild}/*/*/include/Poco/*/*/*.h + ${PocoBuild}/Data/src/sql-parser/*.h *_*.h, @@ -31,12 +32,14 @@ g++ ${Includes}, + -I${PocoBase}/Data/src, + -I/usr/local/ssl/include, -I/usr/local/mysql/include, -I/usr/include/mysql, -D_DEBUG, -E, -C, - -DPOCO_NO_WINDOWS_H, + -DPOCO_NO_WINDOWS_H, -DPOCO_NO_GCC_API_ATTRIBUTE, -xc++ diff --git a/PocoDoc/src/DocWriter.cpp b/PocoDoc/src/DocWriter.cpp index ba84c41e5..335f155ea 100644 --- a/PocoDoc/src/DocWriter.cpp +++ b/PocoDoc/src/DocWriter.cpp @@ -2359,7 +2359,6 @@ void DocWriter::writeTOC(std::ostream& ostr, const TOC& toc) { ostr << "
" << std::endl; ostr << "
  • " << tr("TOC") << std::endl; - int lastLevel = 0; std::vector levelStack; levelStack.push_back(0); for (TOC::const_iterator it = toc.begin(); it != toc.end(); ++it) @@ -2384,7 +2383,6 @@ void DocWriter::writeTOC(std::ostream& ostr, const TOC& toc) ostr << "
  • " << std::endl; } ostr << "
  • id << "\">" << htmlize(it->title) << "" << std::endl; - lastLevel = level; } while (!levelStack.empty()) { diff --git a/release/script/mkrelease b/release/script/mkrelease index a9f46a190..37a702695 100755 --- a/release/script/mkrelease +++ b/release/script/mkrelease @@ -85,7 +85,6 @@ mkdir -p ${target}/cmake # echo ${version} "(`date +%Y-%m-%d`)" >${target}/VERSION cp ${POCO_BASE}/LICENSE ${target} -cp ${POCO_BASE}/NEWS ${target} cp ${POCO_BASE}/README ${target} cp ${POCO_BASE}/CHANGELOG ${target} cp ${POCO_BASE}/CONTRIBUTORS ${target}