Skip to content

Commit ac0d022

Browse files
committed
Migrate
1 parent 9b8057f commit ac0d022

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

42 files changed

+309
-498
lines changed

.drone.yml

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
---
2+
kind: pipeline
3+
type: docker
4+
name: default
5+
6+
steps:
7+
- name: build
8+
image: abakus/statuttbuilder:latest
9+
commands:
10+
- ./generate.sh
11+
when:
12+
event:
13+
- pull_request
14+
15+
- name: push
16+
image: appleboy/drone-git-push
17+
settings:
18+
remote_name: origin
19+
branch: testdrone
20+
local_ref: testdrone
21+
force: false
22+
commit: true
23+
commit_message: "DroneCI new build"
24+
when:
25+
event:
26+
- pull_request

.gitignore

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,3 @@
1-
gh-pages/index.html
2-
gh-pages/fond/index.html
3-
gh-pages/_site
4-
logs/
5-
61
## Core latex/pdflatex auxiliary files:
72
*.aux
83
*.lof
@@ -15,7 +10,6 @@ logs/
1510
*.fot
1611
*.cb
1712
*.cb2
18-
*.pdf
1913

2014
## Intermediate documents:
2115
*.dvi
@@ -25,7 +19,6 @@ logs/
2519
*.ps
2620
report.pdf
2721
svg-inkscape/
28-
*.pdf
2922

3023
## Bibliography auxiliary files (bibtex/biblatex/biber):
3124
*.bbl
@@ -224,4 +217,6 @@ TSWLatexianTemp*
224217
# expex forward references with \gathertags
225218
*-tags.tex
226219

220+
.DS_Store
227221

222+
.now

.latexmkrc

Lines changed: 0 additions & 1 deletion
This file was deleted.

.travis.yml

Lines changed: 0 additions & 16 deletions
This file was deleted.

Dockerfile

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
FROM ubuntu:18.04
2+
3+
RUN apt-get update
4+
5+
RUN apt-get install -y --no-install-recommends \
6+
texlive \
7+
texlive-latex-base \
8+
texlive-font-utils \
9+
texlive-lang-european \
10+
pandoc \
11+
ghostscript
12+
13+
WORKDIR /statutter
14+
#
15+
#COPY ./generate.sh /
16+
#
17+
#CMD /generate.sh

Makefile

Lines changed: 0 additions & 39 deletions
This file was deleted.

README.md

Lines changed: 24 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -1,49 +1,30 @@
1-
# Abakus' statutter [![Build Status](https://travis-ci.org/abakus-ntnu/statutter.svg?branch=master)](https://travis-ci.org/abakus-ntnu/statutter)
2-
Her finner du LaTeX-kildekoden til statuttene til Abakus Linjeforening.
3-
Send gjerne endringsforslag via pull-requests, les mer om reglene for
4-
statuttendringer i [CONTRIBUTING.md](CONTRIBUTING.md).
5-
6-
## Bygging av PDF
7-
### Installering av pdfTeX
8-
pdfTeX kreves for å bygge statuttene. Det kan installeres på følgende måte:
9-
10-
macOS (krever [Homebrew](https://brew.sh/)):
11-
```bash
12-
brew cask install mactex
13-
```
1+
# Abakus' statutter
142

15-
Ubuntu:
16-
```bash
17-
sudo apt-get install texlive texlive-font-utils texlive-lang-european latexmk
18-
```
3+
Her finner du LaTeX-kildekoden til statuttene til Abakus Linjeforening. Send gjerne endringsforslag via pull-requests, les mer om reglene for statuttendringer i [CONTRIBUTING.md](CONTRIBUTING.md).
194

20-
### Kompilere PDF
21-
```bash
22-
make
23-
```
5+
## Organisering
246

25-
## Nettside
26-
### Publisering
27-
[GitHub Pages](https://pages.github.com/) brukes til å hoste
28-
[statutter.abakus.no](https://statutter.abakus.no). Opplastning av siste versjon
29-
skjer automatisk av [Travis](https://travis-ci.org/abakus-ntnu/statutter) når
30-
commits blir pushet til master.
31-
32-
### Lokal utvikling
33-
#### Avhengigheter
34-
macOS (krever [Homebrew](https://brew.sh/)):
35-
```bash
36-
brew install pandoc
37-
```
7+
`statutter` mappen inneholder kildekoden til statuttene.
388

39-
Ubuntu:
40-
```bash
41-
sudo apt-get install pandoc
42-
```
9+
`static` mappen inneholder filer som blir brukt under generering av nettsiden.
10+
11+
`public` mappen inneholder alt av output som docker containeren genererer. Denne mappen blir entrypoint for nettsiden, og det er disse html og css filene som brukere ser.
12+
13+
## Bygging av statutter
14+
15+
Alle statuttene bygges ved hjelp av et `docker` image som har all programvare som trengs, samt et generering script som bruker denne programvaren. Scriptet bygger både `pdf` og `html` versjon av statuttene.
16+
17+
### Kjør bilde ved hjelp av følgende kommando
18+
19+
Den mounter de tre volumene `statutter, static og public` som blir brukt av bildet når den bygger statutter.
20+
21+
I tillegg kan du sende inn `ASSEMBLY_DATE` som en variabel, og den genererte pdf filen som blir arkivert får dette navnet.
4322

44-
#### Bygging
45-
```bash
46-
make jekyll
47-
cd gh-pages
48-
bundle exec jekyll serve
23+
```sh
24+
$ docker run --rm \
25+
-v `pwd`/statutter:/statutter/ \
26+
-v `pwd`/static:/static/ \
27+
-v `pwd`/public:/public/ \
28+
-e ASSEMBLY_DATE=01.januar.1970 \
29+
abakus/statuttbuilder:latest
4930
```

abakus-statutter/innhold.tex

Lines changed: 0 additions & 8 deletions
This file was deleted.

generate.sh

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
TIMESTAMP=`eval date +%d.%B.%Y`
2+
3+
# Convert abakus LaTeX to html
4+
pandoc -f latex -o public/index.html \
5+
--include-in-header=static/head.html \
6+
--include-before-body=static/abakus.html \
7+
--include-after-body=static/end.html \
8+
statutter/abakus-statutter/innhold.tex
9+
10+
# Move other static files to the public folder
11+
cp static/main.css static/abakule.jpg public/
12+
13+
# Convert abakus LaTeX to PDF
14+
pdflatex -halt-on-error statutter/abakus-statutter.tex
15+
pdflatex -halt-on-error statutter/abakus-statutter.tex
16+
pdflatex -pdf -halt-on-error -output-dir="./public" statutter/abakus-statutter.tex
17+
18+
# Store a copy of the pdf in the archive
19+
mkdir -p public/archive/
20+
cp public/*.pdf public/archive/$TIMESTAMP.pdf
21+
22+
# Clean up the Statutter directory, as it used to genereate fles
23+
rm -f ./statutter/*.log \
24+
./statutter/*.aux \
25+
./statutter/*.out \
26+
./statutter/*.toc \
27+
./statutter/*.pdf # The result PDF is moved to /public by pdflatex
28+
29+
# Clean up the public directory, as it's used to genereate fles
30+
rm -f ./public/*.log \
31+
./public/*.aux \
32+
./public/*.out \
33+
./public/*.toc \

gh-pages/CNAME

Lines changed: 0 additions & 1 deletion
This file was deleted.

0 commit comments

Comments
 (0)