Mike Gerwitz

Activist for User Freedom

aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMike Gerwitz <mike.gerwitz@rtspecialty.com>2018-09-12 12:09:04 -0400
committerMike Gerwitz <mike.gerwitz@rtspecialty.com>2018-09-12 12:09:04 -0400
commitf3106036468d97a64a8f84e0c5bd154de509cc6b (patch)
treee03122f12b9f9cf48e519a1d6395dc4af190fcfb
parent44d3f76c0b99be0812b4ec028a95ddae15cc0c2e (diff)
parente18d5bb4b578da383a8e87648fe7fd85e44316f7 (diff)
downloadtame-f3106036468d97a64a8f84e0c5bd154de509cc6b.tar.gz
tame-f3106036468d97a64a8f84e0c5bd154de509cc6b.tar.bz2
tame-f3106036468d97a64a8f84e0c5bd154de509cc6b.zip
Add GitLab pipeline configurationv2.18.1
-rw-r--r--.gitlab-ci.yml37
-rw-r--r--README.md18
l---------doc/src1
-rw-r--r--doc/tame.texi6
-rw-r--r--src/symtable.xsl2
-rw-r--r--src/symtable/symbols.xsl3
-rw-r--r--test/graph-test.xsl2
-rw-r--r--test/symtable/symbols.xspec24
8 files changed, 69 insertions, 24 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
new file mode 100644
index 0000000..a949957
--- /dev/null
+++ b/.gitlab-ci.yml
@@ -0,0 +1,37 @@
+image: lovullo/rater-ci
+
+stages:
+ - build
+ - deploy
+
+before_script:
+ - apt-get update
+ - apt-get -y install --no-install-recommends texinfo texlive-latex-base
+ - apt-get -y install nodejs
+ - git submodule update --init --recursive
+ - git clone https://gitlab.com/mikegerwitz/hoxsl
+
+build:
+ stage: build
+ script:
+ - export SAXON_CP=/usr/share/ant/lib/saxon9/saxon9he.jar
+ - autoreconf -fvi
+ - ./configure
+ - ( cd progtest && npm install && ./autogen.sh && ./configure )
+ - make all check info pdf html
+ artifacts:
+ paths:
+ - doc/
+ expire_in: 30 min
+
+pages:
+ stage: deploy
+ script:
+ - mkdir -p public/doc
+ - mv doc/tame.html/* doc/tame.pdf doc/tame.info public/
+ artifacts:
+ paths:
+ - public/
+ expire_in: 30 min
+ only:
+ - tags
diff --git a/README.md b/README.md
index d111cc1..fa67fe3 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,5 @@
<!---
- Copyright (C) 2015, 2016 R-T Specialty, LLC.
+ Copyright (C) 2015, 2016, 2017 LoVullo Associates, Inc.
Permission is granted to copy, distribute and/or modify this
document under the terms of the GNU Free Documentation License,
@@ -45,10 +45,13 @@ project resulted in a bit of a mess, which is being refactored into
## Documentation
-Compiled documentation is available [via our GitLab
-mirror](https://lovullo.gitlab.io/tame/), which uses the same build
-pipeline as we do on our internal GitLab instance. It contains the current
-state of master (with some delay), not just the most recent tag.
+Compiled documentation for the latest release is available via our GitLab
+mirror, which uses the same build pipeline as we do on our internal GitLab
+instance. Available formats are:
+
+- [Multi-page HTML][doc-html]
+- [PDF][doc-pdf]
+- [Info][doc-info]
## Hacking
@@ -64,3 +67,8 @@ any later version.
This program is distributed in the hope that it will be useful, but WITHOUT ANY
WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
PARTICULAR PURPOSE. See the GNU General Public License for more details.
+
+[doc-html]: https://lovullo.gitlab.io/tame/
+[doc-pdf]: https://lovullo.gitlab.io/tame/tame.pdf
+[doc-info]: https://lovullo.gitlab.io/tame/tame.info
+
diff --git a/doc/src b/doc/src
new file mode 120000
index 0000000..5cd551c
--- /dev/null
+++ b/doc/src
@@ -0,0 +1 @@
+../src \ No newline at end of file
diff --git a/doc/tame.texi b/doc/tame.texi
index 32e38b6..929bac8 100644
--- a/doc/tame.texi
+++ b/doc/tame.texi
@@ -113,13 +113,13 @@ TAME
@end menu
@lowersections
-@include ../src/preproc/expand/expand-sequence.texi
+@include src/preproc/expand/expand-sequence.texi
@raisesections
@c chapter
@raisesections
-@include ../src/graph.texi
-@include ../src/symtable.texi
+@include src/graph.texi
+@include src/symtable.texi
@lowersections
@include todo.texi
diff --git a/src/symtable.xsl b/src/symtable.xsl
index 228efad..6e31be7 100644
--- a/src/symtable.xsl
+++ b/src/symtable.xsl
@@ -112,7 +112,7 @@
@end menu
@lowersections
- @include ../src/symtable/symbols.texi
+ @include src/symtable/symbols.texi
@raisesections
-->
diff --git a/src/symtable/symbols.xsl b/src/symtable/symbols.xsl
index cdf0a6e..a3daf26 100644
--- a/src/symtable/symbols.xsl
+++ b/src/symtable/symbols.xsl
@@ -344,8 +344,7 @@
desc="{@desc}"
dtype="{@type}"
default="{@default}"
- tex="{@sym}"
- keep="true" />
+ tex="{@sym}" />
</template>
diff --git a/test/graph-test.xsl b/test/graph-test.xsl
index f5ff01b..b1f331e 100644
--- a/test/graph-test.xsl
+++ b/test/graph-test.xsl
@@ -152,9 +152,9 @@
<variable name="foo:graph-vtwo-vthree" as="element( preproc:sym-deps )">
<preproc:sym-deps>
<preproc:sym-dep name="a">
+ <preproc:sym-ref name="a" attr1="foo" />
<preproc:sym-ref name="b" attr1="foo" attr2="bar" />
<preproc:sym-ref name="c" />
- <preproc:sym-ref name="a" attr1="foo" />
</preproc:sym-dep>
<preproc:sym-dep name="b">
diff --git a/test/symtable/symbols.xspec b/test/symtable/symbols.xspec
index 18d9c2c..ecfbf50 100644
--- a/test/symtable/symbols.xspec
+++ b/test/symtable/symbols.xspec
@@ -63,40 +63,40 @@
dim="1"
desc="Vector param"
dtype="footype"
- tex=""
- keep="true" />
+ default=""
+ tex="" />
<preproc:sym type="param"
name="tex_param"
dim="2"
desc="Matrix param with TeX"
dtype="tex"
- tex="\tex"
- keep="true" />
+ default=""
+ tex="\tex" />
<preproc:sym type="param"
name="scalar_param"
dim="0"
desc="Scalar param (implicit)"
dtype="bar"
- tex=""
- keep="true" />
+ default=""
+ tex="" />
<preproc:sym type="param"
name="scalar_param_explicit"
dim="0"
desc="Scalar param (explicit)"
dtype="bar"
- tex=""
- keep="true" />
+ default=""
+ tex="" />
<preproc:sym type="param"
name="unknown_dim"
dim="-1"
desc="Unknown dimension"
dtype="wtf"
- tex=""
- keep="true" />
+ default=""
+ tex="" />
</expect>
</scenario>
@@ -134,11 +134,11 @@
<preproc:sym type="meta"
name=":meta:prop1"
desc="Metavalue prop1"
- keep="true" />
+ pollute="true" />
<preproc:sym type="meta"
name=":meta:prop2"
desc="Metavalue prop2"
- keep="true" />
+ pollute="true" />
</expect>
</scenario>
</description>