summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNick White <git@njw.me.uk>2011-05-22 02:54:18 +0100
committerNick White <git@njw.me.uk>2011-05-22 02:54:18 +0100
commit18351dea2ee53e26b7fbdf7c037dbe715fb66ceb (patch)
tree44fed576f291256da1578c74bd38fe64827e64b9
parentf1199cdcf7ebcde4b6cc69c70319e60245344601 (diff)
Use the same icon everywhere
-rw-r--r--Makefile8
-rw-r--r--gecko/chrome/content/icon.svg6
-rw-r--r--icon.svg (renamed from chromium/icon.svg)0
3 files changed, 4 insertions, 10 deletions
diff --git a/Makefile b/Makefile
index 38644a5..a4c1629 100644
--- a/Makefile
+++ b/Makefile
@@ -37,7 +37,7 @@ xpi:
cp COPYING gecko/chrome.manifest gecko-build/
cp gecko/chrome/content/simplyread.xul gecko-build/chrome/content/
cp simplyread.js gecko-build/chrome/content/
- rsvg gecko/chrome/content/icon.svg gecko-build/chrome/content/icon.png
+ rsvg -w 22 -h 22 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 ../web/$(NAME)-$(VERSION).xpi . 1>/dev/null
gpg -b < web/$(NAME)-$(VERSION).xpi > web/$(NAME)-$(VERSION).xpi.sig
@@ -48,9 +48,9 @@ crx:
rm -rf chromium-build
mkdir chromium-build
cp COPYING simplyread.js keybind.js chromium/viable.js chromium/background.html chromium-build/
- rsvg -w 19 -h 19 chromium/icon.svg chromium-build/icon.png
- rsvg -w 48 -h 48 chromium/icon.svg chromium-build/icon48.png
- rsvg -w 128 -h 128 chromium/icon.svg chromium-build/icon128.png
+ rsvg -w 19 -h 19 icon.svg chromium-build/icon.png
+ rsvg -w 48 -h 48 icon.svg chromium-build/icon48.png
+ rsvg -w 128 -h 128 icon.svg chromium-build/icon128.png
sed "s/VERSION/$(VERSION)/g" < chromium/manifest.json > chromium-build/manifest.json
sh chromium/makecrx.sh chromium-build $(KEYFILE) > web/$(NAME)-$(VERSION).crx
rm -r chromium-build
diff --git a/gecko/chrome/content/icon.svg b/gecko/chrome/content/icon.svg
deleted file mode 100644
index f1f4062..0000000
--- a/gecko/chrome/content/icon.svg
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg xmlns="http://www.w3.org/2000/svg" version="1.0" width="22" height="22">
- <circle cx="11" cy="11" r="11" fill="white"/>
- <text x="4" y="16" font-size="18" font-family="sans">s</text>
- <text x="10" y="16" font-size="18" font-family="sans">r</text>
-</svg>
diff --git a/chromium/icon.svg b/icon.svg
index fda3979..fda3979 100644
--- a/chromium/icon.svg
+++ b/icon.svg