development/bootstrap-build-environment
1
0
Fork 0
Code Issues Pull Requests Releases Activity

fixed documentation problem: startuml is now part of doxygen

Browse Source
This commit is contained in:
Marc Wäckerlin
2016-09-04 19:13:22 +00:00
parent a40c0c5294
commit 1069530530
2 changed files with 7 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
scripts/ax_init_standard_project.m4
View File

@@ -545,6 +545,11 @@ AC_DEFUN([AX_USE_SCRIPTS], [
# use this in configure.ac to support PlantUML in Doxygen generation # use this in configure.ac to support PlantUML in Doxygen generation
AC_DEFUN([AX_USE_PLANTUML], [ AC_DEFUN([AX_USE_PLANTUML], [
if test -f "${srcdir}/doc/plantuml.jar"; then
PLANTUML="doc/plantuml.jar"
AX_SUBST(PLANTUML)
fi
AM_CONDITIONAL(HAVE_PLANTUML, test -n "$PLANTUML")
]) ])
# use this in configure.ac to support Doxygen documentation generation # use this in configure.ac to support Doxygen documentation generation
@@ -552,11 +557,6 @@ AC_DEFUN([AX_USE_DOXYGEN], [
AC_CHECK_PROG(have_doxygen, doxygen, yes, no) AC_CHECK_PROG(have_doxygen, doxygen, yes, no)
AC_CHECK_PROG(have_dot, dot, yes, no) AC_CHECK_PROG(have_dot, dot, yes, no)
AC_CHECK_PROG(have_mscgen, mscgen, yes, no) AC_CHECK_PROG(have_mscgen, mscgen, yes, no)
if test -f "${srcdir}/doc/plantuml.jar"; then
PLANTUML="doc/plantuml.jar"
AX_SUBST(PLANTUML)
fi
AM_CONDITIONAL(HAVE_PLANTUML, test -n "$PLANTUML")
PDF_DOC=${PACKAGE_NAME}-${PACKAGE_VERSION}.pdf PDF_DOC=${PACKAGE_NAME}-${PACKAGE_VERSION}.pdf
AC_SUBST(PDF_DOC) AC_SUBST(PDF_DOC)
if test "$have_doxygen" = "no"; then if test "$have_doxygen" = "no"; then
@@ -581,21 +581,10 @@ AC_DEFUN([AX_USE_DOXYGEN], [
AX_ADD_MAKEFILE_TARGET_DEP([.PHONY], [pdf gen-uml-images], [doc/makefile.in]) AX_ADD_MAKEFILE_TARGET_DEP([.PHONY], [pdf gen-uml-images], [doc/makefile.in])
test -f doc/makefile.in && cat >> doc/makefile.in <<EOF test -f doc/makefile.in && cat >> doc/makefile.in <<EOF
#### Begin: Appended by $0 #### Begin: Appended by $0
doc: doxyfile @HAVE_PLANTUML_TRUE@ gen-uml-images doc: doxyfile
doxygen doxyfile doxygen doxyfile
@PEDANTIC_TRUE@ test \! -s doxygen.errors @PEDANTIC_TRUE@ test \! -s doxygen.errors
@HAVE_PLANTUML_TRUE@EXTRA_DIST = ${EXTRA_DIST} plantuml.jar
@HAVE_PLANTUML_TRUE@
@HAVE_PLANTUML_TRUE@gen-uml-images:
@HAVE_PLANTUML_TRUE@ test -d gen-uml-images || mkdir gen-uml-images
@HAVE_PLANTUML_TRUE@ eval \$\$(sed -n 's, *INPUT *\\(+\\?\\)= *\\(.*\\),INPUT\\1=" \\2",gp' doxyfile); \\
@HAVE_PLANTUML_TRUE@ eval \$\$(sed -n 's, *FILE_PATTERNS *\\(+\\?\\)= *\\(.*\\),FILE_PATTERNS\\1=" \\2",gp' doxyfile); \\
@HAVE_PLANTUML_TRUE@ SOURCES="**.("\$\$(echo \$\${FILE_PATTERNS} | sed 's,*.,,g;s, ,|,g')")"; \\
@HAVE_PLANTUML_TRUE@ for src in \$\$INPUT; do \\
@HAVE_PLANTUML_TRUE@ java -Djava.awt.headless=true -jar \${top_srcdir}/\${PLANTUML} -v -o \$\$(pwd)/gen-uml-images "\$\$src/\$\$SOURCES"; \\
@HAVE_PLANTUML_TRUE@ done
clean-documentation: clean-documentation:
-rm doxygen.errors @PDF_DOC@ -rm doxygen.errors @PDF_DOC@
distclean-documentation: distclean-documentation:

4
scripts/bootstrap.sh
View File

@@ -1008,9 +1008,7 @@ if testtag AX_USE_DOXYGEN; then
doxyadd ALIASES '"readme=@README_HTML@"' doxyadd ALIASES '"readme=@README_HTML@"'
doxyadd ALIASES '"author=<a href="@AUTHOR_URL@" target="_blank">@AUTHOR_NAME@</a>"' doxyadd ALIASES '"author=<a href="@AUTHOR_URL@" target="_blank">@AUTHOR_NAME@</a>"'
if testtag AX_USE_PLANTUML; then if testtag AX_USE_PLANTUML; then
doxyadd ALIASES '"startuml{1}=@image html \\1\\n@image latex \\1\\n\\if DontIgnorePlantUMLCode"' doxyreplace PLANTUML_JAR_PATH '"@top_srcdir@/@PLANTUML@"'
doxyadd ALIASES '"enduml=\\endif"'
doxyadd IMAGE_PATH '"gen-uml-images"'
fi fi
doxyreplace ENABLE_PREPROCESSING YES doxyreplace ENABLE_PREPROCESSING YES
doxyreplace MACRO_EXPANSION YES doxyreplace MACRO_EXPANSION YES