merge from master

Author: rscohn2

.gitignore

@@ -2,6 +2,9 @@ doxygen
 build
 *~
 
+/docker/requirements.txt
+/docker/install.sh
+
 /spec-venv
 /repos/*
 /.vscode

README.rst

@@ -37,7 +37,7 @@ to do the same task manually.
 Setup
 -----
 
-Install python 3 and doxygen.  To install on **Ubuntu**::
+Install python 3 and doxygen (>= 1.8.17).  To install on **Ubuntu**::
 
    sudo scripts/install.sh
 

master.log

@@ -6,4 +6,5 @@ aws-shell # Only needed for deploying the site
 breathe
 gitpython
 sphinx
+sphinx-notfound-page
 sphinx-rtd-theme

requirements.txt

@@ -8,7 +8,7 @@
 import shutil
 import subprocess
 
-sphinx_opts    = ''
+sphinx_opts    = '-q'
 sphinx_build   = 'sphinx-build'
 source_dir     = 'source'
 build_dir      = 'build'
@@ -50,7 +50,7 @@ def shell(c):
     log(c)
     if dry_run:
         return
-    subprocess.check_output(c, shell=True)
+    subprocess.check_call(c, shell=True)
 
 def rm(dir):
     log('rm -rf', dir)

scripts/build-image.sh

@@ -1,12 +1,23 @@
 #! /bin/bash
+set -e
+set -x
+
 export DEBIAN_FRONTEND=noninteractive
 apt-get update
 apt-get install -y \
                     python3-pip \
-                    python3
+                    python3 \
+                    wget
 apt-get install -y  \
-                    doxygen \
 	            git
+wget http://doxygen.nl/files/doxygen-1.8.17.linux.bin.tar.gz
+tar zxf doxygen-1.8.17.linux.bin.tar.gz
+pushd doxygen-1.8.17
+./configure
+set +e
+make install
+set -e
+popd
 apt-get install -y \
                     latexmk \
                     texlive-latex-base \

scripts/deploy.sh

@@ -25,6 +25,33 @@
 args = None
 
 
+def get_env(var):
+    return os.environ[var] if var in os.environ else ''
+    
+@element.action
+def dockerbuild(target=None):
+    element.copy('requirements.txt', 'docker')
+    element.copy('scripts/install.sh', 'docker')
+    element.shell('docker build'
+                  ' --build-arg http_proxy=%s'
+                  ' --build-arg https_proxy=%s'
+                  ' --build-arg no_proxy=%s'
+                  ' --tag rscohn2/oneapi-spec docker'
+                  % (get_env('http_proxy'), get_env('https_proxy'), get_env('no_proxy')))
+
+@element.action
+def dockerpush(target=None):
+    element.shell('docker push rscohn2/oneapi-spec')
+
+@element.action
+def dockerrun(target=None):
+    element.shell('docker run --rm -it'
+                  ' --user %s:%s'
+                  ' --volume=%s:/build'
+                  ' --workdir=/build'
+                  ' rscohn2/oneapi-spec'
+                  % (os.getuid(), os.getgid(), os.getcwd()))
+
 @element.action
 def clean(target=None):
     apply_dirs('clean')
@@ -147,6 +174,9 @@ def ci(target=None):
             'ci-publish': ci_publish,
             'clean': clean,
             'clones': clones,
+            'dockerbuild': dockerbuild,
+            'dockerpush': dockerpush,
+            'dockerrun': dockerrun,
             'html': build,
             'latexpdf': build,
             'prep': prep,

scripts/element.py

@@ -42,6 +42,7 @@
 # extensions coming with Sphinx (named 'sphinx.ext.*') or your custom
 # ones.
 extensions = [
+    'notfound.extension',
     'sphinx.ext.autodoc',
     'sphinx.ext.doctest',
 #    'sphinx.ext.intersphinx',
@@ -220,6 +221,8 @@
 }
 breathe_default_project = 'oneAPI'
 
+notfound_default_language = 'versions'
+
 def setup(app):
     app.add_css_file('custom.css')