From 4cdb10438dad3fd4b9ecc8ef96538f4219b42e5e Mon Sep 17 00:00:00 2001 From: Nick White <git@njw.me.uk> Date: Thu, 18 Nov 2010 18:45:29 +0000 Subject: Make all now makes all, and make rules deploy to web/ --- Makefile | 28 +++++++++++++++------------- doap.ttl | 46 ---------------------------------------------- web/doap.ttl | 46 ++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 61 insertions(+), 59 deletions(-) delete mode 100644 doap.ttl create mode 100644 web/doap.ttl diff --git a/Makefile b/Makefile index 7a05f61..4d2ca16 100644 --- a/Makefile +++ b/Makefile @@ -1,10 +1,12 @@ NAME = simplyread VERSION = 0.4 -chromium-updates.xml: chromium/updates.xml +all: web/chromium-updates.xml web/index.html dist xpi crx + +web/chromium-updates.xml: chromium/updates.xml sed "s/VERSION/$(VERSION)/g" < $< > $@ -index.html: doap.ttl README webheader.html +web/index.html: web/doap.ttl README webheader.html echo making webpage cat < webheader.html > $@ smu < README >> $@ @@ -15,17 +17,17 @@ index.html: doap.ttl README webheader.html echo '<h3><a href="$(NAME)-$(VERSION).crx">SimplyRead $(VERSION) for Chromium</a><br />' >> $@ echo '<a href="$(NAME)-$(VERSION).xpi.crx">GPG signature</a></h3>' >> $@ echo '<hr />' >> $@ - sh websummary.sh doap.ttl | smu >> $@ + sh websummary.sh web/doap.ttl | smu >> $@ echo '</body></html>' >> $@ dist: mkdir -p $(NAME)-$(VERSION) cp simplyread.js keybind.js COPYING INSTALL README Makefile $(NAME)-$(VERSION) cp -R gecko chromium tests $(NAME)-$(VERSION) - tar -c $(NAME)-$(VERSION) | bzip2 -c > $(NAME)-$(VERSION).tar.bz2 - gpg -b < $(NAME)-$(VERSION).tar.bz2 > $(NAME)-$(VERSION).tar.bz2.sig + tar -c $(NAME)-$(VERSION) | bzip2 -c > web/$(NAME)-$(VERSION).tar.bz2 + gpg -b < web/$(NAME)-$(VERSION).tar.bz2 > web/$(NAME)-$(VERSION).tar.bz2.sig rm -rf $(NAME)-$(VERSION) - echo $(NAME)-$(VERSION).tar.bz2 $(NAME)-$(VERSION).tar.bz2.sig + echo web/$(NAME)-$(VERSION).tar.bz2 web/$(NAME)-$(VERSION).tar.bz2.sig xpi: rm -rf $(NAME)-$(VERSION).xpi gecko-build @@ -35,10 +37,10 @@ xpi: cp simplyread.js gecko-build/chrome/content/ rsvg gecko/chrome/content/icon.svg gecko-build/chrome/content/icon.png sed "s/VERSION/$(VERSION)/g" < gecko/install.ttl | rapper -i turtle -o rdfxml /dev/stdin 2>/dev/null > gecko-build/install.rdf - cd gecko-build; zip -r ../$(NAME)-$(VERSION).xpi . 1>/dev/null - gpg -b < $(NAME)-$(VERSION).xpi > $(NAME)-$(VERSION).xpi.sig + cd gecko-build; zip -r ../web/$(NAME)-$(VERSION).xpi . 1>/dev/null + gpg -b < web/$(NAME)-$(VERSION).xpi > web/$(NAME)-$(VERSION).xpi.sig rm -rf gecko-build - echo $(NAME)-$(VERSION).xpi $(NAME)-$(VERSION).xpi.sig + echo web/$(NAME)-$(VERSION).xpi web/$(NAME)-$(VERSION).xpi.sig crx: rm -rf chromium-build @@ -46,10 +48,10 @@ crx: cp COPYING simplyread.js keybind.js chromium/background.html chromium-build/ rsvg chromium/icon.svg chromium-build/icon.png sed "s/VERSION/$(VERSION)/g" < chromium/manifest.json > chromium-build/manifest.json - sh chromium/makecrx.sh chromium-build chromium/private.pem > $(NAME)-$(VERSION).crx + sh chromium/makecrx.sh chromium-build chromium/private.pem > web/$(NAME)-$(VERSION).crx rm -r chromium-build - gpg -b < $(NAME)-$(VERSION).crx > $(NAME)-$(VERSION).crx.sig - echo $(NAME)-$(VERSION).crx $(NAME)-$(VERSION).crx.sig + gpg -b < web/$(NAME)-$(VERSION).crx > web/$(NAME)-$(VERSION).crx.sig + echo web/$(NAME)-$(VERSION).crx web/$(NAME)-$(VERSION).crx.sig # note that tests require a patched surf browser; see tests/runtest.sh test: @@ -60,6 +62,6 @@ test: test ! -s $$i.diff && rm $$i.diff; \ done -.PHONY: dist xpi crx test +.PHONY: all dist xpi crx test .SUFFIXES: ttl html png svg .SILENT: diff --git a/doap.ttl b/doap.ttl deleted file mode 100644 index a4cc922..0000000 --- a/doap.ttl +++ /dev/null @@ -1,46 +0,0 @@ -@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/simplyread/#>. - -:p a doap:Project; - doap:name "SimplyRead"; - doap:shortdesc "Makes webpages more readable"; - doap:homepage <http://njw.me.uk/software/simplyread/>; - doap:repository :repo; - doap:programming-language "ECMAScript"; - doap:license <http://www.gnu.org/licenses/agpl.html>; - doap:release :v0.1, :v0.2, :v0.3, :v0.4; - doap:maintainer <http://njw.me.uk/card#i>. - -<http://njw.me.uk/card#i> a foaf:Person; - foaf:name "Nick White"; - foaf:homepage <http://njw.me.uk>. - -:repo a doap:GitRepository; - doap:location <http://git.njw.me.uk/simplyread.git>. - -:v0.1 a doap:Version; - doap:revision "0.1"; - doap:created "2010-10-23"; - doap:file-release <http://njw.me.uk/software/simplyread/readable-0.1.tar.bz2>. - -:v0.2 a doap:Version; - doap:revision "0.2"; - doap:created "2010-11-04"; - doap:file-release <http://njw.me.uk/software/simplyread/readable-0.2.tar.bz2>, - <http://njw.me.uk/software/simplyread/readable-0.2.xpi>. - -:v0.3 a doap:Version; - doap:revision "0.3"; - doap:created "2010-11-13"; - doap:file-release <http://njw.me.uk/software/simplyread/simplyread-0.3.tar.bz2>, - <http://njw.me.uk/software/simplyread/simplyread-0.3.xpi>, - <http://njw.me.uk/software/simplyread/simplyread-0.3.crx>. - -:v0.4 a doap:Version; - doap:revision "0.4"; - doap:created "2010-11-16"; - doap:file-release <http://njw.me.uk/software/simplyread/simplyread-0.4.tar.bz2>, - <http://njw.me.uk/software/simplyread/simplyread-0.4.xpi>, - <http://njw.me.uk/software/simplyread/simplyread-0.4.crx>. diff --git a/web/doap.ttl b/web/doap.ttl new file mode 100644 index 0000000..a4cc922 --- /dev/null +++ b/web/doap.ttl @@ -0,0 +1,46 @@ +@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/simplyread/#>. + +:p a doap:Project; + doap:name "SimplyRead"; + doap:shortdesc "Makes webpages more readable"; + doap:homepage <http://njw.me.uk/software/simplyread/>; + doap:repository :repo; + doap:programming-language "ECMAScript"; + doap:license <http://www.gnu.org/licenses/agpl.html>; + doap:release :v0.1, :v0.2, :v0.3, :v0.4; + doap:maintainer <http://njw.me.uk/card#i>. + +<http://njw.me.uk/card#i> a foaf:Person; + foaf:name "Nick White"; + foaf:homepage <http://njw.me.uk>. + +:repo a doap:GitRepository; + doap:location <http://git.njw.me.uk/simplyread.git>. + +:v0.1 a doap:Version; + doap:revision "0.1"; + doap:created "2010-10-23"; + doap:file-release <http://njw.me.uk/software/simplyread/readable-0.1.tar.bz2>. + +:v0.2 a doap:Version; + doap:revision "0.2"; + doap:created "2010-11-04"; + doap:file-release <http://njw.me.uk/software/simplyread/readable-0.2.tar.bz2>, + <http://njw.me.uk/software/simplyread/readable-0.2.xpi>. + +:v0.3 a doap:Version; + doap:revision "0.3"; + doap:created "2010-11-13"; + doap:file-release <http://njw.me.uk/software/simplyread/simplyread-0.3.tar.bz2>, + <http://njw.me.uk/software/simplyread/simplyread-0.3.xpi>, + <http://njw.me.uk/software/simplyread/simplyread-0.3.crx>. + +:v0.4 a doap:Version; + doap:revision "0.4"; + doap:created "2010-11-16"; + doap:file-release <http://njw.me.uk/software/simplyread/simplyread-0.4.tar.bz2>, + <http://njw.me.uk/software/simplyread/simplyread-0.4.xpi>, + <http://njw.me.uk/software/simplyread/simplyread-0.4.crx>. -- cgit v1.2.3