aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMelody Horn <melody@boringcactus.com>2020-10-28 17:32:49 -0600
committerMelody Horn <melody@boringcactus.com>2020-10-28 17:32:49 -0600
commit354f82ebc83f67e627ce5efdbf7172d210afa301 (patch)
tree693abbcbabf7b7249a70fc1c513135098e3659cc
parentedf87f09045e8f56576b37078b4a0d220d6ddf55 (diff)
downloadspec-354f82ebc83f67e627ce5efdbf7172d210afa301.tar.gz
spec-354f82ebc83f67e627ce5efdbf7172d210afa301.zip
ensure file names are consistent
-rw-r--r--.build.yml14
-rw-r--r--Makefile4
-rw-r--r--conf.py16
3 files changed, 22 insertions, 12 deletions
diff --git a/.build.yml b/.build.yml
index 24a8ba1..9847107 100644
--- a/.build.yml
+++ b/.build.yml
@@ -10,18 +10,16 @@ secrets:
- b5cb9b2b-1461-4486-95e1-886451674a89
tasks:
- prep: |
- sudo pip3 install recommonmark rinohtype
- - build: |
+ sudo pip3 install --progress-bar off recommonmark rinohtype
+ sudo pip3 install --progress-bar off --upgrade pygments
+ - build-and-test: |
cd crowbar-spec
- make
+ make all check
- compress: |
cd crowbar-spec/_build/html
tar czf ../crowbar-spec-html.tar.gz *
#cd ../gmi
#tar czf ../crowbar-spec-gmi.tar.gz *
- - test-page-count: |
- cd crowbar-spec
- make check
- upload: |
upload-to() {
dest=$1
@@ -37,7 +35,7 @@ tasks:
message="crowbar spec updated: $(git log -1 --no-decorate --oneline)"
echo "/NOTICE #crowbar-lang :$message" | ssh -o StrictHostKeyChecking=no services@boringcactus.com 'sh -c "cat > ~/irc/chat.freenode.net/#crowbar-lang/in"'
artifacts:
- - crowbar-spec/_build/rinoh/crowbarlanguage.pdf
- - crowbar-spec/_build/epub/Crowbarlanguage.epub
+ - crowbar-spec/_build/rinoh/crowbar-spec.pdf
+ - crowbar-spec/_build/epub/crowbar-spec.epub
- crowbar-spec/_build/crowbar-spec-html.tar.gz
#- crowbar-spec/_build/crowbar-spec-gmi.tar.gz
diff --git a/Makefile b/Makefile
index 432029b..ebe0ed5 100644
--- a/Makefile
+++ b/Makefile
@@ -5,7 +5,7 @@
GIT = git
SPHINXBUILD = sphinx-build
SPHINXOPTS =
-SPHINXDEFVER = -D version="$$($(GIT) describe --tags --exact-match 2>/dev/null || $(GIT) log -1 --no-decorate --oneline)"
+SPHINXDEFVER = -D release="$$($(GIT) describe --tags --exact-match 2>/dev/null || $(GIT) log -1 --no-decorate --oneline)"
SPHINXFULLOPTS = $(SPHINXDEFVER) $(SPHINXOPTS)
SOURCEDIR = .
BUILDDIR = _build
@@ -29,4 +29,4 @@ clean:
rm -rf _build/*
check: pdf
- test $$($(PDFINFO) _build/rinoh/crowbarlanguage.pdf | grep Pages | awk '{ print $$2 }') -le 200
+ test $$($(PDFINFO) _build/rinoh/crowbar-spec.pdf | grep Pages | awk '{ print $$2 }') -le 200
diff --git a/conf.py b/conf.py
index 01bec76..955ec83 100644
--- a/conf.py
+++ b/conf.py
@@ -39,8 +39,6 @@ templates_path = ['_templates']
# This pattern also affects html_static_path and html_extra_path.
exclude_patterns = ['_build', 'Thumbs.db', '.DS_Store']
-latex_engine = 'xelatex'
-
# -- Options for HTML output -------------------------------------------------
@@ -57,3 +55,17 @@ html_static_path = ['_static']
html_theme_options = {
"nosidebar": True,
}
+
+
+# PDF output
+
+rinoh_documents = [('index', # top-level file (index.rst)
+ 'crowbar-spec', # output (crowbar-spec.pdf)
+ 'Crowbar Specification', # document title
+ author)] # document author
+
+
+
+# epub output
+
+epub_basename = 'crowbar-spec'