Skip to content

Commit

Permalink
(maint) Confirm doxygen issues no warnings
Browse files Browse the repository at this point in the history
Changes the doxygen test to use quiet output and scrape for any
warnings, as WARN_LOGFILE doesn't appear to work.

Also fix a few doxygen warnings. In particular, make Extensibility.md
part of the docs so we can use a relative reference.

Update Doxygen to 1.8.10; no strict requirement for this, only keeping
it up-to-date.
  • Loading branch information
Michael Smith committed Jul 23, 2015
1 parent ceb160f commit 64ad566
Show file tree
Hide file tree
Showing 6 changed files with 13 additions and 12 deletions.
9 changes: 3 additions & 6 deletions .travis.yml
Expand Up @@ -32,12 +32,9 @@ before_install:
- tar xjvf pcre-8.36_install.tar.bz2 --strip 1 -C $USERDIR
- wget https://s3.amazonaws.com/kylo-pl-bucket/cppcheck-1.69_install.tar.bz2
- tar xjvf cppcheck-1.69_install.tar.bz2 --strip 1 -C $USERDIR
# grab a pre-built doxygen 1.8.7 from s3
- wget https://s3.amazonaws.com/kylo-pl-bucket/doxygen_install.tar.bz2
- tar xjvf doxygen_install.tar.bz2 --strip 1 -C $USERDIR
# Install dependencies of cfacter
- wget https://s3.amazonaws.com/kylo-pl-bucket/yaml-cpp-0.5.1_install.tar.bz2
- tar xjvf yaml-cpp-0.5.1_install.tar.bz2 --strip 1 -C $USERDIR
# grab a pre-built doxygen 1.8.10
- wget https://s3.amazonaws.com/kylo-pl-bucket/doxygen-1.8.10.linux.bin.tar.gz
- tar xzvf doxygen-1.8.10.linux.bin.tar.gz --strip 1 -C $USERDIR
# Install dependencies of facter
- wget https://s3.amazonaws.com/kylo-pl-bucket/yaml-cpp-0.5.1_install.tar.bz2
- tar xjvf yaml-cpp-0.5.1_install.tar.bz2 --strip 1 -C $USERDIR
Expand Down
2 changes: 1 addition & 1 deletion README.md
Expand Up @@ -7,7 +7,7 @@ An implementation of facter functionality in C++11, providing:
* an executable for standalone command line usage
* a ruby file to enable `require 'facter'`.

Please see our [extensibility document](https://github.com/puppetlabs/facter/blob/master/Extensibility.md) to learn more
Please see our [extensibility document](Extensibility.md) to learn more
about extending native facter using custom and external facts.

Build Requirements
Expand Down
3 changes: 2 additions & 1 deletion lib/Doxyfile
Expand Up @@ -694,7 +694,7 @@ CITE_BIB_FILES =
# messages are off.
# The default value is: NO.

QUIET = NO
QUIET = YES

# The WARNINGS tag can be used to turn on/off the warning messages that are
# generated to standard error ( stderr) by doxygen. If WARNINGS is set to YES
Expand Down Expand Up @@ -755,6 +755,7 @@ WARN_LOGFILE = html/warnings.txt
# Note: If this tag is empty the current directory is searched.

INPUT = ../README.md \
../Extensibility.md \
inc \
docs

Expand Down
4 changes: 4 additions & 0 deletions lib/inc/facter/facts/collection.hpp
Expand Up @@ -224,6 +224,10 @@ namespace facter { namespace facts {
void resolve_facts();

protected:
/**
* Gets external fact directories for the current platform.
* @return A list of file paths that will be searched for external facts.
*/
virtual std::vector<std::string> get_external_fact_directories() const;

private:
Expand Down
2 changes: 1 addition & 1 deletion lib/inc/facter/logging/logging.hpp
Expand Up @@ -159,7 +159,7 @@ namespace facter { namespace logging {
/**
* Starts colorizing for the given logging level.
* This is a no-op on platforms that don't natively support terminal colors.
* @param dst The stream to colorize.
* @param os The stream to colorize.
* @param lvl The logging level to colorize for. Defaults to none, which resets colorization.
*/
LIBFACTER_EXPORT void colorize(std::ostream &os, level lvl = level::none);
Expand Down
5 changes: 2 additions & 3 deletions scripts/travis_target.sh
Expand Up @@ -37,9 +37,8 @@ function travis_make()
if [ $1 == "cpplint" ]; then
# Verify documentation
pushd ../lib
doxygen
if [[ -s html/warnings.txt ]]; then
cat html/warnings.txt
doxygen 2>&1 | ( ! grep . )
if [ $? -ne 0 ]; then
echo "documentation failed."
exit 1
fi
Expand Down

0 comments on commit 64ad566

Please sign in to comment.