Attachment 47376 Details for Bug 10890 – [PATCH 3/3] Remove all support for Doxygen

[patch] [PATCH 3/3] Remove all support for Doxygen

0003-Remove-all-support-for-Doxygen.patch (text/plain), 11.88 KB, created by Simon McVittie on 2011-05-31 07:33:44 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Simon McVittie

Created: 2011-05-31 07:33:44 UTC

Size: 11.88 KB

patch

obsolete

>From 9e329caaf946318da41c8cf1b29383a8b10afc0c Mon Sep 17 00:00:00 2001
>From: Simon McVittie <simon.mcvittie@collabora.co.uk>
>Date: Tue, 31 May 2011 15:30:56 +0100
>Subject: [PATCH 3/3] Remove all support for Doxygen
>
>Bug: https://bugs.freedesktop.org/show_bug.cgi?id=10890
>---
> Doxyfile.in    |  180 --------------------------------------------------------
> Makefile.am    |    2 -
> README         |    1 -
> configure.ac   |   34 +----------
> doc/api/README |    3 -
> 5 files changed, 1 insertions(+), 219 deletions(-)
> delete mode 100644 Doxyfile.in
> delete mode 100644 doc/api/README
>
>diff --git a/Doxyfile.in b/Doxyfile.in
>deleted file mode 100644
>index cf8de3c..0000000
>--- a/Doxyfile.in
>+++ /dev/null
>@@ -1,180 +0,0 @@
>-# Doxyfile 0.1
>-
>-#---------------------------------------------------------------------------
>-# General configuration options
>-#---------------------------------------------------------------------------
>-PROJECT_NAME           = D-BUS GLib Bindings
>-PROJECT_NUMBER         = @VERSION@
>-OUTPUT_DIRECTORY       = doc/api
>-OUTPUT_LANGUAGE        = English
>-EXTRACT_ALL            = NO
>-EXTRACT_PRIVATE        = NO
>-EXTRACT_STATIC         = NO
>-HIDE_UNDOC_MEMBERS     = NO
>-HIDE_UNDOC_CLASSES     = NO
>-BRIEF_MEMBER_DESC      = YES
>-REPEAT_BRIEF           = YES
>-ALWAYS_DETAILED_SEC    = NO
>-FULL_PATH_NAMES        = NO
>-STRIP_FROM_PATH        = 
>-INTERNAL_DOCS          = NO
>-STRIP_CODE_COMMENTS    = YES
>-CASE_SENSE_NAMES       = YES
>-SHORT_NAMES            = NO
>-HIDE_SCOPE_NAMES       = NO
>-VERBATIM_HEADERS       = YES
>-SHOW_INCLUDE_FILES     = YES
>-JAVADOC_AUTOBRIEF      = YES
>-INHERIT_DOCS           = YES
>-INLINE_INFO            = YES
>-SORT_MEMBER_DOCS       = YES
>-DISTRIBUTE_GROUP_DOC   = NO
>-TAB_SIZE               = 8
>-GENERATE_TODOLIST      = YES
>-GENERATE_TESTLIST      = YES
>-GENERATE_BUGLIST       = YES
>-ALIASES                = 
>-ENABLED_SECTIONS       = 
>-MAX_INITIALIZER_LINES  = 30
>-OPTIMIZE_OUTPUT_FOR_C  = YES
>-SHOW_USED_FILES        = YES
>-#---------------------------------------------------------------------------
>-# configuration options related to warning and progress messages
>-#---------------------------------------------------------------------------
>-QUIET                  = YES
>-WARNINGS               = YES
>-WARN_IF_UNDOCUMENTED   = YES
>-WARN_FORMAT            = 
>-WARN_LOGFILE           = 
>-#---------------------------------------------------------------------------
>-# configuration options related to the input files
>-#---------------------------------------------------------------------------
>-INPUT                  = dbus
>-FILE_PATTERNS          = *.c *.h
>-RECURSIVE              = YES
>-#EXCLUDE                = test
>-
>-# If the value of the INPUT tag contains directories, you can use the 
>-# EXCLUDE_PATTERNS tag to specify one or more wildcard patterns to exclude 
>-# certain files from those directories.
>-
>-EXCLUDE_PATTERNS       = Makefile.* ChangeLog CHANGES CHANGES.* README \
>-                         README.* *.png AUTHORS DESIGN DESIGN.* *.desktop \
>-                         DESKTOP* COMMENTS HOWTO magic NOTES TODO THANKS
>-
>-# The EXAMPLE_PATH tag can be used to specify one or more files or 
>-# directories that contain example code fragments that are included (see 
>-# the \include command).
>-
>-EXAMPLE_PATH           = 
>-EXAMPLE_PATTERNS       = 
>-EXAMPLE_RECURSIVE      = NO
>-IMAGE_PATH             = 
>-INPUT_FILTER           = 
>-FILTER_SOURCE_FILES    = NO
>-#---------------------------------------------------------------------------
>-# configuration options related to source browsing
>-#---------------------------------------------------------------------------
>-SOURCE_BROWSER         = YES
>-INLINE_SOURCES         = NO
>-REFERENCED_BY_RELATION = YES
>-REFERENCES_RELATION    = YES
>-#---------------------------------------------------------------------------
>-# configuration options related to the alphabetical class index
>-#---------------------------------------------------------------------------
>-ALPHABETICAL_INDEX     = NO
>-COLS_IN_ALPHA_INDEX    = 5
>-IGNORE_PREFIX          = 
>-#---------------------------------------------------------------------------
>-# configuration options related to the HTML output
>-#---------------------------------------------------------------------------
>-GENERATE_HTML          = YES
>-HTML_OUTPUT            = 
>-HTML_HEADER            = 
>-HTML_FOOTER            = 
>-HTML_STYLESHEET        = 
>-HTML_ALIGN_MEMBERS     = YES
>-GENERATE_HTMLHELP      = NO
>-GENERATE_CHI           = NO
>-BINARY_TOC             = NO
>-TOC_EXPAND             = NO
>-DISABLE_INDEX          = NO
>-ENUM_VALUES_PER_LINE   = 4
>-GENERATE_TREEVIEW      = NO
>-TREEVIEW_WIDTH         = 250
>-#---------------------------------------------------------------------------
>-# configuration options related to the LaTeX output
>-#---------------------------------------------------------------------------
>-GENERATE_LATEX         = NO
>-LATEX_OUTPUT           = 
>-COMPACT_LATEX          = NO
>-PAPER_TYPE             = a4wide
>-EXTRA_PACKAGES         = 
>-LATEX_HEADER           = 
>-PDF_HYPERLINKS         = NO
>-USE_PDFLATEX           = NO
>-LATEX_BATCHMODE        = NO
>-#---------------------------------------------------------------------------
>-# configuration options related to the RTF output
>-#---------------------------------------------------------------------------
>-GENERATE_RTF           = NO
>-RTF_OUTPUT             = 
>-COMPACT_RTF            = NO
>-RTF_HYPERLINKS         = NO
>-RTF_STYLESHEET_FILE    = 
>-RTF_EXTENSIONS_FILE    = 
>-#---------------------------------------------------------------------------
>-# configuration options related to the man page output
>-#---------------------------------------------------------------------------
>-GENERATE_MAN           = YES
>-MAN_OUTPUT             = man
>-MAN_EXTENSION          = .3dbus
>-MAN_LINKS              = YES
>-#---------------------------------------------------------------------------
>-# configuration options related to the XML output
>-#---------------------------------------------------------------------------
>-GENERATE_XML           = NO
>-#---------------------------------------------------------------------------
>-# Configuration options related to the preprocessor   
>-#---------------------------------------------------------------------------
>-ENABLE_PREPROCESSING   = YES
>-MACRO_EXPANSION        = YES
>-EXPAND_ONLY_PREDEF     = YES
>-SEARCH_INCLUDES        = YES
>-INCLUDE_PATH           = 
>-INCLUDE_FILE_PATTERNS  = 
>-PREDEFINED             = "DBUS_BEGIN_DECLS=" 			\
>-			 "DBUS_END_DECLS=" 			\
>-			 "DOXYGEN_SHOULD_SKIP_THIS" 		\
>-			 "_DBUS_DEFINE_GLOBAL_LOCK(name)="	\
>-			 "_DBUS_GNUC_PRINTF(from,to)="
>-SKIP_FUNCTION_MACROS   = YES
>-#---------------------------------------------------------------------------
>-# Configuration::addtions related to external references   
>-#---------------------------------------------------------------------------
>-TAGFILES               = 
>-GENERATE_TAGFILE       = 
>-ALLEXTERNALS           = NO
>-PERL_PATH              = 
>-#---------------------------------------------------------------------------
>-# Configuration options related to the dot tool   
>-#---------------------------------------------------------------------------
>-CLASS_DIAGRAMS         = YES
>-HAVE_DOT               = NO
>-CLASS_GRAPH            = YES
>-COLLABORATION_GRAPH    = YES
>-TEMPLATE_RELATIONS     = YES
>-HIDE_UNDOC_RELATIONS   = YES
>-INCLUDE_GRAPH          = YES
>-INCLUDED_BY_GRAPH      = YES
>-GRAPHICAL_HIERARCHY    = YES
>-DOT_PATH               = 
>-DOTFILE_DIRS           = 
>-MAX_DOT_GRAPH_WIDTH    = 640
>-MAX_DOT_GRAPH_HEIGHT   = 1024
>-GENERATE_LEGEND        = YES
>-DOT_CLEANUP            = YES
>-#---------------------------------------------------------------------------
>-# Configuration::addtions related to the search engine   
>-#---------------------------------------------------------------------------
>-SEARCHENGINE           = NO
>diff --git a/Makefile.am b/Makefile.am
>index 278daed..296203f 100644
>--- a/Makefile.am
>+++ b/Makefile.am
>@@ -38,8 +38,6 @@ $(srcdir)/ChangeLog:
> 	  echo A git checkout and git-log are required to generate this file >> $@); \
> 	fi
> 
>-all-local: Doxyfile
>-
> %.tar.gz.asc: %.tar.gz
> 	$(AM_V_GEN)gpg --detach-sign --armor $@
> 
>diff --git a/README b/README
>index 2dbb588..9f22bf3 100644
>--- a/README
>+++ b/README
>@@ -23,7 +23,6 @@ the ./configure program.
>   --enable-asserts        include assertion checks
>   --enable-checks         include sanity checks on public API
>   --enable-xml-docs       build XML documentation (requires xmlto)
>-  --enable-doxygen-docs   build DOXYGEN documentation (requires Doxygen)
>   --enable-gcov           compile with coverage profiling instrumentation (gcc only)
>   --with-xml=libxml/expat           XML library to use
>   --with-gnu-ld                     assume the C compiler uses GNU ld [default=no]
>diff --git a/configure.ac b/configure.ac
>index 647c6fc..d438817 100644
>--- a/configure.ac
>+++ b/configure.ac
>@@ -53,7 +53,6 @@ AC_ARG_ENABLE(ansi, AS_HELP_STRING([--enable-ansi],[enable -ansi -pedantic gcc f
> AC_ARG_ENABLE(verbose-mode, AS_HELP_STRING([--enable-verbose-mode],[support verbose debug mode]),enable_verbose_mode=$enableval,enable_verbose_mode=$USE_MAINTAINER_MODE)
> AC_ARG_ENABLE(asserts, AS_HELP_STRING([--enable-asserts],[include assertion checks]),enable_asserts=$enableval,enable_asserts=$USE_MAINTAINER_MODE)
> AC_ARG_ENABLE(checks, AS_HELP_STRING([--enable-checks],[include sanity checks on public API]),enable_checks=$enableval,enable_checks=yes)
>-AC_ARG_ENABLE(doxygen-docs, AS_HELP_STRING([--enable-doxygen-docs],[build DOXYGEN documentation (requires Doxygen)]),enable_doxygen_docs=$enableval,enable_doxygen_docs=auto)
> AC_ARG_ENABLE(gcov, AS_HELP_STRING([--enable-gcov],[compile with coverage profiling instrumentation (gcc only)]),enable_gcov=$enableval,enable_gcov=no)
> AC_ARG_ENABLE(bash-completion, AS_HELP_STRING([--enable-bash-completion],[install bash completion scripts]),enable_bash_completion=$enableval,enable_bash_completion=yes)
> AC_ARG_WITH(test-socket-dir, AS_HELP_STRING([--with-test-socket-dir=[dirname]],[Where to put sockets for make check]))
>@@ -398,35 +397,6 @@ AC_SUBST(DBUS_GLIB_TOOL_LIBS)
> ### gtk-doc Documentation
> GTK_DOC_CHECK(1.4)
> 
>-### Doxygen Documentation
>-
>-AC_PATH_PROG(DOXYGEN, doxygen, no)
>-
>-AC_MSG_CHECKING([whether to build Doxygen documentation])
>-
>-if test x$DOXYGEN = xno ; then
>-    have_doxygen=no
>-else
>-    have_doxygen=yes
>-fi
>-
>-if test x$enable_doxygen_docs = xauto ; then
>-    if test x$have_doxygen = xno ; then
>-        enable_doxygen_docs=no
>-    else
>-        enable_doxygen_docs=yes
>-    fi
>-fi
>-
>-if test x$enable_doxygen_docs = xyes; then
>-    if test x$have_doxygen = xno; then
>-	AC_MSG_ERROR([Building Doxygen docs explicitly required, but Doxygen not found])
>-    fi
>-fi
>-
>-AM_CONDITIONAL(DBUS_DOXYGEN_DOCS_ENABLED, test x$enable_doxygen_docs = xyes)
>-AC_MSG_RESULT(yes)
>-
> #### Have to go $localstatedir->$prefix/var->/usr/local/var   
> #### someone please fix this a better way...
> 
>@@ -523,7 +493,6 @@ test/data/valid-service-files/interfaces-test.service
> tools/Makefile
> dbus-glib-1.pc
> dbus-glib-1-uninstalled.pc
>-Doxyfile
> ])
> 
> dnl ==========================================================================
>@@ -542,7 +511,7 @@ echo "
> 	compiler:		  ${CC}
> 	cflags:		          ${CFLAGS}
> 	cppflags:		  ${CPPFLAGS}
>-        Doxygen:                  ${DOXYGEN}"
>+"
> 
> echo "
>         Maintainer mode:          ${USE_MAINTAINER_MODE}
>@@ -551,7 +520,6 @@ echo "
>         Building verbose mode:    ${enable_verbose_mode}
>         Building assertions:      ${enable_asserts}
>         Building checks:          ${enable_checks}
>-        Building Doxygen docs:    ${enable_doxygen_docs}
>         Building Gtk-doc docs:    ${enable_gtk_doc}
>         Bash Completion:          ${enable_bash_completion}
>         Gettext libs (empty OK):  ${INTLLIBS}
>diff --git a/doc/api/README b/doc/api/README
>deleted file mode 100644
>index baf9f97..0000000
>--- a/doc/api/README
>+++ /dev/null
>@@ -1,3 +0,0 @@
>-This is where the doxygen docs are generated
>-
>-Run doxygen on the Doxyfile generated in the root directory
>-- 
>1.7.5.3
>

Actions: View | Splinter Review

Attachments on bug 10890: 41840 | 47374 | 47375 | 47376

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.