瀏覽代碼

Merge topic 'doc-cmake.org-tutorial-archive' into release-4.2

5473a45fd8 Tutorial: Restore source archive when published on cmake.org

Acked-by: Kitware Robot <[email protected]>
Merge-request: !11370
Brad King 5 月之前
父節點
當前提交
b22a77e337
共有 3 個文件被更改,包括 10 次插入6 次删除
  1. 3 0
      Help/guide/tutorial/include/source.rst
  2. 3 2
      Help/guide/tutorial/index.rst
  3. 4 4
      Utilities/Sphinx/tutorial_archive.cmake

+ 3 - 0
Help/guide/tutorial/include/source.rst

@@ -0,0 +1,3 @@
+.. |tutorial_source| replace::
+  The tutorial documentation and source code examples can be found in
+  the ``Help/guide/tutorial`` directory of the CMake source code tree.

+ 3 - 2
Help/guide/tutorial/index.rst

@@ -11,8 +11,9 @@ work together in an example project can be very helpful.
 Steps
 Steps
 =====
 =====
 
 
-The tutorial documentation and source code examples can be found in
-the ``Help/guide/tutorial`` directory of the CMake source code tree.
+.. include:: include/source.rst
+
+|tutorial_source|
 Each step has its own subdirectory containing code that may be used as a
 Each step has its own subdirectory containing code that may be used as a
 starting point. The tutorial examples are progressive so that each step
 starting point. The tutorial examples are progressive so that each step
 provides the complete solution for the previous step.
 provides the complete solution for the previous step.

+ 4 - 4
Utilities/Sphinx/tutorial_archive.cmake

@@ -14,7 +14,7 @@ file(COPY "${help_dir}/guide/tutorial/"
   DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/${archive_name}"
   DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/${archive_name}"
   NO_SOURCE_PERMISSIONS
   NO_SOURCE_PERMISSIONS
   PATTERN *.rst EXCLUDE
   PATTERN *.rst EXCLUDE
-  PATTERN source.txt EXCLUDE
+  REGEX "/guide/tutorial/include$" EXCLUDE
   )
   )
 file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/${archive_name}/README.txt" [[
 file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/${archive_name}/README.txt" [[
 This directory contains source code examples for the CMake Tutorial.
 This directory contains source code examples for the CMake Tutorial.
@@ -32,11 +32,11 @@ file(ARCHIVE_CREATE
   )
   )
 
 
 # Write a reStructuredText snippet included from the tutorial index.
 # Write a reStructuredText snippet included from the tutorial index.
-file(WRITE "${help_dir}/guide/tutorial/source.txt" "
+file(WRITE "${help_dir}/guide/tutorial/include/source.rst" [[
 .. |tutorial_source| replace::
 .. |tutorial_source| replace::
   The tutorial source code examples are available in
   The tutorial source code examples are available in
-  :download:`this archive </_generated/${archive_name}.zip>`.
-")
+  :download:`this archive </_generated/]] "${archive_name}" [[.zip>`.
+]])
 
 
 # Remove temporary directory.
 # Remove temporary directory.
 file(REMOVE_RECURSE "${CMAKE_CURRENT_BINARY_DIR}/${archive_name}")
 file(REMOVE_RECURSE "${CMAKE_CURRENT_BINARY_DIR}/${archive_name}")