diff --git a/.travis.yml b/.travis.yml index 52cdbf3c..5f3fe8d8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -26,33 +26,33 @@ before_script: - mkdir build - cd build +after_script: +- make install DESTDIR=`pwd`/root +- find root -type f -ls + jobs: include: - name: "Autotools Build (focal)" - env: BUILD=auto dist: focal script: - ../configure - - make + - make check - name: "CMake Build" - env: BUILD=cmake dist: jammy script: - cmake -DWITH_GNUTLS=YES -DWITH_OPENSSL=YES .. - make check - name: "Autotools Build" - env: BUILD=auto dist: jammy script: - ../configure --with-openssl --with-gnutls - make check - name: "Coverage Build" - env: BUILD=coverage dist: jammy script: - ../configure --without-gnutls --enable-code-coverage --enable-valgrind - - make check-valgrind check-code-coverage + - make check-valgrind check-code-coverage docbook-doc - codecov diff --git a/CMakeLists.txt b/CMakeLists.txt index 97eb7da3..e58a2e6a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -160,6 +160,7 @@ configure_file(libjwt/libjwt.pc.in libjwt.pc @ONLY) install(FILES ${CMAKE_BINARY_DIR}/libjwt.pc DESTINATION lib/pkgconfig) find_package(Doxygen) + if (DOXYGEN_FOUND) set(DOXYGEN_ENV_VARS "PROJECT=${PROJECT_NAME}" diff --git a/Doxyfile b/Doxyfile index 6867da64..eb663d92 100644 --- a/Doxyfile +++ b/Doxyfile @@ -1925,7 +1925,7 @@ EXTRA_SEARCH_MAPPINGS = # If the GENERATE_LATEX tag is set to YES, Doxygen will generate LaTeX output. # The default value is: YES. -GENERATE_LATEX = NO +GENERATE_LATEX = $(GENERATE_LATEX) # The LATEX_OUTPUT tag is used to specify where the LaTeX docs will be put. If a # relative path is entered the value of OUTPUT_DIRECTORY will be put in front of @@ -2051,7 +2051,7 @@ LATEX_EXTRA_FILES = # The default value is: YES. # This tag requires that the tag GENERATE_LATEX is set to YES. -PDF_HYPERLINKS = NO +PDF_HYPERLINKS = YES # If the USE_PDFLATEX tag is set to YES, Doxygen will use the engine as # specified with LATEX_CMD_NAME to generate the PDF file directly from the LaTeX @@ -2207,7 +2207,7 @@ MAN_SUBDIR = # The default value is: NO. # This tag requires that the tag GENERATE_MAN is set to YES. -MAN_LINKS = YES +MAN_LINKS = NO #--------------------------------------------------------------------------- # Configuration options related to the XML output diff --git a/configure.ac b/configure.ac index 076f8c4b..852776a2 100644 --- a/configure.ac +++ b/configure.ac @@ -128,14 +128,6 @@ AX_VALGRIND_CHECK AX_CODE_COVERAGE -DX_MAN_FEATURE(ON) -DX_HTML_FEATURE(ON) -DX_CHM_FEATURE(OFF) -DX_CHI_FEATURE(OFF) -DX_RTF_FEATURE(OFF) -DX_XML_FEATURE(OFF) -DX_PDF_FEATURE(OFF) -DX_PS_FEATURE(OFF) DX_ENV_APPEND(PROJECT_BRIEF, $PACKAGE_DESCRIPTION) DX_INIT_DOXYGEN($PACKAGE_NAME, Doxyfile) diff --git a/m4/doxygen.m4 b/m4/doxygen.m4 index d9a951c0..5c5a52a2 100644 --- a/m4/doxygen.m4 +++ b/m4/doxygen.m4 @@ -49,14 +49,14 @@ DX_ENV="" AC_DEFUN([DX_FEATURE_doc], ON) AC_DEFUN([DX_FEATURE_dot], ON) -AC_DEFUN([DX_FEATURE_man], OFF) -AC_DEFUN([DX_FEATURE_html], ON) +AC_DEFUN([DX_FEATURE_man], ON) +AC_DEFUN([DX_FEATURE_html], OFF) AC_DEFUN([DX_FEATURE_chm], OFF) AC_DEFUN([DX_FEATURE_chi], OFF) AC_DEFUN([DX_FEATURE_rtf], OFF) AC_DEFUN([DX_FEATURE_xml], OFF) -AC_DEFUN([DX_FEATURE_pdf], ON) -AC_DEFUN([DX_FEATURE_ps], ON) +AC_DEFUN([DX_FEATURE_pdf], OFF) +AC_DEFUN([DX_FEATURE_ps], OFF) ## --------------- ## ## Private macros. ## @@ -292,11 +292,11 @@ fi # Paper size for PS and/or PDF: AC_ARG_VAR(DOXYGEN_PAPER_SIZE, - [a4wide (default), a4, letter, legal or executive]) + [letter (default), a4wide, a4, letter, legal or executive]) case "$DOXYGEN_PAPER_SIZE" in #( "") - AC_SUBST(DOXYGEN_PAPER_SIZE, "") + AC_SUBST(DOXYGEN_PAPER_SIZE, "letter") ;; #( a4wide|a4|letter|legal|executive) DX_ENV_APPEND(PAPER_SIZE, $DOXYGEN_PAPER_SIZE)