diff options
author | Dimitri van Heesch <doxygen@gmail.com> | 2019-05-07 19:05:29 (GMT) |
---|---|---|
committer | Dimitri van Heesch <doxygen@gmail.com> | 2019-05-07 19:05:29 (GMT) |
commit | c7edc00776fccc54b3ad96b218df8843229a5002 (patch) | |
tree | 48de2f3b06d86b84768d4d32c3ceeee97397a894 | |
parent | a216d135700190d0b064c872d5c78a286c3682c4 (diff) | |
parent | a0edd8c583aec5bb65c60eb030ad237f65d52b6c (diff) | |
download | Doxygen-c7edc00776fccc54b3ad96b218df8843229a5002.zip Doxygen-c7edc00776fccc54b3ad96b218df8843229a5002.tar.gz Doxygen-c7edc00776fccc54b3ad96b218df8843229a5002.tar.bz2 |
Merge branch 'master' of github.com:doxygen/doxygen
-rw-r--r-- | .travis.yml | 4 | ||||
-rw-r--r-- | Doxyfile | 1 | ||||
-rw-r--r-- | addon/doxmlparser/Doxyfile | 1 | ||||
-rw-r--r-- | addon/doxmlparser/Doxyfile.impl | 1 | ||||
-rw-r--r-- | addon/doxyapp/CMakeLists.txt | 8 | ||||
-rw-r--r-- | addon/doxyparse/CMakeLists.txt | 8 | ||||
-rw-r--r-- | doc/Doxyfile | 1 | ||||
-rw-r--r-- | examples/tag.cfg | 1 | ||||
-rw-r--r-- | qtools/Doxyfile | 1 | ||||
-rw-r--r-- | src/CMakeLists.txt | 4 | ||||
-rw-r--r-- | src/config.xml | 11 | ||||
-rw-r--r-- | src/doxygen.cpp | 2 | ||||
-rw-r--r-- | src/message.cpp | 14 | ||||
-rw-r--r-- | vhdlparser/CMakeLists.txt | 12 |
14 files changed, 21 insertions, 48 deletions
diff --git a/.travis.yml b/.travis.yml index e6b10c1..8b84cbe 100644 --- a/.travis.yml +++ b/.travis.yml @@ -56,9 +56,7 @@ before_script: if [ "${TRAVIS_OS_NAME}" == "linux" ] && [ ! "${OS_NAME}" == "linux-ppc64le" ]; then printf "[requires] libxml2/2.9.8@bincrafters/stable - libiconv/1.15@bincrafters/stable - [build_requires] - cmake_installer/3.10.0@conan/stable" >> conanfile.txt; + libiconv/1.15@bincrafters/stable" >> conanfile.txt; fi; if [ "${TRAVIS_OS_NAME}" == "osx" ]; then printf "[requires] @@ -276,7 +276,6 @@ GENERATE_TAGFILE = doxygen.tag ALLEXTERNALS = NO EXTERNAL_GROUPS = YES EXTERNAL_PAGES = YES -PERL_PATH = /usr/bin/perl #--------------------------------------------------------------------------- # Configuration options related to the dot tool #--------------------------------------------------------------------------- diff --git a/addon/doxmlparser/Doxyfile b/addon/doxmlparser/Doxyfile index faf4bee..e95ee76 100644 --- a/addon/doxmlparser/Doxyfile +++ b/addon/doxmlparser/Doxyfile @@ -146,7 +146,6 @@ SKIP_FUNCTION_MACROS = YES TAGFILES = ../../qtools_docs/qtools.tag=../../../../qtools_docs/html GENERATE_TAGFILE = ALLEXTERNALS = NO -PERL_PATH = #--------------------------------------------------------------------------- # Configuration options related to the dot tool #--------------------------------------------------------------------------- diff --git a/addon/doxmlparser/Doxyfile.impl b/addon/doxmlparser/Doxyfile.impl index a954db3..88818ab 100644 --- a/addon/doxmlparser/Doxyfile.impl +++ b/addon/doxmlparser/Doxyfile.impl @@ -148,7 +148,6 @@ TAGFILES = ../../qtools_docs/qtools.tag=../../../../qtools_docs/ht GENERATE_TAGFILE = ALLEXTERNALS = NO EXTERNAL_GROUPS = YES -PERL_PATH = #--------------------------------------------------------------------------- # Configuration options related to the dot tool #--------------------------------------------------------------------------- diff --git a/addon/doxyapp/CMakeLists.txt b/addon/doxyapp/CMakeLists.txt index a737711..0aaf465 100644 --- a/addon/doxyapp/CMakeLists.txt +++ b/addon/doxyapp/CMakeLists.txt @@ -1,11 +1,3 @@ -# configvalues.h -add_custom_command( - COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_SOURCE_DIR}/src/configgen.py -maph ${CMAKE_SOURCE_DIR}/src/config.xml > ${GENERATED_SRC}/configvalues.h - DEPENDS ${CMAKE_SOURCE_DIR}/src/config.xml ${CMAKE_SOURCE_DIR}/src/configgen.py - OUTPUT ${GENERATED_SRC}/configvalues.h -) -set_source_files_properties(${GENERATED_SRC}/configvalues.h PROPERTIES GENERATED 1) - find_package(Iconv) include_directories( diff --git a/addon/doxyparse/CMakeLists.txt b/addon/doxyparse/CMakeLists.txt index ff198fb..1620c72 100644 --- a/addon/doxyparse/CMakeLists.txt +++ b/addon/doxyparse/CMakeLists.txt @@ -1,11 +1,3 @@ -# configvalues.h -add_custom_command( - COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_SOURCE_DIR}/src/configgen.py -maph ${CMAKE_SOURCE_DIR}/src/config.xml > ${GENERATED_SRC}/configvalues.h - DEPENDS ${CMAKE_SOURCE_DIR}/src/config.xml ${CMAKE_SOURCE_DIR}/src/configgen.py - OUTPUT ${GENERATED_SRC}/configvalues.h -) -set_source_files_properties(${GENERATED_SRC}/configvalues.h PROPERTIES GENERATED 1) - find_package(Iconv) include_directories( diff --git a/doc/Doxyfile b/doc/Doxyfile index 4c0a19d..7697d70 100644 --- a/doc/Doxyfile +++ b/doc/Doxyfile @@ -45,7 +45,6 @@ EXAMPLE_PATH = ../examples RECURSIVE = NO TAGFILES = ALLEXTERNALS = NO -PERL_PATH = /usr/bin/perl SEARCHENGINE = NO PDF_HYPERLINKS = YES USE_PDFLATEX = YES diff --git a/examples/tag.cfg b/examples/tag.cfg index 823b5a7..12b3c5b 100644 --- a/examples/tag.cfg +++ b/examples/tag.cfg @@ -6,7 +6,6 @@ GENERATE_RTF = NO CASE_SENSE_NAMES = NO INPUT = tag.cpp TAGFILES = example.tag=../../example/html -PERL_PATH = perl QUIET = YES JAVADOC_AUTOBRIEF = YES SEARCHENGINE = NO diff --git a/qtools/Doxyfile b/qtools/Doxyfile index af84df1..109d3dc 100644 --- a/qtools/Doxyfile +++ b/qtools/Doxyfile @@ -280,7 +280,6 @@ GENERATE_TAGFILE = ../qtools_docs/qtools.tag ALLEXTERNALS = NO EXTERNAL_GROUPS = YES EXTERNAL_PAGES = YES -PERL_PATH = /usr/bin/perl #--------------------------------------------------------------------------- # Configuration options related to the dot tool #--------------------------------------------------------------------------- diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 92a302a..37a21ff 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -43,6 +43,10 @@ add_custom_command( OUTPUT ${GENERATED_SRC}/configvalues.h ) set_source_files_properties(${GENERATED_SRC}/configvalues.h PROPERTIES GENERATED 1) +add_custom_target( + generate_configvalues_header + DEPENDS ${GENERATED_SRC}/configvalues.h +) # configvalues.cpp add_custom_command( diff --git a/src/config.xml b/src/config.xml index 8820fe7..0b26571 100644 --- a/src/config.xml +++ b/src/config.xml @@ -105,7 +105,6 @@ PROJECT_NAME = Example INPUT = example.cc example.h WARNINGS = YES TAGFILES = qt.tag -PERL_PATH = /usr/local/bin/perl SEARCHENGINE = NO \endverbatim @@ -120,7 +119,6 @@ INPUT = examples/examples.doc src FILE_PATTERNS = *.cc *.h INCLUDE_PATH = examples TAGFILES = qt.tag -PERL_PATH = /usr/bin/perl SEARCHENGINE = YES \endverbatim @@ -3229,14 +3227,6 @@ where `loc1` and `loc2` can be relative or absolute paths or URLs. ]]> </docs> </option> - <option type='string' id='PERL_PATH' format='file' defval='/usr/bin/perl' abspath='1'> - <docs> -<![CDATA[ - The \c PERL_PATH should be the absolute path and name of the perl script - interpreter (i.e. the result of `'which perl'`). -]]> - </docs> - </option> </group> <group name='Dot' docs='Configuration options related to the dot tool'> <option type='bool' id='CLASS_DIAGRAMS' defval='1'> @@ -3639,5 +3629,6 @@ remove the intermediate dot files that are used to generate the various graphs. <option type='obsolete' id='SYMBOL_CACHE_SIZE'/> <option type='obsolete' id='XML_SCHEMA'/> <option type='obsolete' id='XML_DTD'/> + <option type='obsolete' id='PERL_PATH'/> </group> </doxygenconfig> diff --git a/src/doxygen.cpp b/src/doxygen.cpp index 4fcd157..dd32a8e 100644 --- a/src/doxygen.cpp +++ b/src/doxygen.cpp @@ -5614,7 +5614,7 @@ static bool findGlobalMember(Entry *root, warnMsg+=" '"; warnMsg+=substitute(md->declaration(),"%","%%"); warnMsg+="' at line "+QCString().setNum(md->getDefLine())+ - " of file"+md->getDefFileName()+"\n"; + " of file "+md->getDefFileName()+"\n"; } } warn(root->fileName,root->startLine,warnMsg); diff --git a/src/message.cpp b/src/message.cpp index 2f3a06f..2e3e41a 100644 --- a/src/message.cpp +++ b/src/message.cpp @@ -167,17 +167,25 @@ static void format_warn(const char *file,int line,const char *text) static void do_warn(bool enabled, const char *file, int line, const char *prefix, const char *fmt, va_list args) { if (!enabled) return; // warning type disabled - const int bufSize = 40960; - char text[bufSize]; int l=0; if (prefix) { - qstrncpy(text,prefix,bufSize); l=strlen(prefix); } + // determine needed buffersize based on: + // format + arguments + // prefix + // 1 position for `\0` + int bufSize = vsnprintf(NULL, 0, fmt, args) + l + 1; + char *text = (char *)malloc(sizeof(char) * bufSize); + if (prefix) + { + qstrncpy(text,prefix,bufSize); + } vsnprintf(text+l, bufSize-l, fmt, args); text[bufSize-1]='\0'; format_warn(file,line,text); + free(text); } void warn(const char *file,int line,const char *fmt, ...) diff --git a/vhdlparser/CMakeLists.txt b/vhdlparser/CMakeLists.txt index 71e97df..f89008c 100644 --- a/vhdlparser/CMakeLists.txt +++ b/vhdlparser/CMakeLists.txt @@ -1,14 +1,5 @@ -# configvalues.h -add_custom_command( - COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_SOURCE_DIR}/src/configgen.py -maph ${CMAKE_SOURCE_DIR}/src/config.xml > ${GENERATED_SRC}/configvalues.h - DEPENDS ${CMAKE_SOURCE_DIR}/src/config.xml ${CMAKE_SOURCE_DIR}/src/configgen.py - OUTPUT ${GENERATED_SRC}/configvalues.h -) -set_source_files_properties(${GENERATED_SRC}/configvalues.h PROPERTIES GENERATED 1) - include_directories(${CMAKE_SOURCE_DIR}/src ${CMAKE_SOURCE_DIR}/qtools ${GENERATED_SRC}) add_library(vhdlparser STATIC -${GENERATED_SRC}/configvalues.h CharStream.cc ParseException.cc Token.cc @@ -17,3 +8,6 @@ VhdlParser.cc VhdlParserTokenManager.cc VhdlParserIF.cpp ) +add_dependencies(vhdlparser + generate_configvalues_header +) |