Repository: guacamole-server Updated Branches: refs/heads/master f72de1032 -> 5295886f6
GUACAMOLE-423: Automatically populate package version within Doxyfile. Project: http://git-wip-us.apache.org/repos/asf/guacamole-server/repo Commit: http://git-wip-us.apache.org/repos/asf/guacamole-server/commit/798ba1e5 Tree: http://git-wip-us.apache.org/repos/asf/guacamole-server/tree/798ba1e5 Diff: http://git-wip-us.apache.org/repos/asf/guacamole-server/diff/798ba1e5 Branch: refs/heads/master Commit: 798ba1e5bef741b80e5a36feb48b8352f5020442 Parents: 89912dc Author: Michael Jumper <mjum...@apache.org> Authored: Wed Dec 6 00:34:47 2017 -0800 Committer: Michael Jumper <mjum...@apache.org> Committed: Wed Dec 6 01:13:39 2017 -0800 ---------------------------------------------------------------------- .gitignore | 1 + Makefile.am | 16 +++++++------- configure.ac | 1 + doc/Doxyfile | 60 ---------------------------------------------------- doc/Doxyfile.in | 60 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 70 insertions(+), 68 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/guacamole-server/blob/798ba1e5/.gitignore ---------------------------------------------------------------------- diff --git a/.gitignore b/.gitignore index ec740cc..dec0cd1 100644 --- a/.gitignore +++ b/.gitignore @@ -23,6 +23,7 @@ .deps/ .dirstamp .libs/ +Doxyfile Makefile Makefile.in aclocal.m4 http://git-wip-us.apache.org/repos/asf/guacamole-server/blob/798ba1e5/Makefile.am ---------------------------------------------------------------------- diff --git a/Makefile.am b/Makefile.am index 950cf74..8dfa9d1 100644 --- a/Makefile.am +++ b/Makefile.am @@ -75,13 +75,13 @@ if ENABLE_GUACENC SUBDIRS += src/guacenc endif -EXTRA_DIST = \ - .dockerignore \ - CONTRIBUTING \ - Dockerfile \ - LICENSE \ - NOTICE \ - bin/guacctl \ - doc/Doxyfile \ +EXTRA_DIST = \ + .dockerignore \ + CONTRIBUTING \ + Dockerfile \ + LICENSE \ + NOTICE \ + bin/guacctl \ + doc/Doxyfile.in \ src/guacd-docker http://git-wip-us.apache.org/repos/asf/guacamole-server/blob/798ba1e5/configure.ac ---------------------------------------------------------------------- diff --git a/configure.ac b/configure.ac index e04d581..b2d678c 100644 --- a/configure.ac +++ b/configure.ac @@ -1196,6 +1196,7 @@ AM_CONDITIONAL([ENABLE_GUACENC], [test "x${enable_guacenc}" = "xyes" \ # AC_CONFIG_FILES([Makefile + doc/Doxyfile tests/Makefile src/common/Makefile src/common-ssh/Makefile http://git-wip-us.apache.org/repos/asf/guacamole-server/blob/798ba1e5/doc/Doxyfile ---------------------------------------------------------------------- diff --git a/doc/Doxyfile b/doc/Doxyfile deleted file mode 100644 index 5903564..0000000 --- a/doc/Doxyfile +++ /dev/null @@ -1,60 +0,0 @@ -# -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, -# software distributed under the License is distributed on an -# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the License for the -# specific language governing permissions and limitations -# under the License. -# - -# -# Project name / version -# - -PROJECT_NAME = libguac -PROJECT_NUMBER = 0.9.13-incubating - -# -# Warn about undocumented parameters and return values, but do not fill output -# with verbose progress info. -# - -QUIET = YES -WARN_NO_PARAMDOC = YES - -# -# Output format -# - -ALPHABETICAL_INDEX = YES -GENERATE_HTML = YES -GENERATE_LATEX = NO -IGNORE_PREFIX = guac_ vguac_ -OPTIMIZE_OUTPUT_FOR_C = YES -OUTPUT_DIRECTORY = doxygen-output -RECURSIVE = YES -SHOW_INCLUDE_FILES = NO - -# -# Input format -# - -CASE_SENSE_NAMES = YES -EXCLUDE_SYMBOLS = __* guac_palette* -FILE_PATTERNS = *.h -INPUT = ../src/libguac/guacamole -JAVADOC_AUTOBRIEF = YES -STRIP_FROM_PATH = ../src/libguac -TAB_SIZE = 4 -TYPEDEF_HIDES_STRUCT = YES - http://git-wip-us.apache.org/repos/asf/guacamole-server/blob/798ba1e5/doc/Doxyfile.in ---------------------------------------------------------------------- diff --git a/doc/Doxyfile.in b/doc/Doxyfile.in new file mode 100644 index 0000000..83d54df --- /dev/null +++ b/doc/Doxyfile.in @@ -0,0 +1,60 @@ +# +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# + +# +# Project name / version +# + +PROJECT_NAME = libguac +PROJECT_NUMBER = @PACKAGE_VERSION@ + +# +# Warn about undocumented parameters and return values, but do not fill output +# with verbose progress info. +# + +QUIET = YES +WARN_NO_PARAMDOC = YES + +# +# Output format +# + +ALPHABETICAL_INDEX = YES +GENERATE_HTML = YES +GENERATE_LATEX = NO +IGNORE_PREFIX = guac_ vguac_ +OPTIMIZE_OUTPUT_FOR_C = YES +OUTPUT_DIRECTORY = doxygen-output +RECURSIVE = YES +SHOW_INCLUDE_FILES = NO + +# +# Input format +# + +CASE_SENSE_NAMES = YES +EXCLUDE_SYMBOLS = __* guac_palette* +FILE_PATTERNS = *.h +INPUT = ../src/libguac/guacamole +JAVADOC_AUTOBRIEF = YES +STRIP_FROM_PATH = ../src/libguac +TAB_SIZE = 4 +TYPEDEF_HIDES_STRUCT = YES +
