Use rdf/xml for install manifest

4 files changed, 26 insertions, 22 deletions

diff --git a/Makefile b/Makefile
index 1415a1a..f264115 100644
--- a/Makefile
+++ b/Makefile
@@ -79,7 +79,7 @@ dist:
 	rm -rf $(NAME)-$(VERSION)
 	echo $(NAME)-$(VERSION).tar.bz2
 
-# requires rsvg, librdf
+# requires rsvg
 xpi: $(KEYFILE)
 	rm -rf $(NAME)-$(VERSION).xpi gecko-build
 	mkdir -p gecko-build/chrome/content gecko-build/defaults/preferences
@@ -93,7 +93,7 @@ xpi: $(KEYFILE)
 	rsvg -w 22 -h 22 icon.svg gecko-build/chrome/content/icon.png
 	rsvg -w 64 -h 64 icon.svg gecko-build/icon.png
 	sed -e "s/VERSION/$(VERSION)/g" -e "s|WEBSITE|$(WEBSITE)|g" -e "s|GECKOID|$(GECKOID)|g" -e "s/PUBKEY/`sh gecko/genpub.sh $(KEYFILE)`/g" \
-		< gecko/install.ttl | rapper -i turtle -o rdfxml /dev/stdin 2>/dev/null > gecko-build/install.rdf
+		< gecko/install.rdf > gecko-build/install.rdf
 	cd gecko-build; zip -r ../$(NAME)-$(VERSION).xpi . 1>/dev/null
 	rm -rf gecko-build
 	patch -R < gecko/js.patch > /dev/null
diff --git a/TODO b/TODO
index 83acf00..278c392 100644
--- a/TODO
+++ b/TODO
@@ -1,3 +1,5 @@
+add to documentation that it doesn't make any network calls at all, unlike similars, preserving privacy, increasing speed, and allowing offline usage
+
 looks like chromium sees a syntax error that isn't there in options.html. must be a weird encoding thing. this results in sometimes failure with setting options.
 
 
@@ -23,7 +25,6 @@ chromium:
 		see GenerateId in extension.cc of chrome for how it works
 
 gecko:
-	use straight rdf/xml to remove rapper build dependency
 	use rapper and bourne shell script to sign
 		this is difficult as mozilla wants the signature of a very particular serialisation of the update rdf
 		https://developer.mozilla.org/en/Extension_Versioning,_Update_and_Compatibility#Update_RDF_Format
diff --git a/gecko/install.rdf b/gecko/install.rdf
new file mode 100644
index 0000000..6fc6ef7
--- /dev/null
+++ b/gecko/install.rdf
@@ -0,0 +1,22 @@
+<?xml version="1.0"?>
+<RDF xmlns="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+     xmlns:em="http://www.mozilla.org/2004/em-rdf#"
+     xmlns:doap="http://usefulinc.com/ns/doap#">
+	<Description about="urn:mozilla:install-manifest">
+		<em:id>GECKOID</em:id>
+		<em:version>VERSION</em:version>
+		<em:type>2</em:type>
+		<em:targetApplication><Description>
+			<em:id>{ec8030f7-c20a-464f-9b0e-13a3a9e97384}</em:id>
+			<em:minVersion>3.0</em:minVersion>
+			<em:maxVersion>10.*</em:maxVersion>
+		</Description></em:targetApplication>
+		<em:name>SimplyRead</em:name>
+		<em:description>Removes distractions from webpages. Press Alt+r or press the 'sr' button in the addons bar to toggle SimplyRead.</em:description>
+		<em:creator>Nick White</em:creator>
+		<em:homepageURL>WEBSITE/</em:homepageURL>
+		<em:updateURL>WEBSITE/gecko-updates.rdf</em:updateURL>
+		<em:updateKey>PUBKEY</em:updateKey>
+		<doap:license resource="http://www.gnu.org/licenses/agpl.html" />
+	</Description>
+</RDF>
diff --git a/gecko/install.ttl b/gecko/install.ttl
deleted file mode 100644
index e65c2a4..0000000
--- a/gecko/install.ttl
+++ /dev/null
@@ -1,19 +0,0 @@
-@prefix rdf:  <http://www.w3.org/1999/02/22-rdf-syntax-ns#>.
-@prefix em:   <http://www.mozilla.org/2004/em-rdf#>.
-
-<urn:mozilla:install-manifest>
-	em:id "GECKOID";
-	em:version "VERSION";
-	em:type "2";
-	em:targetApplication [
-		em:id "{ec8030f7-c20a-464f-9b0e-13a3a9e97384}";
-		em:minVersion "3.0";
-		em:maxVersion "10.*"
-	] ;
-	em:name "SimplyRead";
-	em:description "Removes distractions from webpages. Press Alt+r or press the 'sr' button in the addons bar to toggle SimplyRead.";
-	em:creator "Nick White";
-	em:homepageURL "WEBSITE/";
-	em:updateURL "WEBSITE/gecko-updates.rdf";
-	em:updateKey "PUBKEY";
-	<http://usefulinc.com/ns/doap#license> <http://www.gnu.org/licenses/agpl.html>.