[Cmake-commits] CMake branch, next, updated. v2.8.9-400-gad62113

[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  ad6211368707d24350bbdfd057c3024ab52093f5 (commit)
       via  2f520d304a5cf874b22d978e9402e6d9316eb42e (commit)
      from  6e88a1c9130533f681764336c7219e094f66db25 (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=ad6211368707d24350bbdfd057c3024ab52093f5
commit ad6211368707d24350bbdfd057c3024ab52093f5
Merge: 6e88a1c 2f520d3
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Sat Sep 8 07:40:03 2012 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Sat Sep 8 07:40:03 2012 -0400

    Merge topic 'simplify-CMake.HTML-test' into next
    
    2f520d3 Simplify CMake.HTML documentation test command line


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=2f520d304a5cf874b22d978e9402e6d9316eb42e
commit 2f520d304a5cf874b22d978e9402e6d9316eb42e
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: Fri Sep 7 10:05:50 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 url encoding.  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..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
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:


hooks/post-receive
-- 
CMake