summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLars-Dominik Braun <lars@6xq.net>2018-03-30 15:33:34 +0200
committerLars-Dominik Braun <lars@6xq.net>2018-03-30 15:33:34 +0200
commitc23bfa2c2b7fa84b210a003c072e8951f8a3a3b5 (patch)
tree07597c2315ca24fcfe6a2adf10d7d286ed6c665a
parent2dfde618f3df5bd75642a63b44784a5a1d89c759 (diff)
downloadeumel-master.zip
eumel-master.tar.gz
eumel-master.tar.bz2
Add photo taken at 5th workshopHEADmaster
-rw-r--r--Makefile18
-rw-r--r--artifacts.rst2
-rw-r--r--assets/01_readme_INSTALL.txt (renamed from 01_readme_INSTALL.txt)0
-rw-r--r--assets/eumel-tagung-84.jpgbin0 -> 10097541 bytes
-rw-r--r--assets/eumel_logo.svg (renamed from eumel_logo.svg)0
-rw-r--r--assets/eumel_logo_2.svg (renamed from eumel_logo_2.svg)0
-rw-r--r--assets/releases.svg (renamed from releases.svg)0
-rw-r--r--history.rst10
-rw-r--r--quickstart.rst2
-rw-r--r--trivia.rst4
10 files changed, 27 insertions, 9 deletions
diff --git a/Makefile b/Makefile
index 72c0224..bf250e1 100644
--- a/Makefile
+++ b/Makefile
@@ -1,12 +1,19 @@
BUILDDIR:=_build
-STATICFILES:=01_readme_INSTALL.txt releases.svg eumel_logo.svg eumel_logo_2.svg
+STATICFILES:=assets/01_readme_INSTALL.txt \
+ assets/releases.svg \
+ assets/eumel_logo.svg \
+ assets/eumel_logo_2.svg \
+ assets/eumel-tagung-84.jpg
TTLFILES:=$(shell find ttl -name '*.ttl' | sort)
-all: $(BUILDDIR)/index.html links
+all: $(BUILDDIR)/index.html $(BUILDDIR)/assets/eumel-tagung-84-resized.jpg links
$(BUILDDIR):
mkdir -p $(BUILDDIR)
+$(BUILDDIR)/assets:
+ mkdir -p $@
+
$(BUILDDIR)/index.ttl: $(TTLFILES) | $(BUILDDIR)
cat $(TTLFILES) > $@
@@ -16,6 +23,9 @@ $(BUILDDIR)/bib.rst: $(BUILDDIR)/index.ttl tools/formatRefs.py | $(BUILDDIR)
$(BUILDDIR)/software.html: $(BUILDDIR)/index.ttl tools/formatSoftware.py
cat $(BUILDDIR)/index.ttl | ./tools/formatSoftware.py > $@
+$(BUILDDIR)/assets/eumel-tagung-84-resized.jpg: assets/eumel-tagung-84.jpg | $(BUILDDIR)/assets
+ convert -scale 1000x $< -quality 75 $@
+
$(BUILDDIR)/index.html: $(BUILDDIR)/software.html $(BUILDDIR)/bib.rst history.rst artifacts.rst popularity.rst hardware.rst internals.rst index.rst software.rst about.rst trivia.rst quickstart.rst overview.rst
rst2html5.py --cloak-email-addresses --math-output=mathjax \
--syntax-highlight=short --link-stylesheet \
@@ -23,8 +33,8 @@ $(BUILDDIR)/index.html: $(BUILDDIR)/software.html $(BUILDDIR)/bib.rst history.rs
--template=./template.txt \
--footnote-references=superscript < index.rst > $@
-links: $(STATICFILES) | $(BUILDDIR)
- ln -f $(STATICFILES) $(BUILDDIR)
+links: $(STATICFILES) | $(BUILDDIR)/assets
+ ln -f $(STATICFILES) $(BUILDDIR)/assets
.PHONY: clean links
diff --git a/artifacts.rst b/artifacts.rst
index 0fc17ab..39fafaa 100644
--- a/artifacts.rst
+++ b/artifacts.rst
@@ -84,7 +84,7 @@ Source:
.. _EUMEL base system: disks/grundpaket.zip
.. _Programming language packet: disks/informatikpaket.zip
.. _1.7.3 Urlader and Hintergrund: disks/173_ibmpc.zip
-.. _setup instructions: 01_readme_INSTALL.txt
+.. _setup instructions: assets/01_readme_INSTALL.txt
.. _ERGOS diskset: disks/187_ergos.zip
.. _EUDAS: disks/eudas.zip
.. _Hintergrund: disks/hintergrund.zip
diff --git a/01_readme_INSTALL.txt b/assets/01_readme_INSTALL.txt
index db190af..db190af 100644
--- a/01_readme_INSTALL.txt
+++ b/assets/01_readme_INSTALL.txt
diff --git a/assets/eumel-tagung-84.jpg b/assets/eumel-tagung-84.jpg
new file mode 100644
index 0000000..1373176
--- /dev/null
+++ b/assets/eumel-tagung-84.jpg
Binary files differ
diff --git a/eumel_logo.svg b/assets/eumel_logo.svg
index a89347c..a89347c 100644
--- a/eumel_logo.svg
+++ b/assets/eumel_logo.svg
diff --git a/eumel_logo_2.svg b/assets/eumel_logo_2.svg
index b6a4860..b6a4860 100644
--- a/eumel_logo_2.svg
+++ b/assets/eumel_logo_2.svg
diff --git a/releases.svg b/assets/releases.svg
index 4764287..4764287 100644
--- a/releases.svg
+++ b/assets/releases.svg
diff --git a/history.rst b/history.rst
index 4a15d73..f6a775d 100644
--- a/history.rst
+++ b/history.rst
@@ -72,7 +72,7 @@ sources.
1.8.0, October 1986
1.8.7, ≤1990, [ambros90b]_
-.. figure:: releases.svg
+.. figure:: assets/releases.svg
L3
^^
@@ -96,8 +96,16 @@ and later at GMD Birlinghofen.
1981-05-15,,,[eumelspiegel81a]_
1982-05,Bielefeld University,,[eumelspiegel82b]_
+ 1984-05-19,Bielefeld University,,(see picture)
1985-09-21,GMD Birlinghofen,300,[gmdspiegel85c]_
1986-10-04,GMD Birlinghofen,350,[gmdbericht86b]_
1987-09-19/21,GMD Sankt Augustin,200/100,[gmdspiegel87b]_
1988-10-01,Realschule Niederpleis,200,[gmdspiegel88d]_
+.. figure:: assets/eumel-tagung-84-resized.jpg
+ :target: assets/eumel-tagung-84.jpg
+
+ 5th EUMEL workshop at Bielefeld University. Picture taken 1984-05-19. Source: BITS_
+
+.. _BITS: http://www.uni-bielefeld.de/bits/
+
diff --git a/quickstart.rst b/quickstart.rst
index 87b7f18..dc7ffeb 100644
--- a/quickstart.rst
+++ b/quickstart.rst
@@ -22,6 +22,6 @@ emulating an IBM PC. In this example we’re using qemu_.
8. Congratulations, a fully functional EUMEL is now running in your virtual
machine! For the next steps head over to [praxis1]_.
-.. _install instructions: 01_readme_INSTALL.txt
+.. _install instructions: assets/01_readme_INSTALL.txt
.. _qemu: http://www.qemu.org/
diff --git a/trivia.rst b/trivia.rst
index 7cc2b4c..e76922d 100644
--- a/trivia.rst
+++ b/trivia.rst
@@ -1,11 +1,11 @@
Trivia
------
-.. figure:: eumel_logo.svg
+.. figure:: assets/eumel_logo.svg
EUMEL’s logo
-.. figure:: eumel_logo_2.svg
+.. figure:: assets/eumel_logo_2.svg
Second EUMEL logo