Simplify and update webpage creation

11 files changed, 28 insertions, 60 deletions

diff --git a/.gitignore b/.gitignore
index 34b5629..f7aa3fc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,3 @@
 *.o
 spout
-web/index.html
-web/releases
+index.html
diff --git a/INSTALL b/INSTALL
new file mode 100644
index 0000000..1faf38a
--- /dev/null
+++ b/INSTALL
@@ -0,0 +1,9 @@
+Dependencies
+------------
+
+* libSDL
+
+Install
+-------
+
+Edit config.mk to your liking, then run 'make install'
diff --git a/Makefile b/Makefile
index e3cc21b..a97a441 100644
--- a/Makefile
+++ b/Makefile
@@ -8,7 +8,7 @@ OBJ = $(SRC:.c=.o)
 MAN = $(TARGETS:=.1)
 
 HEADERS = spout.h config.def.h font.h sintable.h
-WEB = web/index.html
+WEB = index.html
 
 include config.mk
 
@@ -28,13 +28,17 @@ config.h:
 	@echo creating $@ from config.def.h
 	@cp config.def.h $@
 
-$(WEB): web/index.txt web/header.html web/footer.html web/doap.ttl
+$(WEB): README webheader.html doap.ttl
 	@echo making webpage
-	@cat web/header.html > $@
-	@sed 's/VERSION/$(VERSION)/g' < web/index.txt | smu >> $@
+	@cat webheader.html > $@
+	@sed 5q < README | smu >> $@
+	@echo '![Screenshot of Spout](screenshot.png)' | smu >> $@
+	@echo '<h3><a href="$(NAME)-$(VERSION).tar.bz2">Download Spout $(VERSION)</a><br />' >> $@
+	@echo '<a href="$(NAME)-$(VERSION).tar.bz2.sig">GPG signature</a></h3>' >> $@
+	@sed '1,6d' < README | smu >> $@
 	@echo '<hr />' >> $@
-	@sh web/summary.sh web/doap.ttl | smu >> $@
-	@cat web/footer.html >> $@
+	@sh summary.sh doap.ttl | smu >> $@
+	@echo '</body></html>' >> $@
 
 clean:
 	rm -f -- $(TARGETS) $(WEB) $(OBJ) $(NAME)-$(VERSION).tar.bz2 $(NAME)-$(VERSION).tar.bz2.sig
diff --git a/README b/README
index 91bc43c..9e3c017 100644
--- a/README
+++ b/README
@@ -4,16 +4,6 @@ Spout
 Spout is a simple caveflying game. The aim is to get as high as
 possible, avoiding or destroying obstacles.
 
-Requirements
-------------
-
-* libSDL
-
-Install
--------
-
-Edit config.mk to your liking, then run 'make install'
-
 Controls
 --------
 
diff --git a/web/doap.ttl b/doap.ttl
index b15337f..3957c24 100644
--- a/web/doap.ttl
+++ b/doap.ttl
@@ -1,7 +1,7 @@
 @prefix rdf:  <http://www.w3.org/1999/02/22-rdf-syntax-ns#>.
 @prefix doap: <http://usefulinc.com/ns/doap#>.
 @prefix foaf: <http://xmlns.com/foaf/0.1/>.
-@prefix :     <http://njw.me.uk/software/spout#>.
+@prefix :     <http://njw.me.uk/software/spout/#>.
 
 :p a doap:Project;
     doap:name "Spout";
diff --git a/web/screen.png b/screenshot.png
index 6a20078..6a20078 100644
--- a/web/screen.png
+++ b/screenshot.png
diff --git a/web/small.png b/small.png
index 39e79a6..39e79a6 100644
--- a/web/small.png
+++ b/small.png
diff --git a/web/summary.sh b/summary.sh
index ef58225..c274443 100644
--- a/web/summary.sh
+++ b/summary.sh
@@ -6,7 +6,7 @@ rdf="$1"
 
 q="PREFIX doap: <http://usefulinc.com/ns/doap#>
 PREFIX foaf: <http://xmlns.com/foaf/0.1/>
-SELECT ?home ?repo ?license ?maintainer ?maintainerhome ?lang
+SELECT ?home ?repo ?license ?maintainer ?maintainerhome ?lang ?repotype
 WHERE {
 ?p a doap:Project;
    doap:homepage ?home;
@@ -14,7 +14,8 @@ WHERE {
    doap:license ?license;
    doap:programming-language ?lang;
    doap:maintainer ?m.
-?r doap:location ?repo.
+?r a ?repotype;
+   doap:location ?repo.
 ?m foaf:name ?maintainer;
    foaf:homepage ?maintainerhome.
 }"
@@ -28,11 +29,14 @@ roqet -q -r csv -e "$q" -D /dev/stdin < $rdf | sed '/^Result/d' \
 	mainthome=`echo $r | awk -F , '{print $6}'| sed -e 's/uri(\(.*\))/\1/'`
 	lang=`echo $r | awk -F , '{print $7}'| sed -e 's/"\(.*\)"/\1/'`
 	test "$licenseuri" = "http://www.gnu.org/licenses/gpl.html" && license="GPL"
+	test "$licenseuri" = "http://www.gnu.org/licenses/agpl.html" && license="AGPL"
 	test "$licenseuri" = "http://creativecommons.org/licenses/MIT/" && license="MIT"
+	repotype=`echo $r | awk -F , '{print $8}'| sed -e 's/uri(\(.*\))/\1/'`
+	test "$repotype" = "http://usefulinc.com/ns/doap#GitRepository" && repocmd="git clone"
 
 	cat <<- _EOF_
 - Project homepage: [$home]($home)
-- Code repository: [$repo]($repo)
+- Code repository: $repocmd $repo
 - Maintainer: [$maint]($mainthome)
 - Language: $lang
 - License: [$license]($licenseuri)
diff --git a/web/footer.html b/web/footer.html
deleted file mode 100644
index 62b274f..0000000
--- a/web/footer.html
+++ /dev/null
@@ -1 +0,0 @@
-</body></html>
diff --git a/web/index.txt b/web/index.txt
deleted file mode 100644
index 1217b91..0000000
--- a/web/index.txt
+++ /dev/null
@@ -1,37 +0,0 @@
-Spout
-=======================================================================
-
-About
------
-
-Spout is a simple caveflying game. The aim is to get as high as
-possible avoiding or destroying obstacles.
-
-![Screenshot of Spout](screen.png)
-
-It should work on any *nix system with SDL libraries installed.
-
-Spout is free software released under the terms of the MIT license.
-
-### [Download Spout 1.4](releases/spout-VERSION.tar.bz2)  
-### ([GPG signature](releases/spout-VERSION.tar.bz2.sig))
-
-History
--------
-
-Spout was originally written for a handheld by kuni, and soon
-afterwards was ported to Windows using cygwin and sdl and released
-under the MIT license.
-
-In 2004 a 'unix version' was released, which mostly just slapped
-autotools into the windows version and infringed the license.
-
-This is a new unix version, based on the original Windows code by
-kuni, which aims to add useful features and simplify the code.
-
-Development
------------
-
-Please send any patches, bugs or general thoughts to me by
-[email](http://njw.me.uk/contact). A list of current issues to
-work on can be found in the TODO file in the repository.
diff --git a/web/header.html b/webheader.html
index fed7a0b..fed7a0b 100644
--- a/web/header.html
+++ b/webheader.html