Skip to content

Commit fe6cbbc

Browse files
eskrocheskroch
committed
Merge branch 'master' into release-2.1
2 parents eaa4fc9 + 8f1da12 commit fe6cbbc

3 files changed

Lines changed: 59 additions & 15 deletions

File tree

‎documentation/doxygen/doxygen touch.config‎

Lines changed: 29 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Doxyfile 1.8.10
1+
# Doxyfile 1.8.11
22

33
# This file describes the settings to be used by the documentation system
44
# doxygen (www.doxygen.org) for a project.
@@ -758,6 +758,12 @@ WARN_IF_DOC_ERROR = YES
758758

759759
WARN_NO_PARAMDOC = YES
760760

761+
# If the WARN_AS_ERROR tag is set to YES then doxygen will immediately stop when
762+
# a warning is encountered.
763+
# The default value is: NO.
764+
765+
WARN_AS_ERROR = NO
766+
761767
# The WARN_FORMAT tag determines the format of the warning messages that doxygen
762768
# can produce. The string should contain the $file, $line, and $text tags, which
763769
# will be replaced by the file and line number from which the warning originated
@@ -808,8 +814,8 @@ INPUT_ENCODING = UTF-8
808814
# If left blank the following patterns are tested:*.c, *.cc, *.cxx, *.cpp,
809815
# *.c++, *.java, *.ii, *.ixx, *.ipp, *.i++, *.inl, *.idl, *.ddl, *.odl, *.h,
810816
# *.hh, *.hxx, *.hpp, *.h++, *.cs, *.d, *.php, *.php4, *.php5, *.phtml, *.inc,
811-
# *.m, *.markdown, *.md, *.mm, *.dox, *.py, *.f90, *.f, *.for, *.tcl, *.vhd,
812-
# *.vhdl, *.ucf, *.qsf, *.as and *.js.
817+
# *.m, *.markdown, *.md, *.mm, *.dox, *.py, *.pyw, *.f90, *.f, *.for, *.tcl,
818+
# *.vhd, *.vhdl, *.ucf, *.qsf, *.as and *.js.
813819

814820
FILE_PATTERNS =
815821

@@ -899,6 +905,10 @@ IMAGE_PATH = "$(SOURCE_ROOT)/../documentation/"
899905
# Note that the filter must not add or remove lines; it is applied before the
900906
# code is scanned, but not when the output code is generated. If lines are added
901907
# or removed, the anchors will not be placed correctly.
908+
#
909+
# Note that for custom extensions or not directly supported extensions you also
910+
# need to set EXTENSION_MAPPING for the extension otherwise the files are not
911+
# properly processed by doxygen.
902912

903913
INPUT_FILTER =
904914

@@ -908,6 +918,10 @@ INPUT_FILTER =
908918
# (like *.cpp=my_cpp_filter). See INPUT_FILTER for further information on how
909919
# filters are used. If the FILTER_PATTERNS tag is empty or if none of the
910920
# patterns match the file name, INPUT_FILTER is applied.
921+
#
922+
# Note that for custom extensions or not directly supported extensions you also
923+
# need to set EXTENSION_MAPPING for the extension otherwise the files are not
924+
# properly processed by doxygen.
911925

912926
FILTER_PATTERNS =
913927

@@ -1025,7 +1039,7 @@ VERBATIM_HEADERS = YES
10251039
# rich C++ code for which doxygen's built-in parser lacks the necessary type
10261040
# information.
10271041
# Note: The availability of this option depends on whether or not doxygen was
1028-
# compiled with the --with-libclang option.
1042+
# generated with the -Duse-libclang=ON option for CMake.
10291043
# The default value is: NO.
10301044

10311045
CLANG_ASSISTED_PARSING = NO
@@ -1770,6 +1784,14 @@ LATEX_SOURCE_CODE = NO
17701784

17711785
LATEX_BIB_STYLE = plain
17721786

1787+
# If the LATEX_TIMESTAMP tag is set to YES then the footer of each generated
1788+
# page will contain the date and time when the page was generated. Setting this
1789+
# to NO can help when comparing the output of multiple runs.
1790+
# The default value is: NO.
1791+
# This tag requires that the tag GENERATE_LATEX is set to YES.
1792+
1793+
LATEX_TIMESTAMP = NO
1794+
17731795
#---------------------------------------------------------------------------
17741796
# Configuration options related to the RTF output
17751797
#---------------------------------------------------------------------------
@@ -2044,9 +2066,9 @@ INCLUDE_FILE_PATTERNS =
20442066
PREDEFINED = TARGET_OS_IPHONE, \
20452067
TARGET_OS_TV, \
20462068
TARGET_OS_SIMULATOR, \
2047-
"NS_DESIGNATED_INITIALIZER:=''", \
2048-
"NS_RETURNS_INNER_POINTER:=''", \
2049-
"NS_ENUM(_type,_name):=enum _name : _type _name; enum _name : _type", \
2069+
"NS_DESIGNATED_INITIALIZER:='' ," \
2070+
"NS_RETURNS_INNER_POINTER:='' ," \
2071+
"NS_ENUM(_type,_name):=enum _name : _type _name; enum _name : _type ," \
20502072
"NS_OPTIONS(_type,_name):=enum _name : _type _name; enum _name : _type"
20512073

20522074
# If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then this

‎documentation/doxygen/doxygen.config‎

Lines changed: 29 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Doxyfile 1.8.10
1+
# Doxyfile 1.8.11
22

33
# This file describes the settings to be used by the documentation system
44
# doxygen (www.doxygen.org) for a project.
@@ -758,6 +758,12 @@ WARN_IF_DOC_ERROR = YES
758758

759759
WARN_NO_PARAMDOC = YES
760760

761+
# If the WARN_AS_ERROR tag is set to YES then doxygen will immediately stop when
762+
# a warning is encountered.
763+
# The default value is: NO.
764+
765+
WARN_AS_ERROR = NO
766+
761767
# The WARN_FORMAT tag determines the format of the warning messages that doxygen
762768
# can produce. The string should contain the $file, $line, and $text tags, which
763769
# will be replaced by the file and line number from which the warning originated
@@ -808,8 +814,8 @@ INPUT_ENCODING = UTF-8
808814
# If left blank the following patterns are tested:*.c, *.cc, *.cxx, *.cpp,
809815
# *.c++, *.java, *.ii, *.ixx, *.ipp, *.i++, *.inl, *.idl, *.ddl, *.odl, *.h,
810816
# *.hh, *.hxx, *.hpp, *.h++, *.cs, *.d, *.php, *.php4, *.php5, *.phtml, *.inc,
811-
# *.m, *.markdown, *.md, *.mm, *.dox, *.py, *.f90, *.f, *.for, *.tcl, *.vhd,
812-
# *.vhdl, *.ucf, *.qsf, *.as and *.js.
817+
# *.m, *.markdown, *.md, *.mm, *.dox, *.py, *.pyw, *.f90, *.f, *.for, *.tcl,
818+
# *.vhd, *.vhdl, *.ucf, *.qsf, *.as and *.js.
813819

814820
FILE_PATTERNS =
815821

@@ -899,6 +905,10 @@ IMAGE_PATH = "$(SOURCE_ROOT)/../documentation/"
899905
# Note that the filter must not add or remove lines; it is applied before the
900906
# code is scanned, but not when the output code is generated. If lines are added
901907
# or removed, the anchors will not be placed correctly.
908+
#
909+
# Note that for custom extensions or not directly supported extensions you also
910+
# need to set EXTENSION_MAPPING for the extension otherwise the files are not
911+
# properly processed by doxygen.
902912

903913
INPUT_FILTER =
904914

@@ -908,6 +918,10 @@ INPUT_FILTER =
908918
# (like *.cpp=my_cpp_filter). See INPUT_FILTER for further information on how
909919
# filters are used. If the FILTER_PATTERNS tag is empty or if none of the
910920
# patterns match the file name, INPUT_FILTER is applied.
921+
#
922+
# Note that for custom extensions or not directly supported extensions you also
923+
# need to set EXTENSION_MAPPING for the extension otherwise the files are not
924+
# properly processed by doxygen.
911925

912926
FILTER_PATTERNS =
913927

@@ -1025,7 +1039,7 @@ VERBATIM_HEADERS = YES
10251039
# rich C++ code for which doxygen's built-in parser lacks the necessary type
10261040
# information.
10271041
# Note: The availability of this option depends on whether or not doxygen was
1028-
# compiled with the --with-libclang option.
1042+
# generated with the -Duse-libclang=ON option for CMake.
10291043
# The default value is: NO.
10301044

10311045
CLANG_ASSISTED_PARSING = NO
@@ -1770,6 +1784,14 @@ LATEX_SOURCE_CODE = NO
17701784

17711785
LATEX_BIB_STYLE = plain
17721786

1787+
# If the LATEX_TIMESTAMP tag is set to YES then the footer of each generated
1788+
# page will contain the date and time when the page was generated. Setting this
1789+
# to NO can help when comparing the output of multiple runs.
1790+
# The default value is: NO.
1791+
# This tag requires that the tag GENERATE_LATEX is set to YES.
1792+
1793+
LATEX_TIMESTAMP = NO
1794+
17731795
#---------------------------------------------------------------------------
17741796
# Configuration options related to the RTF output
17751797
#---------------------------------------------------------------------------
@@ -2041,9 +2063,9 @@ INCLUDE_FILE_PATTERNS =
20412063
# recursively expanded use the := operator instead of the = operator.
20422064
# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
20432065

2044-
PREDEFINED = "NS_DESIGNATED_INITIALIZER:=''", \
2045-
"NS_RETURNS_INNER_POINTER:=''", \
2046-
"NS_ENUM(_type,_name):=enum _name : _type _name; enum _name : _type", \
2066+
PREDEFINED = "NS_DESIGNATED_INITIALIZER:='' ," \
2067+
"NS_RETURNS_INNER_POINTER:='' ," \
2068+
"NS_ENUM(_type,_name):=enum _name : _type _name; enum _name : _type ," \
20472069
"NS_OPTIONS(_type,_name):=enum _name : _type _name; enum _name : _type"
20482070

20492071
# If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then this

‎scripts/README Creating a release package.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ Follow these steps to create a Core Plot release and post it to GitHub:
66

77
<ul>
88
<li>Xcode 7</li>
9-
<li>[Doxygen](http://www.stack.nl/~dimitri/doxygen/download.html#latestsrc), version 1.8.10 or later, installed in <strong>/Applications</strong></li>
9+
<li>[Doxygen](http://www.stack.nl/~dimitri/doxygen/download.html#latestsrc), version 1.8.11 or later, installed in <strong>/Applications</strong></li>
1010
<li>[Graphviz](http://www.graphviz.org/Download_macos.php), version 2.36.0 or later</li>
1111
</ul>
1212

0 commit comments

Comments
 (0)