From 3323b6aecc6ec9b75d8529916becbdf3e7550d38 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Hugo=20H=C3=B6rnquist?= <hugo@lysator.liu.se>
Date: Tue, 1 Sep 2020 01:04:19 +0200
Subject: [PATCH] Make revamp.
---
.gitlab-ci.yml | 3 +-
Makefile | 5 ++++
administrativt/Makefile | 4 +++
administrativt/kortlapp/Makefile | 3 ++
administrativt/medlemslapp/Makefile | 20 ++-----------
.../{conditions.latex => conditions.tex} | 20 ++++++-------
.../{villkor.latex => villkor.tex} | 0
build.sh | 29 -------------------
"infom\303\266te/Makefile" | 8 +++++
"infom\303\266te/presentation/Makefile" | 3 ++
move-pdf.sh | 5 ++++
tilde/Makefile | 3 ++
12 files changed, 45 insertions(+), 58 deletions(-)
create mode 100644 Makefile
create mode 100644 administrativt/Makefile
create mode 100644 administrativt/kortlapp/Makefile
rename administrativt/medlemslapp/{conditions.latex => conditions.tex} (92%)
rename administrativt/medlemslapp/{villkor.latex => villkor.tex} (100%)
delete mode 100755 build.sh
create mode 100644 "infom\303\266te/Makefile"
create mode 100644 "infom\303\266te/presentation/Makefile"
create mode 100755 move-pdf.sh
create mode 100644 tilde/Makefile
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index f545eb3..d1d6596 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -6,7 +6,8 @@ image: blang/latex
build:
script:
- - ./build.sh
+ - make
+ - move-pdf.sh
artifacts:
paths:
- "*.pdf"
diff --git a/Makefile b/Makefile
new file mode 100644
index 0000000..dd42905
--- /dev/null
+++ b/Makefile
@@ -0,0 +1,5 @@
+.PHONY: all
+all:
+ $(MAKE) -C administrativt
+ $(MAKE) -C infomöte
+ $(MAKE) -C tilde
diff --git a/administrativt/Makefile b/administrativt/Makefile
new file mode 100644
index 0000000..a57a25c
--- /dev/null
+++ b/administrativt/Makefile
@@ -0,0 +1,4 @@
+.PHONY: all
+all:
+ $(MAKE) -C medlemslapp
+ $(MAKE) -C kortlapp
diff --git a/administrativt/kortlapp/Makefile b/administrativt/kortlapp/Makefile
new file mode 100644
index 0000000..d855161
--- /dev/null
+++ b/administrativt/kortlapp/Makefile
@@ -0,0 +1,3 @@
+.PHONY: all
+all:
+ latexmk -pdf
diff --git a/administrativt/medlemslapp/Makefile b/administrativt/medlemslapp/Makefile
index c16d70e..1434772 100644
--- a/administrativt/medlemslapp/Makefile
+++ b/administrativt/medlemslapp/Makefile
@@ -1,18 +1,2 @@
-all: villkor.ps conditions.ps
-
-villkor.ps: villkor.dvi
- dvips -D600 -o villkor.ps villkor.dvi
-
-villkor.dvi: villkor.latex
- latex villkor.latex
-
-conditions.ps: conditions.dvi
- dvips -D600 -o conditions.ps conditions.dvi
-
-conditions.dvi: conditions.latex
- latex conditions.latex
-
-clean:
- for i in dvi ps aux log ; do rm -f villkor.$$i conditions.$$i; done
- rm -f *~ core
-
+all:
+ latexmk -pdf
diff --git a/administrativt/medlemslapp/conditions.latex b/administrativt/medlemslapp/conditions.tex
similarity index 92%
rename from administrativt/medlemslapp/conditions.latex
rename to administrativt/medlemslapp/conditions.tex
index 8a36f5b..8d398bf 100644
--- a/administrativt/medlemslapp/conditions.latex
+++ b/administrativt/medlemslapp/conditions.tex
@@ -7,10 +7,10 @@
\textheight 25cm
\pagestyle{empty}
\begin{document}
-\epsfysize 30 mm
-\mbox{\hspace{8cm}
- \vspace{-5cm}
- \epsfbox{lyslogo.ps}}
+%\epsfysize 30 mm
+% \mbox{\hspace{8cm}
+% \vspace{-5cm}
+% \epsfbox{lyslogo.ps}}
\section*{Terms for accounts (v1.3)}
@@ -61,12 +61,12 @@ Lysators computers, and so that Lysator may keep its good network
connection. We risk losing the connection unless we behave.
\newpage
-\epsfysize 30 mm
-\mbox{\hspace{8cm}
- \vspace{-5cm}
- \epsfbox{lyslogo.ps}}
-\vspace{-5ex}
-\section*{FIlled in by the applicant}
+%\epsfysize 30 mm
+%\mbox{\hspace{8cm}
+% \vspace{-5cm}
+% \epsfbox{lyslogo.ps}}
+%\vspace{-5ex}
+\section*{Filled in by the applicant}
\renewcommand{\arraystretch}{2.57}
\fbox{
diff --git a/administrativt/medlemslapp/villkor.latex b/administrativt/medlemslapp/villkor.tex
similarity index 100%
rename from administrativt/medlemslapp/villkor.latex
rename to administrativt/medlemslapp/villkor.tex
diff --git a/build.sh b/build.sh
deleted file mode 100755
index de802b5..0000000
--- a/build.sh
+++ /dev/null
@@ -1,29 +0,0 @@
-#!/bin/bash
-pushd administrativt/kortlapp/
-latexmk -pdf
-popd
-
-pushd administrativt/medlemslapp/
-latexmk -pdf vilkor.latex
-latexmk -pdf conditions.latex
-popd
-
-pushd infomöte
-latexmk -pdf single
-popd
-
-pushd infomöte
-latexmk -pdf multi
-popd
-
-pushd infomöte/presentation
-latexmk -pdf
-popd
-
-pushd tilde
-latexmk -pdf
-popd
-
-for f in `find -name \*.pdf`; do
- mv $f $(basename $f)
-done
diff --git "a/infom\303\266te/Makefile" "b/infom\303\266te/Makefile"
new file mode 100644
index 0000000..ee2a453
--- /dev/null
+++ "b/infom\303\266te/Makefile"
@@ -0,0 +1,8 @@
+.PHONY: all
+all: multi.pdf
+ $(MAKE) -C presentation
+
+multi.pdf: single.pdf
+
+%.pdf: %.tex
+ latexmk -pdf $<
diff --git "a/infom\303\266te/presentation/Makefile" "b/infom\303\266te/presentation/Makefile"
new file mode 100644
index 0000000..d855161
--- /dev/null
+++ "b/infom\303\266te/presentation/Makefile"
@@ -0,0 +1,3 @@
+.PHONY: all
+all:
+ latexmk -pdf
diff --git a/move-pdf.sh b/move-pdf.sh
new file mode 100755
index 0000000..84d45a1
--- /dev/null
+++ b/move-pdf.sh
@@ -0,0 +1,5 @@
+#!/bin/bash
+
+for f in `find -name \*.pdf`; do
+ mv $f $(basename $f)
+done
diff --git a/tilde/Makefile b/tilde/Makefile
new file mode 100644
index 0000000..d855161
--- /dev/null
+++ b/tilde/Makefile
@@ -0,0 +1,3 @@
+.PHONY: all
+all:
+ latexmk -pdf
--
GitLab