[Cmake-commits] CMake branch, next, updated. v2.8.9-386-g96a741f

[Brad King]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  96a741f990bac5212041d2312bce82207be5ae0d (commit)
       via  80e0fc2294d4eebe7dd25b4a23cf8cd643a7999f (commit)
      from  e301b6b906522f20ad317f10b4935ce4653103b0 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=96a741f990bac5212041d2312bce82207be5ae0d
commit 96a741f990bac5212041d2312bce82207be5ae0d
Merge: e301b6b 80e0fc2
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Sep 6 09:21:36 2012 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Sep 6 09:21:36 2012 -0400

    Merge topic 'simplify-CMake.HTML-test' into next
    
    80e0fc2 Simplify CMake.HTML documentation test command line


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=80e0fc2294d4eebe7dd25b4a23cf8cd643a7999f
commit 80e0fc2294d4eebe7dd25b4a23cf8cd643a7999f
Author:     Daniel Pfeifer <daniel at pfeifer-mail.de>
AuthorDate: Thu Sep 6 12:31:47 2012 +0200
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu Sep 6 08:48:48 2012 -0400

    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 %-encoded spaces.  While at it, move the
    XHTML1 DTD to "Utilities/xml/xhtml1" to make room for additional DTDs.

diff --git a/Utilities/CMakeLists.txt b/Utilities/CMakeLists.txt
index 233d5e2..975a00a 100644
--- a/Utilities/CMakeLists.txt
+++ b/Utilities/CMakeLists.txt
@@ -141,15 +141,14 @@ 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 %-encoded paths, so the spaces in the path
+      # need to be encoded.
+      string(REPLACE " " "%20" _dtd_dir "${CMAKE_CURRENT_SOURCE_DIR}/xml")
       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
similarity index 100%
rename from Utilities/xml/xhtml-lat1.ent
rename to Utilities/xml/xhtml1/xhtml-lat1.ent
diff --git a/Utilities/xml/xhtml-special.ent b/Utilities/xml/xhtml1/xhtml-special.ent
similarity index 100%
rename from Utilities/xml/xhtml-special.ent
rename to Utilities/xml/xhtml1/xhtml-special.ent
diff --git a/Utilities/xml/xhtml-symbol.ent b/Utilities/xml/xhtml1/xhtml-symbol.ent
similarity index 100%
rename from Utilities/xml/xhtml-symbol.ent
rename to Utilities/xml/xhtml1/xhtml-symbol.ent
diff --git a/Utilities/xml/xhtml1-strict.dtd b/Utilities/xml/xhtml1/xhtml1-strict.dtd
similarity index 100%
rename from Utilities/xml/xhtml1-strict.dtd
rename to Utilities/xml/xhtml1/xhtml1-strict.dtd

-----------------------------------------------------------------------

Summary of changes:
 Utilities/CMakeLists.txt                     |   15 +++++++--------
 Utilities/xml/{ => xhtml1}/xhtml-lat1.ent    |    0
 Utilities/xml/{ => xhtml1}/xhtml-special.ent |    0
 Utilities/xml/{ => xhtml1}/xhtml-symbol.ent  |    0
 Utilities/xml/{ => xhtml1}/xhtml1-strict.dtd |    0
 5 files changed, 7 insertions(+), 8 deletions(-)
 rename Utilities/xml/{ => xhtml1}/xhtml-lat1.ent (100%)
 rename Utilities/xml/{ => xhtml1}/xhtml-special.ent (100%)
 rename Utilities/xml/{ => xhtml1}/xhtml-symbol.ent (100%)
 rename Utilities/xml/{ => xhtml1}/xhtml1-strict.dtd (100%)


hooks/post-receive
-- 
CMake