From c779be1205ce665d23cd6a5d20756cdf8c5e3f82 Mon Sep 17 00:00:00 2001
From: dgarcia360 <dgarcia360@outlook.com>
Date: Mon, 14 Sep 2020 19:10:09 +0200
Subject: [PATCH 1/2] Added pre-build commands

---
 docs/configuration.rst      | 22 ++++++++++++++++++++++
 sphinx_multiversion/main.py | 16 ++++++++++++++++
 2 files changed, 38 insertions(+)

diff --git a/docs/configuration.rst b/docs/configuration.rst
index 6b7d6aa2..9827e563 100644
--- a/docs/configuration.rst
+++ b/docs/configuration.rst
@@ -130,6 +130,28 @@ Here's an example for the `exhale extension <exhale_>`_:
 
     To see a list of available placeholder names and their values for each version you can use the ``--dump-metadata`` flag.
 
+Running Commands Before Building
+================================
+
+You can run commands before each version of the documentation is build with the option ``--pre-build``.
+
+This could be useful to prepare the docs repository before running ``sphinx-build``, debug the execution, or even generate versioned documentation using other builders.
+
+For example, imagine that you want to build versioned docs written in Sphinx, but the API reference is generated with JavaDoc. This option enables the generation of both versioned docs to host them under the same folder using GitHub Pages.
+
+Here's an example showing the directory where the build command is running:
+
+.. code-block:: python
+
+    sphinx-multiversion docs build/html --pre-build pwd
+
+
+You can pass multiple commands adding extra ``--pre-build`` tags. The commands run in order, from left to right:
+
+.. code-block:: python
+
+    sphinx-multiversion docs build/html --pre-build pwd --pre-build ls
+
 .. _python_regex: https://docs.python.org/3/howto/regex.html
 .. _python_format: https://pyformat.info/
 .. _exhale: https://exhale.readthedocs.io/en/latest/
diff --git a/sphinx_multiversion/main.py b/sphinx_multiversion/main.py
index 86766e2d..da41d381 100644
--- a/sphinx_multiversion/main.py
+++ b/sphinx_multiversion/main.py
@@ -12,6 +12,7 @@
 import subprocess
 import sys
 import tempfile
+import shlex
 
 from sphinx import config as sphinx_config
 from sphinx import project as sphinx_project
@@ -159,6 +160,12 @@ def main(argv=None):
         action="store_true",
         help="dump generated metadata and exit",
     )
+    parser.add_argument(
+        "--pre-build",
+        action="append",
+        default=[],
+        help="a list of commands to run before running sphinx-build",
+    )
     args, argv = parser.parse_known_args(argv)
     if args.noconfig:
         return 1
@@ -183,6 +190,9 @@ def main(argv=None):
         confdir_absolute, confoverrides, add_defaults=True
     )
 
+    # Parse pre build commands
+    pre_build_commands = [shlex.split(command) for command in args.pre_build]
+    
     # Get relative paths to root of git repository
     gitroot = pathlib.Path(
         git.get_toplevel_path(cwd=sourcedir_absolute)
@@ -346,6 +356,12 @@ def main(argv=None):
                     "SPHINX_MULTIVERSION_CONFDIR": data["confdir"],
                 }
             )
+            
+            if pre_build_commands:
+                logger.debug("Running pre build commands:")
+                for command in pre_build_commands:
+                    subprocess.check_call(command, cwd=current_cwd, env=env)
+            
             subprocess.check_call(cmd, cwd=current_cwd, env=env)
 
     return 0

From 26af080b67786290885a535eb640db8aef861ffc Mon Sep 17 00:00:00 2001
From: David Garcia <dgarcia360@outlook.com>
Date: Mon, 14 Sep 2020 23:07:51 +0100
Subject: [PATCH 2/2] Update configuration.rst

---
 docs/configuration.rst | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/configuration.rst b/docs/configuration.rst
index 9827e563..c865d55f 100644
--- a/docs/configuration.rst
+++ b/docs/configuration.rst
@@ -133,7 +133,7 @@ Here's an example for the `exhale extension <exhale_>`_:
 Running Commands Before Building
 ================================
 
-You can run commands before each version of the documentation is build with the option ``--pre-build``.
+You can run commands before each version of the documentation is built with the option ``--pre-build``.
 
 This could be useful to prepare the docs repository before running ``sphinx-build``, debug the execution, or even generate versioned documentation using other builders.
 
@@ -146,7 +146,7 @@ Here's an example showing the directory where the build command is running:
     sphinx-multiversion docs build/html --pre-build pwd
 
 
-You can pass multiple commands adding extra ``--pre-build`` tags. The commands run in order, from left to right:
+You can pass multiple commands by adding extra ``--pre-build`` tags. The commands run in order, from left to right:
 
 .. code-block:: python