diff options
| author | Daniel Pfeifer <daniel@pfeifer-mail.de> | 2012-09-06 10:31:47 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2012-09-07 14:05:50 (GMT) |
| commit | 2f520d304a5cf874b22d978e9402e6d9316eb42e (patch) | |
| tree | 172120cbf1a6ad3ccacda7e9ecfc500e3cf29df1 /Utilities | |
| parent | 2da17ef7975b521abe2be4736569d19ef79dc3be (diff) | |
| download | CMake-2f520d304a5cf874b22d978e9402e6d9316eb42e.zip CMake-2f520d304a5cf874b22d978e9402e6d9316eb42e.tar.gz CMake-2f520d304a5cf874b22d978e9402e6d9316eb42e.tar.bz2 | |
Simplify CMake.HTML documentation test command line
Drop the "cmake -E chdir" wrapper and instead pass the DTD directory to
xmllint's --path option using url encoding. While at it, move the
XHTML1 DTD to "Utilities/xml/xhtml1" to make room for additional DTDs.
Diffstat (limited to 'Utilities')
| -rw-r--r-- | Utilities/CMakeLists.txt | 16 | ||||
| -rw-r--r-- | Utilities/xml/xhtml1/xhtml-lat1.ent (renamed from Utilities/xml/xhtml-lat1.ent) | 0 | ||||
| -rw-r--r-- | Utilities/xml/xhtml1/xhtml-special.ent (renamed from Utilities/xml/xhtml-special.ent) | 0 | ||||
| -rw-r--r-- | Utilities/xml/xhtml1/xhtml-symbol.ent (renamed from Utilities/xml/xhtml-symbol.ent) | 0 | ||||
| -rw-r--r-- | Utilities/xml/xhtml1/xhtml1-strict.dtd (renamed from Utilities/xml/xhtml1-strict.dtd) | 0 |
5 files changed, 8 insertions, 8 deletions
diff --git a/Utilities/CMakeLists.txt b/Utilities/CMakeLists.txt index 233d5e2..cb50eca 100644 --- a/Utilities/CMakeLists.txt +++ b/Utilities/CMakeLists.txt @@ -141,15 +141,15 @@ if(BUILD_TESTING) execute_process(COMMAND ${LIBXML2_XMLLINT_EXECUTABLE} --help OUTPUT_VARIABLE _help ERROR_VARIABLE _err) if("${_help}" MATCHES "--path" AND "${_help}" MATCHES "--nonet") - # We provide the XHTML DTD and its dependencies in the 'xml' - # directory so that xmllint can run without network access. - # However, it's --path option accepts a space-separated list of - # paths so it cannot handle spaces in the path to the source tree. - # Therefore we run the tool with the current work directory set to - # the 'xml' directory and use '.' as the path. + # We provide DTDs in the 'xml' directory so that xmllint can run without + # network access. Note that xmllints's --path option accepts a + # space-separated list of url-encoded paths. + set(_dtd_dir "${CMAKE_CURRENT_SOURCE_DIR}/xml") + string(REPLACE " " "%20" _dtd_dir "${_dtd_dir}") + string(REPLACE ":" "%3A" _dtd_dir "${_dtd_dir}") add_test(CMake.HTML - ${CMAKE_CMAKE_COMMAND} -E chdir ${CMAKE_CURRENT_SOURCE_DIR}/xml - ${LIBXML2_XMLLINT_EXECUTABLE} --valid --noout --nonet --path . + ${LIBXML2_XMLLINT_EXECUTABLE} --valid --noout --nonet + --path ${_dtd_dir}/xhtml1 ${HTML_FILES} ) endif() diff --git a/Utilities/xml/xhtml-lat1.ent b/Utilities/xml/xhtml1/xhtml-lat1.ent index ffee223..ffee223 100644 --- a/Utilities/xml/xhtml-lat1.ent +++ b/Utilities/xml/xhtml1/xhtml-lat1.ent diff --git a/Utilities/xml/xhtml-special.ent b/Utilities/xml/xhtml1/xhtml-special.ent index 3a83fb6..3a83fb6 100644 --- a/Utilities/xml/xhtml-special.ent +++ b/Utilities/xml/xhtml1/xhtml-special.ent diff --git a/Utilities/xml/xhtml-symbol.ent b/Utilities/xml/xhtml1/xhtml-symbol.ent index d0c77ee..d0c77ee 100644 --- a/Utilities/xml/xhtml-symbol.ent +++ b/Utilities/xml/xhtml1/xhtml-symbol.ent diff --git a/Utilities/xml/xhtml1-strict.dtd b/Utilities/xml/xhtml1/xhtml1-strict.dtd index e48fbea..e48fbea 100644 --- a/Utilities/xml/xhtml1-strict.dtd +++ b/Utilities/xml/xhtml1/xhtml1-strict.dtd |