Mirrors_UI_SDK/fltk
1
0
Fork 0
mirror of https://github.com/fltk/fltk.git synced 2026-06-01 23:06:54 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Documentation/PDF: always use the configured doxygen executable

Browse Source 
... to create the LaTeX header file used by doxygen.

This fix applies to both configure/make and CMake.

The existing version used `doxygen` which erroneously ran the doxygen
version from the current 'PATH' which might issue doxygen warnings and
potentially create a wrong LaTeX header file if the configured doxygen
program was not the one in the user's path.
This commit is contained in:
Albrecht Schlosser
2023-08-29 17:25:10 +02:00
parent ad5e49464b
commit be657471e7
3 changed files with 15 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
documentation/CMakeLists.txt
+1
View File
@@ -188,6 +188,7 @@ if (OPTION_BUILD_PDF_DOCUMENTATION)
add_custom_command ( add_custom_command (
OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/fltk.pdf OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/fltk.pdf
COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/make_header COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/make_header
${DOXYGEN_EXECUTABLE}
${CMAKE_CURRENT_BINARY_DIR}/fltk-title.tex ${CMAKE_CURRENT_BINARY_DIR}/fltk-title.tex
${CMAKE_CURRENT_BINARY_DIR}/fltk-book.tex ${CMAKE_CURRENT_BINARY_DIR}/fltk-book.tex
COMMAND ${DOXYGEN_EXECUTABLE} Doxybook COMMAND ${DOXYGEN_EXECUTABLE} Doxybook
documentation/Makefile
+1 -1
View File
@@ -196,7 +196,7 @@ src/fltk-title.tex: src/fltk-title.tex.in
src/fltk-book.tex.in: src/fltk-title.tex src/fltk-book.tex.in: src/fltk-title.tex
echo "Generating $@ ..." echo "Generating $@ ..."
./make_header $< $@ ./make_header $(DOXYDOC) $< $@
src/fltk-book.tex: src/fltk-book.tex.in src/fltk-book.tex: src/fltk-book.tex.in
echo "Generating $@ ..." echo "Generating $@ ..."
documentation/make_header
+13 -8
View File
@@ -8,12 +8,16 @@
# #
# Usage: # Usage:
# #
# $ sh make_header input-file output-file # $ sh make_header doxygen_path input-file output-file
# #
# where 'input-file' is the pure (LaTeX) title page (template) # where
# and 'output-file' is the generated (LaTeX) title page (template) # - 'doxygen_path' is the full path to the doxygen executable
# to be used by `make' or `cmake` to generate the final LaTeX page # or just 'doxygen'. If the full path is used an arbitrary
# header (combined doxygen template + FLTK title page). # doxygen executable and thus doxygen version can be used.
# - 'input-file' is the pure (LaTeX) title page (template)
# - 'output-file' is the generated (LaTeX) title page (template)
# that is used by `make' or `cmake` to generate the final LaTeX
# page header (combined doxygen template + FLTK title page).
# #
#======================================================================= #=======================================================================
# This script requires a posix shell and uses the following commands: # This script requires a posix shell and uses the following commands:
@@ -21,8 +25,9 @@
#======================================================================= #=======================================================================
# input and output file names # input and output file names
FLTK_HEAD="$1" DOXY_CMD="$1"
DOXY_HEAD="$2" FLTK_HEAD="$2"
DOXY_HEAD="$3"
# temp file # temp file
DOXY_TEMP="doxy-header.tex.$$" DOXY_TEMP="doxy-header.tex.$$"
@@ -43,7 +48,7 @@ fi
# with our PDF document title page (LaTeX code) and write the # with our PDF document title page (LaTeX code) and write the
# result to $DOXY_HEAD. # result to $DOXY_HEAD.
doxygen -w latex $DOXY_TEMP /dev/null /dev/null $DOXY_CMD -w latex $DOXY_TEMP /dev/null /dev/null
# combine three parts of these files to the output file # combine three parts of these files to the output file
# using '( ... ) > $DOXY_HEAD' to write (concatenate) # using '( ... ) > $DOXY_HEAD' to write (concatenate)