Merge pull request #10 from LLNL/feature/capps2/single-doxygen

Unified Sphinx into one.
LLNL · Apr 30, 2019 · 5808439 · 5808439
2 parents 13c5898 + 37586dc
commit 5808439
Show file tree

Hide file tree

Showing 62 changed files with 80 additions and 2,735 deletions.
diff --git a/.readthedocs.yml b/.readthedocs.yml
@@ -7,7 +7,7 @@ version: 2
 
 # Build documentation in the docs/ directory with Sphinx
 sphinx:
-  configuration: src/docs/sphinx/web_main/conf.py
+  configuration: src/conf.py
 
 # Optionally build your docs in additional formats such as PDF and ePub
 formats: all

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -84,6 +84,9 @@ add_subdirectory(tools)
 add_subdirectory(examples)
 
 if (AXOM_ENABLE_DOCS)
+  if (SPHINX_FOUND)
+    blt_add_sphinx_target( axom_docs )
+  endif()
   add_subdirectory(docs)
 endif()
 

diff --git a/src/axom/core/CMakeLists.txt b/src/axom/core/CMakeLists.txt
@@ -78,13 +78,6 @@ if (AXOM_ENABLE_TESTS)
   add_subdirectory(tests)
 endif()
 
-################################
-# Add docs
-################################
-if (AXOM_ENABLE_DOCS)
-  add_subdirectory(docs)
-endif()
-
 ################################
 # Add code checks
 ################################

diff --git a/src/axom/core/docs/CMakeLists.txt b/src/axom/core/docs/CMakeLists.txt
diff --git a/src/axom/lumberjack/CMakeLists.txt b/src/axom/lumberjack/CMakeLists.txt
@@ -59,13 +59,6 @@ if (AXOM_ENABLE_TESTS)
   add_subdirectory(tests)
 endif()
 
-################################
-# Add docs
-################################
-if (AXOM_ENABLE_DOCS)
-  add_subdirectory(docs)
-endif()
-
 ################################
 # Add code checks
 ################################

diff --git a/src/axom/lumberjack/README.md b/src/axom/lumberjack/README.md
@@ -3,5 +3,5 @@ Lumberjack: Log filtering and aggregation {#lumberjacktop}
 
 [Lumberjack](@ref axom::lumberjack) provides functionality to filter log events based on priority, rate, and volume.  It coordinates with but does not require the [SLIC](@ref slictop) component.
 
-The [introduction to Lumberjack](../../../sphinx/lumberjack_docs/html/index.html)
+The [introduction to Lumberjack](../../../sphinx/axom_docs/html/axom/lumberjack/docs/sphinx/index.html)
 covers these concepts in more detail.
diff --git a/src/axom/lumberjack/docs/CMakeLists.txt b/src/axom/lumberjack/docs/CMakeLists.txt
diff --git a/src/axom/lumberjack/docs/sphinx/CMakeLists.txt b/src/axom/lumberjack/docs/sphinx/CMakeLists.txt
diff --git a/src/axom/lumberjack/docs/sphinx/conf.py b/src/axom/lumberjack/docs/sphinx/conf.py
diff --git a/src/axom/mainpage.md b/src/axom/mainpage.md
@@ -29,10 +29,10 @@ indicate hard dependencies; dashed links indicate optional dependencies.
 
 # Further documentation
 
-- [User manual](../../../sphinx/web_main_docs/html/index.html)
-- [Quick start guide](../../../sphinx/quickstart_guide_docs/html/index.html)
-- [Development guide](../../../sphinx/dev_guide_docs/html/index.html) (intended for Axom contributors)
-- Coding [style guide](../../../sphinx/coding_guide_docs/html/index.html) (intended for Axom contributors)
-- Please see our [license](../../../LICENSE) and accompanying [notice](../../../NOTICE).
+- [User manual](../../../sphinx/axom_docs/html/docs/index.html)
+- [Quick start guide](../../../sphinx/axom_docs/html/docs/sphinx/quickstart_guide/index.html)
+- [Development guide](../../../sphinx/axom_docs/html/docs/sphinx/dev_guide/index.html) (intended for Axom contributors)
+- Coding [style guide](../../../sphinx/axom_docs/html/docs/sphinx/coding_guide/index.html) (intended for Axom contributors)
+- Please see our [license](../../../sphinx/axom_docs/html/docs/licenses.html).
 
 Each component contains a `test` subdirectory containing numerous code unit tests and an `example` subdirectory with more extensive demonstrations of the Axom library.  The Sidre, Mint, and Slam examples include several versions of the `lulesh` mini-app,  an implementation of the heat equation and a 1-D shock tube simulation.