From 6984088ea6e67e848803c947cf83ffaaa4f8e6c1 Mon Sep 17 00:00:00 2001 From: Josh Morman <jmorman@perspectalabs.com> Date: Thu, 18 Jul 2019 09:17:38 -0400 Subject: modtool: put proper quotes when unescaped shell paths Adds quotes to paths to prevent issues when the user has a space in their OOT shell paths Slight change to #2560 which should prevent CI from broadly failing Fixes #2443 --- .../python/modtool/templates/gr-newmod/docs/doxygen/Doxyfile.in | 6 +++--- .../modtool/templates/gr-newmod/docs/doxygen/Doxyfile.swig_doc.in | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'gr-utils/python') diff --git a/gr-utils/python/modtool/templates/gr-newmod/docs/doxygen/Doxyfile.in b/gr-utils/python/modtool/templates/gr-newmod/docs/doxygen/Doxyfile.in index cabbb34167..fb03bd7e13 100644 --- a/gr-utils/python/modtool/templates/gr-newmod/docs/doxygen/Doxyfile.in +++ b/gr-utils/python/modtool/templates/gr-newmod/docs/doxygen/Doxyfile.in @@ -654,8 +654,8 @@ WARN_LOGFILE = # directories like "/usr/src/myproject". Separate the files or directories # with spaces. -INPUT = @top_srcdir@ \ - @top_builddir@ +INPUT = "@top_srcdir@" \ + "@top_builddir@" # This tag can be used to specify the character encoding of the source files # that doxygen parses. Internally doxygen uses the UTF-8 encoding, which is @@ -790,7 +790,7 @@ INPUT_FILTER = # info on how filters are used. If FILTER_PATTERNS is empty or if # non of the patterns match the file name, INPUT_FILTER is applied. -FILTER_PATTERNS = *.py=@top_srcdir@/doc/doxygen/other/doxypy.py +FILTER_PATTERNS = *.py="@top_srcdir@"/doc/doxygen/other/doxypy.py # If the FILTER_SOURCE_FILES tag is set to YES, the input filter (if set using # INPUT_FILTER) will be used to filter the input files when producing source diff --git a/gr-utils/python/modtool/templates/gr-newmod/docs/doxygen/Doxyfile.swig_doc.in b/gr-utils/python/modtool/templates/gr-newmod/docs/doxygen/Doxyfile.swig_doc.in index 33bc2afd07..cbe06d67ae 100644 --- a/gr-utils/python/modtool/templates/gr-newmod/docs/doxygen/Doxyfile.swig_doc.in +++ b/gr-utils/python/modtool/templates/gr-newmod/docs/doxygen/Doxyfile.swig_doc.in @@ -54,7 +54,7 @@ PROJECT_LOGO = # If a relative path is entered, it will be relative to the location # where doxygen was started. If left blank the current directory will be used. -OUTPUT_DIRECTORY = @OUTPUT_DIRECTORY@ +OUTPUT_DIRECTORY = "@OUTPUT_DIRECTORY@" # If the CREATE_SUBDIRS tag is set to YES, then doxygen will create # 4096 sub-directories (in 2 levels) under the output directory of each output -- cgit v1.2.3