[Cmake-commits] CMake branch, next, updated. v2.8.9-390-g7ea2862

[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  7ea28629f7c9bf5ff656f44a4c0b2f84e69b1372 (commit)
       via  2ee281c8f687f08c381fe93f1355c7b7bc1afdb6 (commit)
      from  9ec51496f5127dedb5f73d32e9b6370eb221f9d4 (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=7ea28629f7c9bf5ff656f44a4c0b2f84e69b1372
commit 7ea28629f7c9bf5ff656f44a4c0b2f84e69b1372
Merge: 9ec5149 2ee281c
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Sep 7 08:32:49 2012 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Sep 7 08:32:49 2012 -0400

    Merge topic 'simplify-CMake.HTML-test' into next
    
    2ee281c Fix CMake.HTML encoding for xmllint --path option


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=2ee281c8f687f08c381fe93f1355c7b7bc1afdb6
commit 2ee281c8f687f08c381fe93f1355c7b7bc1afdb6
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Sep 7 08:20:23 2012 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Fri Sep 7 08:24:29 2012 -0400

    Fix CMake.HTML encoding for xmllint --path option
    
    The ":" character in Windows full paths with drive letters must also be
    url-encoded.

diff --git a/Utilities/CMakeLists.txt b/Utilities/CMakeLists.txt
index 975a00a..cb50eca 100644
--- a/Utilities/CMakeLists.txt
+++ b/Utilities/CMakeLists.txt
@@ -143,9 +143,10 @@ if(BUILD_TESTING)
     if("${_help}" MATCHES "--path" AND "${_help}" MATCHES "--nonet")
       # 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")
+      # 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
         ${LIBXML2_XMLLINT_EXECUTABLE} --valid --noout --nonet
         --path ${_dtd_dir}/xhtml1

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

Summary of changes:
 Utilities/CMakeLists.txt |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
CMake