22965601 Update doxygen to version 1.8.11
authorRich Burridge <rich.burridge@oracle.com>
Mon, 28 Mar 2016 18:21:54 -0700
changeset 5665 8f68cd0d0916
parent 5664 eb0b3fe9c44c
child 5667 48a8f57b9a1a
22965601 Update doxygen to version 1.8.11
components/doxygen/Makefile
components/doxygen/doxygen.p5m
components/doxygen/patches/doxygen1.patch
components/doxygen/test/results-64.master
--- a/components/doxygen/Makefile	Mon Mar 28 12:01:44 2016 -0700
+++ b/components/doxygen/Makefile	Mon Mar 28 18:21:54 2016 -0700
@@ -18,34 +18,31 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2016, Oracle and/or its affiliates. All rights reserved.
 #
 BITS=64
 include ../../make-rules/shared-macros.mk
 
 COMPONENT_NAME=		doxygen
-COMPONENT_VERSION=	1.8.9
+COMPONENT_VERSION=	1.8.11
 COMPONENT_PROJECT_URL=	http://www.stack.nl/~dimitri/doxygen/index.html
 COMPONENT_SRC=		$(COMPONENT_NAME)-$(COMPONENT_VERSION)
 COMPONENT_ARCHIVE=	$(COMPONENT_SRC).src.tar.gz
 COMPONENT_ARCHIVE_HASH=	\
-    sha256:f0dd662fb98c394c20deed5b00b29d73d9bee8ea1a52f7a687dd9b70f5444fc6
+    sha256:65d08b46e48bd97186aef562dc366681045b119e00f83c5b61d05d37ea154049
 COMPONENT_ARCHIVE_URL=	http://ftp.stack.nl/pub/users/dimitri/$(COMPONENT_ARCHIVE)
 COMPONENT_BUGDB=	utility/doxygen
 
 # Download the manual so that we don't have to keep updating it in the gate.
 COMPONENT_ARCHIVE_1 =	$(COMPONENT_NAME)_manual-$(COMPONENT_VERSION).pdf.zip
 COMPONENT_ARCHIVE_HASH_1 =	\
-    sha256:33b12961db131c5cfea1b3d045a38b8f222bdd07bb04d1cd60f791ee86949b70
+    sha256:e7a6a0c853c715157070514bd29992315a7d14131dca5947110a18b0b3e8e61c
 COMPONENT_ARCHIVE_URL_1 =	ftp://ftp.stack.nl/pub/users/dimitri/$(COMPONENT_ARCHIVE_1)
 
-TPNO=			21549
+TPNO=			27457
 
-include $(WS_MAKE_RULES)/prep.mk
-# Omit directory options that break doxygen's configure script.
-CONFIGURE_DEFAULT_DIRS=no
-include $(WS_MAKE_RULES)/configure.mk
-include $(WS_MAKE_RULES)/ips.mk
+include $(WS_MAKE_RULES)/cmake.mk
+include $(WS_MAKE_RULES)/common-64.mk
 
 # Necessary to find the right gcc during build
 PATH=$(GCC_ROOT)/bin:/usr/bin
@@ -76,6 +73,7 @@
 # The additional doxygen specific set of transforms to be applied to the
 # test results to try to normalize them.
 COMPONENT_TEST_TRANSFORMS += \
+	'-e "/^Scanning dependencies$$/d" ' \
         '-e "s|\(error opening bib\).*|\1|" ' \
         '-e "s|\(test_output_012/indexpage.xml\).*|\1|" ' \
         '-e "s|\(012/indexpage.xml\).*|\1|" ' \
@@ -94,17 +92,9 @@
 
 ASLR_MODE = $(ASLR_ENABLE)
 
-configure:	$(CONFIGURE_64)
-
-build:		$(BUILD_64)
-
 install:	$(INSTALL_64)
 	cd $(PROTO_DIR) ; $(UNPACK) ../../../$(COMPONENT_ARCHIVE_1)
 
-test:		$(TEST_64)
-
-system-test:    $(SYSTEM_TEST_64)
-
 
 REQUIRED_PACKAGES += developer/lexer/flex
 REQUIRED_PACKAGES += developer/parser/bison
--- a/components/doxygen/doxygen.p5m	Mon Mar 28 12:01:44 2016 -0700
+++ b/components/doxygen/doxygen.p5m	Mon Mar 28 18:21:54 2016 -0700
@@ -18,7 +18,7 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2016, Oracle and/or its affiliates. All rights reserved.
 #
 
 <transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
@@ -38,5 +38,5 @@
 file path=usr/bin/doxygen
 file doxygen_manual-$(IPS_COMPONENT_VERSION).pdf \
     path=usr/share/doc/doxygen-$(IPS_COMPONENT_VERSION)/doxygen_manual-$(IPS_COMPONENT_VERSION).pdf
-file usr/man/man1/doxygen.1 path=usr/share/man/man1/doxygen.1
+file doc/doxygen.1 path=usr/share/man/man1/doxygen.1
 license doxygen.license license=GPLv2
--- a/components/doxygen/patches/doxygen1.patch	Mon Mar 28 12:01:44 2016 -0700
+++ b/components/doxygen/patches/doxygen1.patch	Mon Mar 28 18:21:54 2016 -0700
@@ -1,8 +1,6 @@
 Changes needed to get doxygen to configure and build with the GNU compilers
 on Solaris.
 
-The second part of these changes will be sent upstream.
-
 --- doxygen-1.8.9/doc/Doxyfile.orig	2015-03-02 18:48:16.796824973 -0800
 +++ doxygen-1.8.9/doc/Doxyfile	2015-03-02 18:47:58.404324590 -0800
 @@ -23,7 +23,7 @@
@@ -14,31 +12,3 @@
  GENERATE_HTML     = YES
  GENERATE_HTMLHELP = NO
  GENERATE_RTF      = NO
---- doxygen-1.8.9/tmake/lib/solaris-g++/tmake.conf.orig	2015-03-02 18:45:51.095061314 -0800
-+++ doxygen-1.8.9/tmake/lib/solaris-g++/tmake.conf	2015-03-02 19:55:43.793869862 -0800
[email protected]@ -8,7 +8,7 @@
- CONFIG			= qt warn_on release
- 
- TMAKE_CC		= gcc
--TMAKE_CFLAGS		=
-+TMAKE_CFLAGS		= -m64
- TMAKE_CFLAGS_WARN_ON	= -Wall -W
- TMAKE_CFLAGS_WARN_OFF	=
- TMAKE_CFLAGS_RELEASE	= -O2
[email protected]@ -36,14 +36,14 @@
- 
- TMAKE_LINK		= g++
- TMAKE_LINK_SHLIB	= g++
--TMAKE_LFLAGS		=
-+TMAKE_LFLAGS		= -m64
- TMAKE_LFLAGS_RELEASE	=
- TMAKE_LFLAGS_DEBUG	=
- TMAKE_LFLAGS_SHAPP	= -shared
- TMAKE_LFLAGS_SHLIB	= -shared -h $(TARGET1)
- TMAKE_LFLAGS_SONAME	=
- 
--TMAKE_LIBS		= -liconv
-+TMAKE_LIBS		=
- TMAKE_LIBS_X11		= -lXext -lX11 -lm
- TMAKE_LIBS_QT		= -lqt
- TMAKE_LIBS_QT_MT	= -lqt-mt
--- a/components/doxygen/test/results-64.master	Mon Mar 28 12:01:44 2016 -0700
+++ b/components/doxygen/test/results-64.master	Mon Mar 28 18:21:54 2016 -0700
@@ -1,85 +1,97 @@
-1..65
-ok 1 - [001_a.dox]: test the \a and \mainpage commands
-ok 2 - [002_addindex.dox]: test \addindex command
-ok 3 - [003_anchor.dox]: test \anchor command
-ok 4 - [004_arg.dox]: test \arg and \li commands
-ok 5 - [005_attention.dox]: test \attention, \not, \remark, \warning, and \par commands
-ok 6 - [006_author.dox]: test the \author, \since, and \version command
-ok 7 - [007_b.dox]: test the \b command
-ok 8 - [008_brief.c]: test \brief and \file command
-ok 9 - [009_bug.cpp]: test the \bug, \deprecated, \todo, \test, and \xrefitem commands
-ok 10 - [010_c.dox]: test the \c and \p commands
-ok 11 - [011_category.m]: test the \interface and \category command
-error opening bib
+[ 69%] Built target _doxygen
+[ 71%] Built target md5
+[ 89%] Built target qtools
+[ 94%] Built target vhdlparser
+[ 98%] Built target doxycfg
+[ 99%] Built target doxygen
+[100%] Running doxygen tests...
 bibtex command failed: No such file or directory
-error: Problems running bibtex. Verify that the command 'perl --version' works from the command line. Exit code: 2
-.../testing/012_cite.dox:6: warning: \cite command to 'knuth79' does not have an associated number
-not ok 12 - [012_cite.dox]: test the \cite command
-#   Failed test '[012_cite.dox]: test the \cite command'
-#   at runtests.pl line 249.
-# Difference between generated output and reference:
-# --- test_output_012/indexpage.xml
-# +++ 012/indexpage.xml
-# @@ -4,7 +4,7 @@
-#      <compoundname>index</compoundname>
-#      <title>My Project</title>
-#      <detaileddescription>
-# -      <para>See knuth79 for more info. </para>
-# +      <para>See <ref refid="citelist_1CITEREF_knuth79" kindref="member">[1]</ref> for more info. </para>
-#      </detaileddescription>
-#    </compounddef>
-#  </doxygen>
-ok 13 - [013_class.h]: test the \class and \headerfile commands
-ok 14 - [014_code.dox]: test the \code command
-ok 15 - [015_cond.c]: test the \cond command
-ok 16 - [016_copydoc.c]: test the \copydoc, \copybrief, \copydetails, and \details commands
-ok 17 - [017_copyright.dox]: test \copyright and \date commands
-ok 18 - [018_def.c]: test the \def, \var, \fn, and \typedef commands
-ok 19 - [019_defgroup.c]: test the \defgroup, \addtogroup, and \ingroup command.
-ok 20 - [020_only.dox]: test the \*only and \*endonly commands
-ok 21 - [021_dontinclude.cpp]: test the \dontinclude, \skip, \until, \skipline, \line commands
-ok 22 - [022_dot.cpp]: test the \dot and \enddot commands
-ok 23 - [023_e.dox]: test the \e, \em commands
-ok 24 - [024_if.dox]: test the \if, \ifnot, \elsif, \else, and \endif commands
-ok 25 - [025_example.cpp]: test the \example command
-ok 26 - [026_exception.cpp]: test the \exception, \param, and \tparam commands
-ok 27 - [027_extends.c]: test the \extends, \implements, \memberof, \private, and \public commands
-ok 28 - [028_formula.c]: test the \f$, \f[, \f], \f{, and \f} commands
+1..65
+ok 1 - [017_copyright.dox]: test \copyright and \date commands
+ok 2 - [038_n.dox]: test the \n command
+ok 3 - [001_a.dox]: test the \a and \mainpage commands
+ok 4 - [061_bug_705503.tcl]: test for bug 705503 - TCL: Documentation of oo::define is not working
+ok 5 - [006_author.dox]: test the \author, \since, and \version command
+ok 6 - [021_dontinclude.cpp]: test the \dontinclude, \skip, \until, \skipline, \line commands
+ok 7 - [018_def.c]: test the \def, \var, \fn, and \typedef commands
+ok 8 - [008_brief.c]: test \brief and \file command
+ok 9 - [039_name.cpp]: test the \name and \short commands
+ok 10 - [060_command_switch.tcl]: tests processing of switch, only references/referencedby relations are relevant
+ok 11 - [062_namespace_resolution.tcl]: tests correct namespace resolution, only references/referencedby relations are relevant
+ok 12 - [007_b.dox]: test the \b command
+ok 13 - [054_parblock.cpp]: test the \parblock command
+ok 14 - [042_package.java]: test the \package command
+ok 15 - [037_msc.cpp]: test the \msc and \endmsc commands
+ok 16 - [065_tilde.dox]: test \~ command with non default OUTPUT_LANGUAGE which contains '-' letter
+not ok 17 - [012_cite.dox]: test the \cite command
+-------------------------------------
+Difference between generated output and reference:
+--- $(@D)/testing/test_output_012/indexpage.xml
++++ $(@D)/testing/012/indexpage.xml
[email protected]@ -4,7 +4,7 @@
+     <compoundname>index</compoundname>
+     <title>My Project</title>
+     <detaileddescription>
+-      <para>See knuth79 for more info. </para>
++      <para>See <ref refid="citelist_1CITEREF_knuth79" kindref="member">[1]</ref> for more info. </para>
+     </detaileddescription>
+   </compounddef>
+ </doxygen>
+
+-------------------------------------
+ok 18 - [040_namespace.cpp]: test the \namespace command
+ok 19 - [010_c.dox]: test the \c and \p commands
+ok 20 - [056_latexinclude.dox]: test the \latexinclude command
+ok 21 - [034_internal.dox]: test the \internal and \endinternal commands (2)
+ok 22 - [044_section.h]: test the \(public|protected|private)section commands
+ok 23 - [009_bug.cpp]: test the \bug, \deprecated, \todo, \test, and \xrefitem commands
+ok 24 - [026_exception.cpp]: test the \exception, \param, and \tparam commands
+ok 25 - [051_escape.dox]: test various characters that should be escaped
+ok 26 - [022_dot.cpp]: test the \dot and \enddot commands
+ok 27 - [050_verbatim.dox]: test \verbatim and \verbinclude commands
+ok 28 - [043_page.dox]: test \page, \subpage, \*section, \paragraph, and \ref commands
 ok 29 - [029_hideinit.c]: test the \hideinitializer command
-ok 30 - [030_htmlinclude.dox]: test the \htmlinclude command
-ok 31 - [031_image.dox]: test the \image command
-ok 32 - [032_include.cpp]: test the \include and \includelineno commands
-ok 33 - [033_internal.dox]: test the \internal and \endinternal commands (1)
-ok 34 - [034_internal.dox]: test the \internal and \endinternal commands (2)
-ok 35 - [035_invariant.c]: test \invariant, \pre and \post commands
-ok 36 - [036_link.c]: test \link command
-ok 37 - [037_msc.cpp]: test the \msc and \endmsc commands
-ok 38 - [038_n.dox]: test the \n command
-ok 39 - [039_name.cpp]: test the \name and \short commands
-ok 40 - [040_namespace.cpp]: test the \namespace command
-ok 41 - [041_overload.cpp]: test the \overload command
-ok 42 - [042_package.java]: test the \package command
-ok 43 - [043_page.dox]: test \page, \subpage, \*section, \paragraph, and \ref commands
-ok 44 - [044_section.h]: test the \(public|protected|private)section commands
-ok 45 - [045_refitem.dox]: test \refitem, \secreflist, \endsecreflist
-ok 46 - [046_related.cpp]: test the \related, \relatedalso, \see, and \sa commands
-ok 47 - [047_return.cpp]: test the \result, \return, and \returns commands
-ok 48 - [048_showinit.c]: test the \showinit command
-ok 49 - [049_snippet.cpp]: test the \snippet command
-ok 50 - [050_verbatim.dox]: test \verbatim and \verbinclude commands
-ok 51 - [051_escape.dox]: test various characters that should be escaped
-ok 52 - [052_tilde.dox]: test \~ command
-ok 53 - [053_tilde.dox]: test \~ command with non default OUTPUT_LANGUAGE
-ok 54 - [054_parblock.cpp]: test the \parblock command
-ok 55 - [055_markdown.md]: test markdown parsing
-ok 56 - [056_latexinclude.dox]: test the \latexinclude command
-ok 57 - [057_caller_graphs.tcl]: test for completeness and correctness of references/referencedby relations 
-ok 58 - [058_bracket_recursion.tcl]: tests processing of commands inside brackets [], only references/referencedby relations are relevant
-ok 59 - [059_command_catch.tcl]: tests processing of catch/eval, only references/referencedby relations are relevant
-ok 60 - [060_command_switch.tcl]: tests processing of switch, only references/referencedby relations are relevant
-ok 61 - [061_bug_705503.tcl]: test for bug 705503 - TCL: Documentation of oo::define is not working
-ok 62 - [062_namespace_resolution.tcl]: tests correct namespace resolution, only references/referencedby relations are relevant
-ok 63 - [063_bug_729092.tcl]: test for bug 729092 - TCL: Full documentation not shown for procs in namespaces.
-ok 64 - [064_castoperator.cpp]: test linking to the cast operator with and without const
-ok 65 - [065_tilde.dox]: test \~ command with non default OUTPUT_LANGUAGE which contains '-' letter
-# Looks like you failed 1 test of 65.
+ok 30 - [033_internal.dox]: test the \internal and \endinternal commands (1)
+ok 31 - [024_if.dox]: test the \if, \ifnot, \elsif, \else, and \endif commands
+ok 32 - [046_related.cpp]: test the \related, \relatedalso, \see, and \sa commands
+ok 33 - [055_markdown.md]: test markdown parsing
+ok 34 - [023_e.dox]: test the \e, \em commands
+ok 35 - [015_cond.c]: test the \cond command
+ok 36 - [045_refitem.dox]: test \refitem, \secreflist, \endsecreflist
+ok 37 - [013_class.h]: test the \class and \headerfile commands
+ok 38 - [049_snippet.cpp]: test the \snippet command
+ok 39 - [032_include.cpp]: test the \include and \includelineno commands
+ok 40 - [011_category.m]: test the \interface and \category command
+ok 41 - [052_tilde.dox]: test \~ command
+ok 42 - [004_arg.dox]: test \arg and \li commands
+ok 43 - [019_defgroup.c]: test the \defgroup, \addtogroup, and \ingroup command.
+ok 44 - [036_link.c]: test \link command
+ok 45 - [002_addindex.dox]: test \addindex command
+ok 46 - [053_tilde.dox]: test \~ command with non default OUTPUT_LANGUAGE
+ok 47 - [048_showinit.c]: test the \showinit command
+ok 48 - [027_extends.c]: test the \extends, \implements, \memberof, \private, and \public commands
+ok 49 - [057_caller_graphs.tcl]: test for completeness and correctness of references/referencedby relations 
+ok 50 - [064_castoperator.cpp]: test linking to the cast operator with and without const
+ok 51 - [035_invariant.c]: test \invariant, \pre and \post commands
+ok 52 - [031_image.dox]: test the \image command
+ok 53 - [041_overload.cpp]: test the \overload command
+ok 54 - [028_formula.c]: test the \f$, \f[, \f], \f{, and \f} commands
+ok 55 - [030_htmlinclude.dox]: test the \htmlinclude command
+ok 56 - [005_attention.dox]: test \attention, \not, \remark, \warning, and \par commands
+ok 57 - [003_anchor.dox]: test \anchor command
+ok 58 - [025_example.cpp]: test the \example command
+ok 59 - [058_bracket_recursion.tcl]: tests processing of commands inside brackets [], only references/referencedby relations are relevant
+ok 60 - [059_command_catch.tcl]: tests processing of catch/eval, only references/referencedby relations are relevant
+ok 61 - [014_code.dox]: test the \code command
+ok 62 - [016_copydoc.c]: test the \copydoc, \copybrief, \copydetails, and \details commands
+ok 63 - [020_only.dox]: test the \*only and \*endonly commands
+ok 64 - [063_bug_729092.tcl]: test for bug 729092 - TCL: Full documentation not shown for procs in namespaces.
+ok 65 - [047_return.cpp]: test the \result, \return, and \returns commands
+1 out of 65 tests failed
+testing/CMakeFiles/tests.dir/build.make:57: recipe for target 'testing/CMakeFiles/tests' failed
+make[4]: *** [testing/CMakeFiles/tests] Error 1
+CMakeFiles/Makefile2:495: recipe for target 'testing/CMakeFiles/tests.dir/all' failed
+make[3]: *** [testing/CMakeFiles/tests.dir/all] Error 2
+CMakeFiles/Makefile2:502: recipe for target 'testing/CMakeFiles/tests.dir/rule' failed
+make[2]: *** [testing/CMakeFiles/tests.dir/rule] Error 2
+Makefile:192: recipe for target 'testing/CMakeFiles/tests.dir/rule' failed