LEMON/LEMON-official Changeset - r1038:27ddc8009ac3

Repositories » LEMON » LEMON-official

Summary
Changelog
Files
Switch To
- loading...
Options
- Lightweight changelog
- Search
Pull Requests

Changeset - r1038:27ddc8009ac3

« 1037:d3b041
« 1034:653259

1052:c1e8f6 »

r1038:27ddc8009ac3

Fri, 04 Mar 2011 11:22:50

[Not Reviewed]

0 comments (0 inline)

alpar (Alpar Juttner)
alpar@cs.elte.hu

Merge #404 to branch 1.1

1 4 1

merge 1.1

1 file changed with 55 insertions and 23 deletions:

configure.ac

doc/CMakeLists.txt

doc/Doxyfile.in

doc/DoxygenLayout.xml

doc/mainpage.dox.in

↑ Collapse diff ↑

configure.ac

Show inline comments

@@ -99,5 +99,5 @@
 		dnl Add dependencies on files generated by configure.
 		AC_SUBST([CONFIG_STATUS_DEPENDENCIES],
 		  ['$(top_srcdir)/doc/Doxyfile.in $(top_srcdir)/lemon/lemon.pc.in $(top_srcdir)/cmake/version.cmake.in'])
+		  ['$(top_srcdir)/doc/Doxyfile.in $(top_srcdir)/doc/mainpage.dox.in $(top_srcdir)/lemon/lemon.pc.in $(top_srcdir)/cmake/version.cmake.in'])
 		AC_CONFIG_FILES([
@@ -106,4 +106,5 @@
 		cmake/version.cmake
 		doc/Doxyfile
 		doc/mainpage.dox
 		lemon/lemon.pc
 		])

doc/CMakeLists.txt

Show inline comments

@@ -12,4 +12,10 @@
+		)
 		CONFIGURE_FILE(
 		  ${PROJECT_SOURCE_DIR}/doc/mainpage.dox.in
 		  ${PROJECT_BINARY_DIR}/doc/mainpage.dox
 		  @ONLY
+		)
 		IF(DOXYGEN_EXECUTABLE AND GHOSTSCRIPT_EXECUTABLE)
 		  FILE(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/html/)

doc/Doxyfile.in

Show inline comments

-		# Doxyfile 1.5.9
+		# Doxyfile 1.7.3
 		#---------------------------------------------------------------------------
@@ -5,6 +5,8 @@
 		#---------------------------------------------------------------------------
 		DOXYFILE_ENCODING      = UTF-8
 		PROJECT_NAME           = @PACKAGE_NAME@
 		PROJECT_NUMBER         = @PACKAGE_VERSION@
 		PROJECT_NAME           =
 		PROJECT_NUMBER         =
 		PROJECT_BRIEF          =
 		PROJECT_LOGO           =
 		OUTPUT_DIRECTORY       =
 		CREATE_SUBDIRS         = NO
@@ -30,4 +32,5 @@
 		OPTIMIZE_FOR_FORTRAN   = NO
 		OPTIMIZE_OUTPUT_VHDL   = NO
 		EXTENSION_MAPPING      =
 		BUILTIN_STL_SUPPORT    = YES
 		CPP_CLI_SUPPORT        = NO
@@ -55,9 +58,12 @@
 		HIDE_SCOPE_NAMES       = YES
 		SHOW_INCLUDE_FILES     = YES
 		FORCE_LOCAL_INCLUDES   = NO
 		INLINE_INFO            = YES
 		SORT_MEMBER_DOCS       = NO
 		SORT_BRIEF_DOCS        = NO
 		SORT_MEMBERS_CTORS_1ST = NO
 		SORT_GROUP_NAMES       = NO
 		SORT_BY_SCOPE_NAME     = NO
 		STRICT_PROTO_MATCHING  = NO
 		GENERATE_TODOLIST      = YES
 		GENERATE_TESTLIST      = YES
@@ -91,5 +97,6 @@
 		                         "@abs_top_srcdir@/demo" \
 		                         "@abs_top_srcdir@/tools" \
 		                         "@abs_top_srcdir@/test/test_tools.h"
+		                         "@abs_top_srcdir@/test/test_tools.h" \
 		                         "@abs_top_builddir@/doc/mainpage.dox"
 		INPUT_ENCODING         = UTF-8
 		FILE_PATTERNS          = *.h \
@@ -111,4 +118,5 @@
 		FILTER_PATTERNS        =
 		FILTER_SOURCE_FILES    = NO
 		FILTER_SOURCE_PATTERNS =
 		#---------------------------------------------------------------------------
 		# configuration options related to source browsing
@@ -137,9 +145,15 @@
 		HTML_FOOTER            =
 		HTML_STYLESHEET        =
 		HTML_COLORSTYLE_HUE    = 220
 		HTML_COLORSTYLE_SAT    = 100
 		HTML_COLORSTYLE_GAMMA  = 80
 		HTML_TIMESTAMP         = YES
 		HTML_ALIGN_MEMBERS     = YES
-		HTML_DYNAMIC_SECTIONS  = NO
+		HTML_DYNAMIC_SECTIONS  = YES
 		GENERATE_DOCSET        = NO
 		DOCSET_FEEDNAME        = "Doxygen generated docs"
 		DOCSET_BUNDLE_ID       = org.doxygen.Project
 		DOCSET_PUBLISHER_ID    = org.doxygen.Publisher
 		DOCSET_PUBLISHER_NAME  = Publisher
 		GENERATE_HTMLHELP      = NO
 		CHM_FILE               =
@@ -153,10 +167,22 @@
 		QHP_NAMESPACE          = org.doxygen.Project
 		QHP_VIRTUAL_FOLDER     = doc
 		QHP_CUST_FILTER_NAME   =
 		QHP_CUST_FILTER_ATTRS  =
 		QHP_SECT_FILTER_ATTRS  =
 		QHG_LOCATION           =
 		GENERATE_ECLIPSEHELP   = NO
 		ECLIPSE_DOC_ID         = org.doxygen.Project
 		DISABLE_INDEX          = NO
 		ENUM_VALUES_PER_LINE   = 4
 		GENERATE_TREEVIEW      = NO
 		USE_INLINE_TREES       = NO
 		TREEVIEW_WIDTH         = 250
 		EXT_LINKS_IN_WINDOW    = NO
 		FORMULA_FONTSIZE       = 10
 		FORMULA_TRANSPARENT    = YES
 		USE_MATHJAX            = NO
 		MATHJAX_RELPATH        = http://www.mathjax.org/mathjax
 		SEARCHENGINE           = YES
 		SERVER_BASED_SEARCH    = NO
 		#---------------------------------------------------------------------------
 		# configuration options related to the LaTeX output
@@ -175,4 +201,5 @@
 		LATEX_BATCHMODE        = NO
 		LATEX_HIDE_INDICES     = NO
 		LATEX_SOURCE_CODE      = NO
 		#---------------------------------------------------------------------------
 		# configuration options related to the RTF output
@@ -223,5 +250,5 @@
 		SKIP_FUNCTION_MACROS   = YES
 		#---------------------------------------------------------------------------
-		# Options related to the search engine
+		# Configuration::additions related to external references
 		#---------------------------------------------------------------------------
 		TAGFILES               = "@abs_top_builddir@/doc/libstdc++.tag = http://gcc.gnu.org/onlinedocs/libstdc++/latest-doxygen/  "
@@ -237,4 +264,5 @@
 		HIDE_UNDOC_RELATIONS   = YES
 		HAVE_DOT               = YES
 		DOT_NUM_THREADS        = 0
 		DOT_FONTNAME           = FreeSans
 		DOT_FONTSIZE           = 10
@@ -254,4 +282,5 @@
 		DOT_PATH               =
 		DOTFILE_DIRS           =
 		MSCFILE_DIRS           =
 		DOT_GRAPH_MAX_NODES    = 50
 		MAX_DOT_GRAPH_DEPTH    = 0
@@ -260,6 +289,2 @@
 		GENERATE_LEGEND        = YES
 		DOT_CLEANUP            = YES
 		#---------------------------------------------------------------------------
 		# Configuration::additions related to the search engine
 		#---------------------------------------------------------------------------
 		SEARCHENGINE           = NO

doc/DoxygenLayout.xml

Show inline comments

@@ -3,22 +3,22 @@
 		  <navindex>
 		    <tab type="mainpage" visible="yes" title=""/>
 		    <tab type="modules" visible="yes" title=""/>
+		    <tab type="modules" visible="yes" title="" intro=""/>
 		    <tab type="classes" visible="yes" title="">
 		      <tab type="classes" visible="yes" title=""/>
+		      <tab type="classes" visible="yes" title="" intro=""/>
 		      <tab type="classindex" visible="$ALPHABETICAL_INDEX" title=""/>
 		      <tab type="hierarchy" visible="yes" title=""/>
 		      <tab type="classmembers" visible="yes" title=""/>
 		      <tab type="hierarchy" visible="yes" title="" intro=""/>
 		      <tab type="classmembers" visible="yes" title="" intro=""/>
 		    </tab>
 		    <tab type="namespaces" visible="yes" title="">
 		      <tab type="namespaces" visible="yes" title=""/>
 		      <tab type="namespacemembers" visible="yes" title=""/>
 		      <tab type="namespaces" visible="yes" title="" intro=""/>
 		      <tab type="namespacemembers" visible="yes" title="" intro=""/>
 		    </tab>
 		    <tab type="files" visible="yes" title="">
 		      <tab type="files" visible="yes" title=""/>
 		      <tab type="globals" visible="yes" title=""/>
 		      <tab type="files" visible="yes" title="" intro=""/>
 		      <tab type="globals" visible="yes" title="" intro=""/>
 		    </tab>
 		    <tab type="dirs" visible="yes" title=""/>
 		    <tab type="examples" visible="yes" title=""/>
-		    <tab type="pages" visible="yes" title=""/>
+		    <tab type="dirs" visible="yes" title="" intro=""/>
 		    <tab type="examples" visible="yes" title="" intro=""/>
 		    <tab type="pages" visible="yes" title="" intro=""/>
 		  </navindex>

doc/mainpage.dox.in

Show inline comments

@@ -18,5 +18,5 @@
 		/**
-		\mainpage LEMON Documentation
+		\mainpage @PACKAGE_NAME@ @PACKAGE_VERSION@ Documentation
 		\section intro Introduction

0 comments (0 inline)

RhodeCode

Login to your account