Skip to content

Commit

Permalink
docs: Update output for PDF
Browse files Browse the repository at this point in the history
Signed-off-by: Ben Collins <[email protected]>
  • Loading branch information
benmcollins committed Dec 23, 2024
1 parent 59531a0 commit 03637ca
Show file tree
Hide file tree
Showing 5 changed files with 16 additions and 23 deletions.
12 changes: 6 additions & 6 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
1 change: 1 addition & 0 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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}"
Expand Down
6 changes: 3 additions & 3 deletions Doxyfile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
8 changes: 0 additions & 8 deletions configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down
12 changes: 6 additions & 6 deletions m4/doxygen.m4
Original file line number Diff line number Diff line change
Expand Up @@ -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. ##
Expand Down Expand Up @@ -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)
Expand Down

0 comments on commit 03637ca

Please sign in to comment.