From a65b883ee4bf1831f586218430470f0a493bbe5a Mon Sep 17 00:00:00 2001 From: DongHun Kwak Date: Fri, 15 Oct 2021 10:51:39 +0900 Subject: [PATCH] Imported Upstream version 1.8.8 --- .gitignore | 2 + Doxyfile | 50 +- INSTALL | 4 +- Makefile.in | 7 +- addon/doxywizard/doxywizard.cpp | 22 +- addon/doxywizard/doxywizard.h | 3 + addon/doxywizard/doxywizard.pro.in | 5 +- addon/doxywizard/expert.cpp | 22 +- addon/doxywizard/expert.h | 2 + addon/doxywizard/inputstring.cpp | 2 +- addon/doxywizard/wizard.cpp | 18 +- addon/doxywizard/wizard.h | 3 + configure | 37 +- doc/Makefile.in | 2 +- doc/changelog.doc | 1775 +-- doc/commands.doc | 75 + doc/customize.doc | 4 +- doc/docblocks.doc | 23 +- doc/faq.doc | 51 +- doc/htmlcmds.doc | 16 +- doc/install.doc | 3 +- doc/translator.py | 4032 ++++--- qtools/Doxyfile | 4 +- qtools/qstring.cpp | 7 +- src/Makefile.in | 3 +- src/cite.cpp | 141 +- src/classdef.cpp | 29 +- src/classdef.h | 5 + src/classlist.cpp | 13 +- src/cmdmapper.cpp | 2 + src/cmdmapper.h | 4 +- src/code.l | 156 +- src/commentcnv.l | 6 +- src/commentscan.l | 28 +- src/compound.xsd | 14 +- src/config.l | 31 + src/config.xml | 51 +- src/configgen.py | 328 +- src/context.cpp | 4055 ++++--- src/context.h | 178 +- src/definition.cpp | 20 +- src/definition.h | 2 +- src/docbookgen.cpp | 155 +- src/docbookvisitor.cpp | 209 +- src/docbookvisitor.h | 1 + src/docparser.cpp | 45 +- src/docparser.h | 4 +- src/doctokenizer.h | 1 + src/doctokenizer.l | 36 +- src/dot.cpp | 211 +- src/dot.h | 16 +- src/doxygen.cpp | 165 +- src/doxygen.pro.in | 12 +- src/doxygen.sty | 10 + src/entry.h | 5 + src/filedef.cpp | 8 + src/fileparser.cpp | 51 + src/fileparser.h | 50 + src/fortrancode.l | 114 +- src/fortranscanner.l | 10 +- src/groupdef.cpp | 7 + src/groupdef.h | 3 + src/htmldocvisitor.cpp | 54 +- src/htmldocvisitor.h | 1 + src/htmlentity.cpp | 2 +- src/htmlgen.cpp | 42 +- src/index.cpp | 42 +- src/lang_cfg.py | 8 +- src/languages.py | 12 +- src/latexdocvisitor.cpp | 54 +- src/latexdocvisitor.h | 1 + src/latexgen.cpp | 20 +- src/libdoxygen.pro.in | 18 +- src/libdoxygen.t.in | 8 - src/mandocvisitor.cpp | 1 + src/mangen.cpp | 2 +- src/markdown.cpp | 12 +- src/memberdef.cpp | 89 +- src/memberdef.h | 10 + src/message.cpp | 6 +- src/namespacedef.h | 2 + src/outputlist.cpp | 1 - src/parserintf.h | 10 +- src/perlmodgen.cpp | 3 +- src/plantuml.cpp | 97 + src/plantuml.h | 40 + src/portable_c.c | 6 + src/pre.l | 16 +- src/printdocvisitor.h | 9 +- src/rtfdocvisitor.cpp | 38 +- src/rtfdocvisitor.h | 1 + src/rtfgen.cpp | 8 +- src/scanner.l | 33 +- src/tagreader.cpp | 3 +- src/tclscanner.l | 552 +- src/template.cpp | 571 +- src/template.h | 25 + src/translator_en.h | 2 +- src/util.cpp | 110 +- src/util.h | 2 + src/vhdlcode.l | 2 + src/vhdldocgen.cpp | 618 +- src/vhdldocgen.h | 7 +- src/vhdljjparser.cpp | 828 ++ src/vhdljjparser.h | 102 + src/vhdlparser.y | 2641 ----- src/vhdlscanner.h | 147 - src/vhdlscanner.l | 1001 -- src/xmldocvisitor.cpp | 16 +- src/xmlgen.cpp | 39 +- testing/021/indexpage.xml | 2 +- testing/021_dontinclude.cpp | 2 +- testing/057/057__caller__graphs_8tcl.xml | 92 + testing/057/__057__caller__graphs_8tcl.xml | 28 + testing/057/namespace1.xml | 113 + testing/057/namespace1_1_11.xml | 28 + testing/057/namespace1_1_11_1_11.xml | 26 + testing/057/namespace2.xml | 30 + testing/057/namespace2_1_12.xml | 29 + testing/057/namespace2_1_12_1_12.xml | 29 + testing/057/namespace2_1_12_1_12_1_12.xml | 29 + testing/057/namespace2_1_12_1_12_1_12_1_12.xml | 28 + testing/057/namespacebar.xml | 57 + testing/057/namespacefoo.xml | 27 + testing/057_caller_graphs.tcl | 155 + testing/058/058__bracket__recursion_8tcl.xml | 384 + testing/058_bracket_recursion.tcl | 157 + testing/059/059__command__catch_8tcl.xml | 191 + testing/059_command_catch.tcl | 87 + testing/060/060__command__switch_8tcl.xml | 326 + testing/060_command_switch.tcl | 238 + testing/061/class_test.xml | 70 + testing/061_bug_705503.tcl | 19 + testing/062/namespacen1.xml | 42 + testing/062/namespacen2.xml | 42 + testing/062/namespacen3.xml | 42 + testing/062_namespace_resolution.tcl | 68 + testing/063/namespaceoo.xml | 13 + testing/063/namespaceoo_1_1_helpers.xml | 27 + testing/063/namespaceoo_1_1define.xml | 27 + testing/063_bug_729092.tcl | 43 + testing/_057_caller_graphs.tcl | 4 + testing/runtests.pl | 2 +- tmake/lib/macosx-c++/tmake.conf | 2 +- tmake/lib/macosx-intel-c++/tmake.conf | 2 +- vhdlparser/CharStream.cc | 212 + vhdlparser/CharStream.h | 257 + vhdlparser/ErrorHandler.h | 78 + vhdlparser/JavaCC.h | 52 + vhdlparser/JavaCC.h.in | 52 + vhdlparser/Makefile.in | 40 + vhdlparser/ParseException.cc | 186 + vhdlparser/ParseException.h | 99 + vhdlparser/Token.cc | 92 + vhdlparser/Token.h | 116 + vhdlparser/TokenManager.h | 33 + vhdlparser/TokenMgrError.cc | 121 + vhdlparser/TokenMgrError.h | 90 + vhdlparser/VhdlParser.cc | 13071 +++++++++++++++++++++++ vhdlparser/VhdlParser.h | 8984 ++++++++++++++++ vhdlparser/VhdlParserConstants.h | 950 ++ vhdlparser/VhdlParserErrorHandler.hpp | 40 + vhdlparser/VhdlParserIF.cpp | 55 + vhdlparser/VhdlParserIF.h | 12 + vhdlparser/VhdlParserTokenManager.cc | 3605 +++++++ vhdlparser/VhdlParserTokenManager.h | 139 + vhdlparser/vhdlparser.jj | 2816 +++++ vhdlparser/vhdlparser.patch | 10 + vhdlparser/vhdlparser.pro.in | 33 + vhdlparser/vhdlstring.h | 101 + winbuild/Config.rules | 4 +- winbuild/Doxygen.vcproj | 194 +- winbuild/Gen_head.rules | 2 +- winbuild/Languages.rules | 4 +- winbuild/Lex.rules | 2 +- winbuild/Settings.rules | 2 +- winbuild/Unistd.rules | 2 +- winbuild/Version.rules | 2 +- winbuild/moc.rules | 2 +- winbuild/pack_the_distribution_for_windows.py | 24 +- 180 files changed, 44027 insertions(+), 9576 deletions(-) create mode 100644 src/fileparser.cpp create mode 100644 src/fileparser.h create mode 100644 src/plantuml.cpp create mode 100644 src/plantuml.h create mode 100644 src/vhdljjparser.cpp create mode 100644 src/vhdljjparser.h delete mode 100644 src/vhdlparser.y delete mode 100644 src/vhdlscanner.h delete mode 100644 src/vhdlscanner.l create mode 100644 testing/057/057__caller__graphs_8tcl.xml create mode 100644 testing/057/__057__caller__graphs_8tcl.xml create mode 100644 testing/057/namespace1.xml create mode 100644 testing/057/namespace1_1_11.xml create mode 100644 testing/057/namespace1_1_11_1_11.xml create mode 100644 testing/057/namespace2.xml create mode 100644 testing/057/namespace2_1_12.xml create mode 100644 testing/057/namespace2_1_12_1_12.xml create mode 100644 testing/057/namespace2_1_12_1_12_1_12.xml create mode 100644 testing/057/namespace2_1_12_1_12_1_12_1_12.xml create mode 100644 testing/057/namespacebar.xml create mode 100644 testing/057/namespacefoo.xml create mode 100644 testing/057_caller_graphs.tcl create mode 100644 testing/058/058__bracket__recursion_8tcl.xml create mode 100644 testing/058_bracket_recursion.tcl create mode 100644 testing/059/059__command__catch_8tcl.xml create mode 100644 testing/059_command_catch.tcl create mode 100644 testing/060/060__command__switch_8tcl.xml create mode 100644 testing/060_command_switch.tcl create mode 100644 testing/061/class_test.xml create mode 100644 testing/061_bug_705503.tcl create mode 100644 testing/062/namespacen1.xml create mode 100644 testing/062/namespacen2.xml create mode 100644 testing/062/namespacen3.xml create mode 100644 testing/062_namespace_resolution.tcl create mode 100644 testing/063/namespaceoo.xml create mode 100644 testing/063/namespaceoo_1_1_helpers.xml create mode 100644 testing/063/namespaceoo_1_1define.xml create mode 100644 testing/063_bug_729092.tcl create mode 100644 testing/_057_caller_graphs.tcl create mode 100644 vhdlparser/CharStream.cc create mode 100644 vhdlparser/CharStream.h create mode 100644 vhdlparser/ErrorHandler.h create mode 100644 vhdlparser/JavaCC.h create mode 100644 vhdlparser/JavaCC.h.in create mode 100644 vhdlparser/Makefile.in create mode 100644 vhdlparser/ParseException.cc create mode 100644 vhdlparser/ParseException.h create mode 100644 vhdlparser/Token.cc create mode 100644 vhdlparser/Token.h create mode 100644 vhdlparser/TokenManager.h create mode 100644 vhdlparser/TokenMgrError.cc create mode 100644 vhdlparser/TokenMgrError.h create mode 100644 vhdlparser/VhdlParser.cc create mode 100644 vhdlparser/VhdlParser.h create mode 100644 vhdlparser/VhdlParserConstants.h create mode 100644 vhdlparser/VhdlParserErrorHandler.hpp create mode 100644 vhdlparser/VhdlParserIF.cpp create mode 100644 vhdlparser/VhdlParserIF.h create mode 100644 vhdlparser/VhdlParserTokenManager.cc create mode 100644 vhdlparser/VhdlParserTokenManager.h create mode 100644 vhdlparser/vhdlparser.jj create mode 100644 vhdlparser/vhdlparser.patch create mode 100644 vhdlparser/vhdlparser.pro.in create mode 100644 vhdlparser/vhdlstring.h diff --git a/.gitignore b/.gitignore index 6abfaa8..0894b42 100644 --- a/.gitignore +++ b/.gitignore @@ -17,6 +17,8 @@ /libmd5/Makefile.libmd5 /qtools/Makefile /qtools/Makefile.qtools +/vhdlparser/Makefile +/vhdlparser/Makefile.vhdlparser /src/Makefile.doxygen /src/Makefile.libdoxycfg /src/Makefile.libdoxygen diff --git a/Doxyfile b/Doxyfile index 3b175c4..325a875 100644 --- a/Doxyfile +++ b/Doxyfile @@ -1,4 +1,4 @@ -# Doxyfile 1.8.3.1 +# Doxyfile 1.8.7 #--------------------------------------------------------------------------- # Project related configuration options @@ -10,6 +10,7 @@ PROJECT_BRIEF = PROJECT_LOGO = OUTPUT_DIRECTORY = doxygen_docs CREATE_SUBDIRS = YES +ALLOW_UNICODE_NAMES = NO OUTPUT_LANGUAGE = English BRIEF_MEMBER_DESC = YES REPEAT_BRIEF = YES @@ -63,6 +64,7 @@ INTERNAL_DOCS = NO CASE_SENSE_NAMES = NO HIDE_SCOPE_NAMES = NO SHOW_INCLUDE_FILES = YES +SHOW_GROUPED_MEMB_INC = NO FORCE_LOCAL_INCLUDES = NO INLINE_INFO = YES SORT_MEMBER_DOCS = YES @@ -84,7 +86,7 @@ FILE_VERSION_FILTER = LAYOUT_FILE = CITE_BIB_FILES = #--------------------------------------------------------------------------- -# configuration options related to warning and progress messages +# Configuration options related to warning and progress messages #--------------------------------------------------------------------------- QUIET = NO WARNINGS = YES @@ -94,9 +96,10 @@ WARN_NO_PARAMDOC = NO WARN_FORMAT = "$file:$line: $text " WARN_LOGFILE = #--------------------------------------------------------------------------- -# configuration options related to the input files +# Configuration options related to the input files #--------------------------------------------------------------------------- -INPUT = src +INPUT = src \ + vhdlparser INPUT_ENCODING = UTF-8 FILE_PATTERNS = *.h \ *.cpp \ @@ -105,6 +108,7 @@ RECURSIVE = NO EXCLUDE = src/logos.cpp \ src/lodepng.cpp EXCLUDE_SYMLINKS = NO +EXCLUDE_PATTERNS = EXCLUDE_SYMBOLS = EXAMPLE_PATH = EXAMPLE_PATTERNS = @@ -116,7 +120,7 @@ FILTER_SOURCE_FILES = NO FILTER_SOURCE_PATTERNS = USE_MDFILE_AS_MAINPAGE = #--------------------------------------------------------------------------- -# configuration options related to source browsing +# Configuration options related to source browsing #--------------------------------------------------------------------------- SOURCE_BROWSER = YES INLINE_SOURCES = NO @@ -124,18 +128,17 @@ STRIP_CODE_COMMENTS = YES REFERENCED_BY_RELATION = YES REFERENCES_RELATION = YES REFERENCES_LINK_SOURCE = YES +SOURCE_TOOLTIPS = YES USE_HTAGS = NO VERBATIM_HEADERS = YES -CLANG_ASSISTED_PARSING = YES -CLANG_OPTIONS = #--------------------------------------------------------------------------- -# configuration options related to the alphabetical class index +# Configuration options related to the alphabetical class index #--------------------------------------------------------------------------- ALPHABETICAL_INDEX = YES COLS_IN_ALPHA_INDEX = 5 IGNORE_PREFIX = #--------------------------------------------------------------------------- -# configuration options related to the HTML output +# Configuration options related to the HTML output #--------------------------------------------------------------------------- GENERATE_HTML = YES HTML_OUTPUT = @@ -173,7 +176,7 @@ QHP_SECT_FILTER_ATTRS = QHG_LOCATION = GENERATE_ECLIPSEHELP = NO ECLIPSE_DOC_ID = org.doxygen.Project -DISABLE_INDEX = YES +DISABLE_INDEX = NO GENERATE_TREEVIEW = YES ENUM_VALUES_PER_LINE = 4 TREEVIEW_WIDTH = 250 @@ -184,6 +187,7 @@ USE_MATHJAX = NO MATHJAX_FORMAT = HTML-CSS MATHJAX_RELPATH = http://cdn.mathjax.org/mathjax/latest MATHJAX_EXTENSIONS = +MATHJAX_CODEFILE = SEARCHENGINE = YES SERVER_BASED_SEARCH = YES EXTERNAL_SEARCH = NO @@ -192,7 +196,7 @@ SEARCHDATA_FILE = searchdata.xml EXTERNAL_SEARCH_ID = EXTRA_SEARCH_MAPPINGS = #--------------------------------------------------------------------------- -# configuration options related to the LaTeX output +# Configuration options related to the LaTeX output #--------------------------------------------------------------------------- GENERATE_LATEX = NO LATEX_OUTPUT = @@ -211,7 +215,7 @@ LATEX_HIDE_INDICES = NO LATEX_SOURCE_CODE = NO LATEX_BIB_STYLE = plain #--------------------------------------------------------------------------- -# configuration options related to the RTF output +# Configuration options related to the RTF output #--------------------------------------------------------------------------- GENERATE_RTF = NO RTF_OUTPUT = @@ -220,31 +224,31 @@ RTF_HYPERLINKS = NO RTF_STYLESHEET_FILE = RTF_EXTENSIONS_FILE = #--------------------------------------------------------------------------- -# configuration options related to the man page output +# Configuration options related to the man page output #--------------------------------------------------------------------------- GENERATE_MAN = NO MAN_OUTPUT = MAN_EXTENSION = .3 +MAN_SUBDIR = MAN_LINKS = NO #--------------------------------------------------------------------------- -# configuration options related to the XML output +# Configuration options related to the XML output #--------------------------------------------------------------------------- GENERATE_XML = NO XML_OUTPUT = xml -XML_SCHEMA = -XML_DTD = XML_PROGRAMLISTING = YES #--------------------------------------------------------------------------- -# configuration options related to the DOCBOOK output +# Configuration options related to the DOCBOOK output #--------------------------------------------------------------------------- GENERATE_DOCBOOK = NO DOCBOOK_OUTPUT = docbook +DOCBOOK_PROGRAMLISTING = NO #--------------------------------------------------------------------------- -# configuration options for the AutoGen Definitions output +# Configuration options for the AutoGen Definitions output #--------------------------------------------------------------------------- GENERATE_AUTOGEN_DEF = NO #--------------------------------------------------------------------------- -# configuration options related to the Perl module output +# Configuration options related to the Perl module output #--------------------------------------------------------------------------- GENERATE_PERLMOD = NO PERLMOD_LATEX = NO @@ -257,13 +261,14 @@ ENABLE_PREPROCESSING = YES MACRO_EXPANSION = YES EXPAND_ONLY_PREDEF = YES SEARCH_INCLUDES = YES -INCLUDE_PATH = qtools libmd5 +INCLUDE_PATH = qtools \ + libmd5 INCLUDE_FILE_PATTERNS = PREDEFINED = EXPAND_AS_DEFINED = SKIP_FUNCTION_MACROS = YES #--------------------------------------------------------------------------- -# Configuration::additions related to external references +# Configuration options related to external references #--------------------------------------------------------------------------- TAGFILES = qtools_docs/qtools.tag=../../qtools_docs/html GENERATE_TAGFILE = doxygen.tag @@ -276,6 +281,7 @@ PERL_PATH = /usr/bin/perl #--------------------------------------------------------------------------- CLASS_DIAGRAMS = NO MSCGEN_PATH = +DIA_PATH = HIDE_UNDOC_RELATIONS = YES HAVE_DOT = YES DOT_NUM_THREADS = 0 @@ -299,6 +305,8 @@ INTERACTIVE_SVG = YES DOT_PATH = DOTFILE_DIRS = MSCFILE_DIRS = +DIAFILE_DIRS = +PLANTUML_JAR_PATH = DOT_GRAPH_MAX_NODES = 50 MAX_DOT_GRAPH_DEPTH = 0 DOT_TRANSPARENT = NO diff --git a/INSTALL b/INSTALL index eced15a..d94748f 100644 --- a/INSTALL +++ b/INSTALL @@ -1,7 +1,7 @@ -DOXYGEN Version 1.8.4 +DOXYGEN Please read the installation section of the manual (http://www.doxygen.org/install.html) for instructions. -------- -Dimitri van Heesch (19 May 2013) +Dimitri van Heesch diff --git a/Makefile.in b/Makefile.in index b5918ba..a83f08b 100644 --- a/Makefile.in +++ b/Makefile.in @@ -21,6 +21,7 @@ clean: FORCE - cd qtools ; $(MAKE) clean - cd src ; $(MAKE) clean - cd libmd5 ; $(MAKE) clean + - cd vhdlparser ; $(MAKE) clean -cd addon/doxywizard ; $(MAKE) clean -cd addon/doxysearch ; $(MAKE) clean -cd addon/doxyapp ; $(MAKE) clean @@ -33,6 +34,7 @@ clean: FORCE distclean: clean -cd src ; $(MAKE) distclean -cd libmd5 ; $(MAKE) distclean + -cd vhdlparser ; $(MAKE) distclean -cd addon/doxywizard ; $(MAKE) distclean -cd addon/doxysearch ; $(MAKE) distclean -cd addon/doxyapp ; $(MAKE) distclean @@ -52,8 +54,9 @@ distclean: clean -rm -f src/Makefile.doxygen src/Makefile.libdoxygen -rm -f src/Makefile.libdoxycfg src/libdoxycfg.t src/libdoxygen.t -rm -f libmd5/Makefile.libmd5 + -rm -f vhdlparser/Makefile.vhdlparser -rm -f .makeconfig .tmakeconfig - -rm -f src/doxygen.pro src/libdoxygen.pro qtools/qtools.pro src/libdoxycfg.pro libmd5/libmd5.pro + -rm -f src/doxygen.pro src/libdoxygen.pro qtools/qtools.pro src/libdoxycfg.pro libmd5/libmd5.pro vhdlparser/vhdlparser.pro -rm -rf generated_src -rm -f addon/doxywizard/doxywizard.pro -rm -f VERSION @@ -95,7 +98,7 @@ docs: FORCE pdf: docs cd latex ; $(MAKE) -DISTFILES = Doxyfile libmd5 addon tmake doc examples bin lib objects testing \ +DISTFILES = Doxyfile vhdlparser libmd5 addon tmake doc examples bin lib objects testing \ qtools src configure configure.bin Makefile.in Makefile.win_nmake.in \ Makefile.win_make.in INSTALL LANGUAGE.HOWTO LICENSE PLATFORMS \ VERSION README.md packages winbuild jquery diff --git a/addon/doxywizard/doxywizard.cpp b/addon/doxywizard/doxywizard.cpp index 99310a1..26df065 100644 --- a/addon/doxywizard/doxywizard.cpp +++ b/addon/doxywizard/doxywizard.cpp @@ -97,15 +97,15 @@ MainWindow::MainWindow() grid->addLayout(launchLayout,1,0); runTabLayout->addLayout(grid); - QTabWidget *tabs = new QTabWidget; - tabs->addTab(m_wizard,tr("Wizard")); - tabs->addTab(m_expert,tr("Expert")); - tabs->addTab(runTab,tr("Run")); + m_tabs = new QTabWidget; + m_tabs->addTab(m_wizard,tr("Wizard")); + m_tabs->addTab(m_expert,tr("Expert")); + m_tabs->addTab(runTab,tr("Run")); rowLayout->addWidget(new QLabel(tr("Step 1: Specify the working directory from which doxygen will run"))); rowLayout->addLayout(dirLayout); rowLayout->addWidget(new QLabel(tr("Step 2: Configure doxygen using the Wizard and/or Expert tab, then switch to the Run tab to generate the documentation"))); - rowLayout->addWidget(tabs); + rowLayout->addWidget(m_tabs); setCentralWidget(topPart); statusBar()->showMessage(tr("Welcome to Doxygen"),messageTimeout); @@ -115,7 +115,7 @@ MainWindow::MainWindow() m_timer = new QTimer; // connect signals and slots - connect(tabs,SIGNAL(currentChanged(int)),SLOT(selectTab(int))); + connect(m_tabs,SIGNAL(currentChanged(int)),SLOT(selectTab(int))); connect(m_selWorkingDir,SIGNAL(clicked()),SLOT(selectWorkingDir())); connect(m_recentMenu,SIGNAL(triggered(QAction*)),SLOT(openRecent(QAction*))); connect(m_workingDir,SIGNAL(returnPressed()),SLOT(updateWorkingDir())); @@ -127,6 +127,8 @@ MainWindow::MainWindow() connect(m_saveLog,SIGNAL(clicked()),SLOT(saveLog())); connect(showSettings,SIGNAL(clicked()),SLOT(showSettings())); connect(m_expert,SIGNAL(changed()),SLOT(configChanged())); + connect(m_wizard,SIGNAL(done()),SLOT(selectRunTab())); + connect(m_expert,SIGNAL(done()),SLOT(selectRunTab())); loadSettings(); updateLaunchButtonState(); @@ -191,7 +193,7 @@ void MainWindow::about() t << QString::fromAscii("
A tool to configure and run doxygen version ")+ QString::fromAscii(versionString)+ QString::fromAscii(" on your source files.


" - "

Written by
Dimitri van Heesch
© 2000-2013

" + "

Written by
Dimitri van Heesch
© 2000-2014

" ""); QMessageBox::about(this,tr("Doxygen GUI"),msg); } @@ -371,6 +373,12 @@ void MainWindow::saveSettings() void MainWindow::selectTab(int id) { if (id==0) m_wizard->refresh(); + else if (id==1) m_expert->refresh(); +} + +void MainWindow::selectRunTab() +{ + m_tabs->setCurrentIndex(2); } void MainWindow::addRecentFile(const QString &fileName) diff --git a/addon/doxywizard/doxywizard.h b/addon/doxywizard/doxywizard.h index 46cd748..189972f 100644 --- a/addon/doxywizard/doxywizard.h +++ b/addon/doxywizard/doxywizard.h @@ -14,6 +14,7 @@ class QTextEdit; class QMenu; class QProcess; class QTimer; +class QTabWidget; class MainWindow : public QMainWindow { @@ -51,6 +52,7 @@ class MainWindow : public QMainWindow void showSettings(); void configChanged(); void clearRecent(); + void selectRunTab(); private: MainWindow(); @@ -77,6 +79,7 @@ class MainWindow : public QMainWindow QStringList m_recentFiles; QProcess *m_runProcess; QTimer *m_timer; + QTabWidget *m_tabs; bool m_running; bool m_modified; }; diff --git a/addon/doxywizard/doxywizard.pro.in b/addon/doxywizard/doxywizard.pro.in index 0c8d049..1ad36a9 100644 --- a/addon/doxywizard/doxywizard.pro.in +++ b/addon/doxywizard/doxywizard.pro.in @@ -15,7 +15,7 @@ RCC_DIR = ../../rcc/doxywizard DEFINES += QT_NO_CAST_FROM_ASCII QT_NO_CAST_TO_ASCII macx-g++ { - CONFIG += x86 + CONFIG += x86 x86_64 } # Input @@ -24,11 +24,10 @@ HEADERS += doxywizard.h version.h expert.h config.h helplabel.h \ SOURCES += doxywizard.cpp expert.cpp wizard.cpp \ inputbool.cpp inputstring.cpp inputint.cpp inputstrlist.cpp RESOURCES += doxywizard.qrc -INCBUFSIZE=$(PYTHON) ../../src/increasebuffer.py win32:RC_FILE += doxywizard.rc config.target = ../../generated_src/doxywizard/config_doxyw.cpp -config.commands = $(LEX) -Pconfig_doxywYY -t ../../addon/doxywizard/config_doxyw.l | $(INCBUFSIZE) >../../generated_src/doxywizard/$*.cpp +config.commands = $(LEX) -Pconfig_doxywYY -t ../../addon/doxywizard/config_doxyw.l | $(PYTHON) ../../src/increasebuffer.py >../../generated_src/doxywizard/$*.cpp config.depends = ../../addon/doxywizard/config_doxyw.l ../../src/increasebuffer.py configdoc.target = ../../generated_src/doxywizard/configdoc.cpp configdoc.commands = $(PYTHON) ../../src/configgen.py -wiz ../../src/config.xml > ../../generated_src/doxywizard/configdoc.cpp diff --git a/addon/doxywizard/expert.cpp b/addon/doxywizard/expert.cpp index fe6609e..1cc5d15 100644 --- a/addon/doxywizard/expert.cpp +++ b/addon/doxywizard/expert.cpp @@ -683,7 +683,7 @@ void Expert::activateTopic(QTreeWidgetItem *item,QTreeWidgetItem *) QWidget *w = m_topics[item->text(0)]; m_topicStack->setCurrentWidget(w); m_prev->setEnabled(m_topicStack->currentIndex()!=0); - m_next->setEnabled(m_topicStack->currentIndex()!=m_topicStack->count()-1); + m_next->setEnabled(true); } } @@ -824,10 +824,17 @@ void Expert::showHelp(Input *option) void Expert::nextTopic() { - m_topicStack->setCurrentIndex(m_topicStack->currentIndex()+1); - m_next->setEnabled(m_topicStack->count()!=m_topicStack->currentIndex()+1); - m_prev->setEnabled(m_topicStack->currentIndex()!=0); - m_treeWidget->setCurrentItem(m_treeWidget->invisibleRootItem()->child(m_topicStack->currentIndex())); + if (m_topicStack->currentIndex()+1==m_topicStack->count()) // last topic + { + done(); + } + else + { + m_topicStack->setCurrentIndex(m_topicStack->currentIndex()+1); + m_next->setEnabled(m_topicStack->count()!=m_topicStack->currentIndex()+1); + m_prev->setEnabled(m_topicStack->currentIndex()!=0); + m_treeWidget->setCurrentItem(m_treeWidget->invisibleRootItem()->child(m_topicStack->currentIndex())); + } } void Expert::prevTopic() @@ -931,3 +938,8 @@ bool Expert::pdfOutputPresent(const QString &workingDir) const return fi.exists() && fi.isFile(); } +void Expert::refresh() +{ + m_treeWidget->setCurrentItem(m_treeWidget->invisibleRootItem()->child(0)); +} + diff --git a/addon/doxywizard/expert.h b/addon/doxywizard/expert.h index 2c65446..ff571cb 100644 --- a/addon/doxywizard/expert.h +++ b/addon/doxywizard/expert.h @@ -42,6 +42,7 @@ class Expert : public QSplitter, public DocIntf public slots: void activateTopic(QTreeWidgetItem *,QTreeWidgetItem *); QWidget *createTopicWidget(QDomElement &elem); + void refresh(); private slots: void showHelp(Input *); @@ -50,6 +51,7 @@ class Expert : public QSplitter, public DocIntf signals: void changed(); + void done(); private: void createTopics(const QDomElement &); diff --git a/addon/doxywizard/inputstring.cpp b/addon/doxywizard/inputstring.cpp index ad258f7..48ede55 100644 --- a/addon/doxywizard/inputstring.cpp +++ b/addon/doxywizard/inputstring.cpp @@ -167,7 +167,7 @@ void InputString::setEnabled(bool state) { m_lab->setEnabled(state); if (m_le) m_le->setEnabled(state); - if (m_im) m_le->setEnabled(state); + if (m_im) m_im->setEnabled(state); if (m_br) m_br->setEnabled(state); if (m_com) m_com->setEnabled(state); updateDefault(); diff --git a/addon/doxywizard/wizard.cpp b/addon/doxywizard/wizard.cpp index 56933e0..a8b7f94 100644 --- a/addon/doxywizard/wizard.cpp +++ b/addon/doxywizard/wizard.cpp @@ -1292,17 +1292,24 @@ void Wizard::activateTopic(QTreeWidgetItem *item,QTreeWidgetItem *) { m_topicStack->setCurrentWidget(m_step4); m_prev->setEnabled(true); - m_next->setEnabled(false); + m_next->setEnabled(true); } } } void Wizard::nextTopic() { - m_topicStack->setCurrentIndex(m_topicStack->currentIndex()+1); - m_next->setEnabled(m_topicStack->count()!=m_topicStack->currentIndex()+1); - m_prev->setEnabled(m_topicStack->currentIndex()!=0); - m_treeWidget->setCurrentItem(m_treeWidget->invisibleRootItem()->child(m_topicStack->currentIndex())); + if (m_topicStack->currentIndex()+1==m_topicStack->count()) // last topic + { + done(); + } + else + { + m_topicStack->setCurrentIndex(m_topicStack->currentIndex()+1); + m_next->setEnabled(m_topicStack->count()!=m_topicStack->currentIndex()+1); + m_prev->setEnabled(m_topicStack->currentIndex()!=0); + m_treeWidget->setCurrentItem(m_treeWidget->invisibleRootItem()->child(m_topicStack->currentIndex())); + } } void Wizard::prevTopic() @@ -1315,6 +1322,7 @@ void Wizard::prevTopic() void Wizard::refresh() { + m_treeWidget->setCurrentItem(m_treeWidget->invisibleRootItem()->child(0)); m_step1->init(); m_step2->init(); m_step3->init(); diff --git a/addon/doxywizard/wizard.h b/addon/doxywizard/wizard.h index a18df62..4d5eb9d 100644 --- a/addon/doxywizard/wizard.h +++ b/addon/doxywizard/wizard.h @@ -238,6 +238,9 @@ class Wizard : public QSplitter void nextTopic(); void prevTopic(); + signals: + void done(); + private: const QHash &m_modelData; QTreeWidget *m_treeWidget; diff --git a/configure b/configure index f046fcb..5c01af0 100755 --- a/configure +++ b/configure @@ -17,7 +17,7 @@ doxygen_version_major=1 doxygen_version_minor=8 -doxygen_version_revision=7 +doxygen_version_revision=8 #NOTE: Setting version_mmn to "NO" will omit mmn info from the package. doxygen_version_mmn=NO @@ -51,7 +51,7 @@ f_libclangstatic=NO # first setup the list with availabe languages, so we cannot forget any # list will be in case as specified (f_langs) and in uppercase (f_ulangs) as used in the internal perl script # -f_langs=`ls -1 src/translator_??.h | sed -e 's%src/translator_%%g' | sed -e 's/\.h//' | tr '\012' ',' | sed -e 's/,$//'` +f_langs=`ls -1 src/translator_??.h | sed -e 's%src/translator_%%g' | sed -e 's/\.h//' | tr '\012' ','` while test -n "$1"; do case $1 in @@ -594,9 +594,10 @@ fi # - check for python ---------------------------------------------------------- +python_version=0 printf " Checking for python... " if test "$f_python" = NO; then - python_names="python2 python" + python_names="python3 python2 python" python_dirs="$bin_dirs /usr/bin /usr/local/bin /bin /sbin" python_prog=NO python_found=NO @@ -604,26 +605,33 @@ if test "$f_python" = NO; then for j in $python_dirs; do if test -x "$j/$i"; then python_found=YES - if test `$j/$i -c "import sys; print sys.version_info[0]"` = 2; then - python_prog="$j/$i" + if test `$j/$i -c "import sys; print(sys.version_info[0])"` = 3; then + python_prog="$j/$i"; + python_version=`$j/$i -c "import platform; print(platform.python_version())"`; break 2 + elif test `$j/$i -c "import sys; print(sys.version_info[0])"` = 2; then + if test `$j/$i -c "import sys; print(sys.version_info[1])"` -ge 6; then + python_prog="$j/$i"; + python_version=`$j/$i -c "import platform; print(platform.python_version())"`; + break 2 + fi fi fi done done - f_python="$python_prog" + f_python="$python_prog" fi if test "$f_python" = NO; then if test "$python_found" = YES; then - echo "version should be python 2." + echo "version should be python 2.6 or higher." else echo "not found!"; fi echo exit 2 fi -echo "using $f_python"; +echo "using $f_python (version $python_version)"; # - check for perl ------------------------------------------------------------ @@ -708,11 +716,11 @@ fi # ----------------------------------------------------------------------------- -if ! test -d "generated_src/doxygen"; then +if test '!' -d "generated_src/doxygen"; then mkdir -p generated_src/doxygen fi if test "$f_wizard" = YES; then - if ! test -d "generated_src/doxywizard"; then + if test '!' -d "generated_src/doxywizard"; then mkdir -p generated_src/doxywizard fi fi @@ -748,6 +756,7 @@ ENV = env TMAKEPATH="\$(TMAKEPATH)" TMAKE = $configPWD/tmake/bin/tmake MAKE = $f_make PYTHON = $f_python +PERL = $f_perl LEX = $f_flex RM = rm -f CP = cp @@ -859,7 +868,7 @@ INCLUDEPATH += $XAPIAN/include EOF fi -f_inmakefiles="Makefile.in qtools/Makefile.in src/Makefile.in examples/Makefile.in doc/Makefile.in addon/doxywizard/Makefile.in addon/doxmlparser/src/Makefile.in addon/doxmlparser/test/Makefile.in addon/doxmlparser/examples/metrics/Makefile.in libmd5/Makefile.in addon/doxyapp/Makefile.in addon/doxysearch/Makefile.in" +f_inmakefiles="Makefile.in qtools/Makefile.in src/Makefile.in examples/Makefile.in doc/Makefile.in addon/doxywizard/Makefile.in addon/doxmlparser/src/Makefile.in addon/doxmlparser/test/Makefile.in addon/doxmlparser/examples/metrics/Makefile.in libmd5/Makefile.in addon/doxyapp/Makefile.in addon/doxysearch/Makefile.in vhdlparser/Makefile.in" for i in $f_inmakefiles ; do SRC=$i @@ -884,7 +893,9 @@ EOF echo "all: generated_src/doxygen/version.cpp $EXTRADEPS" >> $DST echo " \$(MAKE) -C qtools" >> $DST echo " \$(MAKE) -C libmd5" >> $DST + echo " \$(MAKE) -C vhdlparser" >> $DST echo " \$(MAKE) -C src" >> $DST + if test $f_wizard = YES; then echo " \$(MAKE) MAN1DIR=\$(MAN1DIR) -C addon/doxywizard" >> $DST fi @@ -921,7 +932,7 @@ done cat src/libdoxycfg.t.in | sed -e "s|%%FLEX%%|$f_flex|g" -e "s|%%BISON%%|$f_bison|g" -e "s|%%PYTHON%%|$f_python|g" > src/libdoxycfg.t cat src/libdoxygen.t.in | sed -e "s|%%FLEX%%|$f_flex|g" -e "s|%%BISON%%|$f_bison|g" -e "s|%%PYTHON%%|$f_python|g" > src/libdoxygen.t -f_inprofiles="qtools/qtools.pro.in src/libdoxygen.pro.in src/libdoxycfg.pro.in src/doxygen.pro.in addon/doxywizard/doxywizard.pro.in addon/doxmlparser/src/doxmlparser.pro.in addon/doxmlparser/test/xmlparse.pro.in addon/doxmlparser/examples/metrics/metrics.pro.in libmd5/libmd5.pro.in addon/doxyapp/doxyapp.pro.in addon/doxysearch/doxysearch.pro.in addon/doxysearch/doxyindexer.pro.in" +f_inprofiles="qtools/qtools.pro.in src/libdoxygen.pro.in src/libdoxycfg.pro.in src/doxygen.pro.in addon/doxywizard/doxywizard.pro.in addon/doxmlparser/src/doxmlparser.pro.in addon/doxmlparser/test/xmlparse.pro.in addon/doxmlparser/examples/metrics/metrics.pro.in libmd5/libmd5.pro.in addon/doxyapp/doxyapp.pro.in addon/doxysearch/doxysearch.pro.in addon/doxysearch/doxyindexer.pro.in vhdlparser/vhdlparser.pro.in" for i in $f_inprofiles ; do SRC=$i @@ -955,7 +966,7 @@ echo " Generating generated_src/doxygen/lang_cfg.h..." if test "$f_english" = YES; then $f_python src/lang_cfg.py ENONLY > generated_src/doxygen/lang_cfg.h else - f_ulangs=`echo $f_langs | tr '[a-z,]' '[A-Z ]'` + f_ulangs=`echo $f_langs | tr '[a-z]' '[A-Z]' | tr ',' ' '` $f_python src/lang_cfg.py $f_ulangs > generated_src/doxygen/lang_cfg.h fi diff --git a/doc/Makefile.in b/doc/Makefile.in index 1f472e6..f0c3a03 100644 --- a/doc/Makefile.in +++ b/doc/Makefile.in @@ -17,7 +17,7 @@ all: language config.doc FORCE export DOXYGEN_DOCDIR; \ VERSION=$(VERSION) ; \ export VERSION; \ - $(DOXYGEN)/bin/doxygen + "$(DOXYGEN)/bin/doxygen" @rm -f ../latex/refman.tex @cp doxygen_logo*.gif ../html @cp Makefile.latex ../latex/Makefile diff --git a/doc/changelog.doc b/doc/changelog.doc index e7a8f97..606f63f 100644 --- a/doc/changelog.doc +++ b/doc/changelog.doc @@ -2,49 +2,184 @@ \tableofcontents \section log_1_8 1.8 Series +\subsection log_1_8_8 Release 1.8.8 +\htmlonly +(release date 21-08-2014) + +

New features

+ +

Bug fixes

+ +\endhtmlonly + \subsection log_1_8_7 Release 1.8.7 \htmlonly (release date 21-04-2014)