aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorSignpostMarv2012-10-29 11:16:35 +0000
committerJustin Clark-Casey (justincc)2013-01-03 00:17:24 +0000
commit4364d48817fbc003354101a9fbb84e225c7efe9a (patch)
tree26365e8db53d130369f480874a647a597b4b7727
parentran doxygen -s -u to upgrade the doxygen config file (diff)
downloadopensim-SC_OLD-4364d48817fbc003354101a9fbb84e225c7efe9a.zip
opensim-SC_OLD-4364d48817fbc003354101a9fbb84e225c7efe9a.tar.gz
opensim-SC_OLD-4364d48817fbc003354101a9fbb84e225c7efe9a.tar.bz2
opensim-SC_OLD-4364d48817fbc003354101a9fbb84e225c7efe9a.tar.xz
updating config properties added during upgrade process, adding error log file to doxygen config, adding doxygen output directory & error log to .gitignore
-rw-r--r--.gitignore2
-rw-r--r--doc/doxygen.conf16
2 files changed, 10 insertions, 8 deletions
diff --git a/.gitignore b/.gitignore
index 39a8333..f0a5487 100644
--- a/.gitignore
+++ b/.gitignore
@@ -95,3 +95,5 @@ OpenSim/Region/ScriptEngine/test-results/
95OpenSim/Tests/Common/test-results/ 95OpenSim/Tests/Common/test-results/
96OpenSim/Tests/test-results/ 96OpenSim/Tests/test-results/
97test-results/ 97test-results/
98doc/html
99doc/doxygen.error.log
diff --git a/doc/doxygen.conf b/doc/doxygen.conf
index 88926a0..148de9c 100644
--- a/doc/doxygen.conf
+++ b/doc/doxygen.conf
@@ -5,7 +5,7 @@
5#--------------------------------------------------------------------------- 5#---------------------------------------------------------------------------
6DOXYFILE_ENCODING = UTF-8 6DOXYFILE_ENCODING = UTF-8
7PROJECT_NAME = OpenSim 7PROJECT_NAME = OpenSim
8PROJECT_NUMBER = SVN 8PROJECT_NUMBER = GIT
9PROJECT_BRIEF = 9PROJECT_BRIEF =
10PROJECT_LOGO = 10PROJECT_LOGO =
11OUTPUT_DIRECTORY = 11OUTPUT_DIRECTORY =
@@ -93,7 +93,7 @@ WARN_IF_UNDOCUMENTED = YES
93WARN_IF_DOC_ERROR = YES 93WARN_IF_DOC_ERROR = YES
94WARN_NO_PARAMDOC = NO 94WARN_NO_PARAMDOC = NO
95WARN_FORMAT = "$file:$line: $text" 95WARN_FORMAT = "$file:$line: $text"
96WARN_LOGFILE = 96WARN_LOGFILE = doxygen.error.log
97#--------------------------------------------------------------------------- 97#---------------------------------------------------------------------------
98# configuration options related to the input files 98# configuration options related to the input files
99#--------------------------------------------------------------------------- 99#---------------------------------------------------------------------------
@@ -148,10 +148,10 @@ HTML_TIMESTAMP = YES
148HTML_DYNAMIC_SECTIONS = NO 148HTML_DYNAMIC_SECTIONS = NO
149HTML_INDEX_NUM_ENTRIES = 100 149HTML_INDEX_NUM_ENTRIES = 100
150GENERATE_DOCSET = NO 150GENERATE_DOCSET = NO
151DOCSET_FEEDNAME = "Doxygen generated docs" 151DOCSET_FEEDNAME = "OpenSimulator docs"
152DOCSET_BUNDLE_ID = org.doxygen.Project 152DOCSET_BUNDLE_ID = org.opensimulator.OpenSim
153DOCSET_PUBLISHER_ID = org.doxygen.Publisher 153DOCSET_PUBLISHER_ID = org.opensimulator.OpenSim
154DOCSET_PUBLISHER_NAME = Publisher 154DOCSET_PUBLISHER_NAME = OpenSim
155GENERATE_HTMLHELP = NO 155GENERATE_HTMLHELP = NO
156CHM_FILE = 156CHM_FILE =
157HHC_LOCATION = 157HHC_LOCATION =
@@ -161,14 +161,14 @@ BINARY_TOC = NO
161TOC_EXPAND = NO 161TOC_EXPAND = NO
162GENERATE_QHP = NO 162GENERATE_QHP = NO
163QCH_FILE = 163QCH_FILE =
164QHP_NAMESPACE = org.doxygen.Project 164QHP_NAMESPACE = org.opensimulator.OpenSim
165QHP_VIRTUAL_FOLDER = doc 165QHP_VIRTUAL_FOLDER = doc
166QHP_CUST_FILTER_NAME = 166QHP_CUST_FILTER_NAME =
167QHP_CUST_FILTER_ATTRS = 167QHP_CUST_FILTER_ATTRS =
168QHP_SECT_FILTER_ATTRS = 168QHP_SECT_FILTER_ATTRS =
169QHG_LOCATION = 169QHG_LOCATION =
170GENERATE_ECLIPSEHELP = NO 170GENERATE_ECLIPSEHELP = NO
171ECLIPSE_DOC_ID = org.doxygen.Project 171ECLIPSE_DOC_ID = org.opensimulator.OpenSim
172DISABLE_INDEX = NO 172DISABLE_INDEX = NO
173GENERATE_TREEVIEW = NO 173GENERATE_TREEVIEW = NO
174ENUM_VALUES_PER_LINE = 4 174ENUM_VALUES_PER_LINE = 4