Work on vendor API abstraction, and near complete Safari support

5 files changed, 207 insertions, 0 deletions

diff --git a/meta/config.json b/meta/config.json
new file mode 100644
index 0000000..f5b8010
--- /dev/null
+++ b/meta/config.json
@@ -0,0 +1,31 @@
+{

+	"name": "µBlock",

+	"clean_name": "ublock",

+	"url": "https://github.com/gorhill/uBlock",

+	"author": "Raymond Hill",

+	"author_email": "rhill@raymondhill.net",

+	"author_www": "http://raymondhill.net/",

+	"version": "0.7.0.7",

+	"def_lang": "en",

+	"vendors": {

+		"crx": {

+			"app_id": "cjpalhdlnbpafiamejdnhcphjbkeiagm",

+			"manifest": "manifest.json",

+			"locales": "_locales",

+			"file_ext": ".crx",

+			"cert_key": "../meta/crx/key.pem"

+		},

+		"safariextz": {

+			"app_id": "net.gorhill.uBlock",

+			"dir": "uBlock.safariextension",

+			"manifest": {

+				"Info": "Info.plist",

+				"Settings": "Settings.plist"

+			},

+			"file_ext": ".safariextz",

+			"developer_identifier": "T7HSFKB9M5",

+			"cert_dir": "../meta/safariextz/certs/",

+			"cert_key": "../meta/safariextz/certs/key.pem"

+		}

+	}

+}
\ No newline at end of file
diff --git a/meta/crx/manifest.json b/meta/crx/manifest.json
new file mode 100644
index 0000000..22641fa
--- /dev/null
+++ b/meta/crx/manifest.json
@@ -0,0 +1,62 @@
+{
+    "manifest_version": 2,
+    "minimum_chrome_version": "22.0",
+    "default_locale": "{def_lang}",
+    "update_url": "https://clients2.google.com/service/update2/crx",
+
+    "version": "{version}",
+    "name": "__MSG_extName__",
+    "description": "__MSG_extShortDesc__",
+    "homepage_url": "{url}",
+    "author": "{author}",
+    "developer": {
+        "name": "{author}",
+        "email": "{author_email}"
+    },
+
+    "icons": {
+        "16": "img/icon_16.png",
+        "128": "img/icon_128.png"
+    },
+
+    "permissions": [
+        "contextMenus",
+        "downloads",
+        "storage",
+        "tabs",
+        "unlimitedStorage",
+        "webNavigation",
+        "webRequest",
+        "webRequestBlocking",
+        "http://*/*",
+        "https://*/*"
+    ],
+
+    "background": {
+        "page": "background.html"
+    },
+    "options_page": "dashboard.html",
+    "content_scripts": [
+        {
+            "matches": ["http://*/*", "https://*/*"],
+            "js": ["js/vapi-client.js", "js/contentscript-start.js"],
+            "run_at": "document_start",
+            "all_frames": true
+        },
+        {
+            "matches": ["http://*/*", "https://*/*"],
+            "js": ["js/contentscript-end.js"],
+            "run_at": "document_end",
+            "all_frames": true
+        }
+    ],
+
+    "browser_action": {
+        "default_icon": {
+            "19": "img/browsericons/icon19-off.png",
+            "38": "img/browsericons/icon38-off.png"
+        },
+        "default_title": "{name}",
+        "default_popup": "popup.html"
+    }
+}
\ No newline at end of file
diff --git a/meta/crx/update_crx.xml b/meta/crx/update_crx.xml
new file mode 100644
index 0000000..74078e8
--- /dev/null
+++ b/meta/crx/update_crx.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<gupdate xmlns="http://www.google.com/update2/response" protocol="2.0">
+	<app appid="{app_id}">
+		<updatecheck codebase="{url}{name}.crx" version="{version}"/>
+	</app>
+</gupdate>
diff --git a/meta/safariextz/Info.plist b/meta/safariextz/Info.plist
new file mode 100644
index 0000000..125dc1b
--- /dev/null
+++ b/meta/safariextz/Info.plist
@@ -0,0 +1,87 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>Author</key>
+	<string>{author}</string>
+	<key>Builder Version</key>
+	<string>534.57.2</string>
+	<key>CFBundleDisplayName</key>
+	<string>{name}</string>
+	<key>CFBundleIdentifier</key>
+	<string>{app_id}</string>
+	<key>CFBundleInfoDictionaryVersion</key>
+	<string>6.0</string>
+	<key>CFBundleShortVersionString</key>
+	<string>{version}</string>
+	<key>CFBundleVersion</key>
+	<string>{build_number}</string>
+	<key>Chrome</key>
+	<dict>
+		<key>Database Quota</key>
+		<real>52428800</real>
+		<key>Global Page</key>
+		<string>background.html</string>
+		<key>Popovers</key>
+		<array>
+			<dict>
+				<key>Identifier</key>
+				<string>popover</string>
+				<key>Filename</key>
+				<string>popup.html</string>
+			</dict>
+		</array>
+		<key>Toolbar Items</key>
+		<array>
+			<dict>
+				<key>Identifier</key>
+				<string>toolbarItem</string>
+				<key>Image</key>
+				<string>img/icon_16.png</string>
+				<key>Label</key>
+				<string>{name}</string>
+				<key>Popover</key>
+				<string>popover</string>
+			</dict>
+		</array>
+	</dict>
+	<key>Content</key>
+	<dict>
+		<key>Scripts</key>
+		<dict>
+			<key>Start</key>
+			<array>
+				<string>js/vapi-client.js</string>
+				<string>js/contentscript-start.js</string>
+			</array>
+			<key>End</key>
+			<array>
+				<string>js/contentscript-end.js</string>
+			</array>
+		</dict>
+		<key>Whitelist</key>
+		<array>
+			<string>http://*/*</string>
+			<string>https://*/*</string>
+		</array>
+	</dict>
+	<key>Description</key>
+	<string>{description}</string>
+	<key>ExtensionInfoDictionaryVersion</key>
+	<string>1.0</string>
+	<key>Permissions</key>
+	<dict>
+		<key>Website Access</key>
+		<dict>
+			<key>Include Secure Pages</key>
+			<true/>
+			<key>Level</key>
+			<string>All</string>
+		</dict>
+	</dict>
+	<!-- <key>Update Manifest URL</key>
+	<string>{url}update_safariextz.plist</string> -->
+	<key>Website</key>
+	<string>{url}</string>
+</dict>
+</plist>
diff --git a/meta/safariextz/update_safariextz.plist b/meta/safariextz/update_safariextz.plist
new file mode 100644
index 0000000..4c4f28b
--- /dev/null
+++ b/meta/safariextz/update_safariextz.plist
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+	<dict>
+		<key>Extension Updates</key>
+		<array>
+			<dict>
+				<key>CFBundleIdentifier</key>
+				<string>{app_id}</string>
+				<key>Developer Identifier</key>
+				<string>{developer_identifier}</string>
+				<key>CFBundleShortVersionString</key>
+				<string>{version}</string>
+				<key>CFBundleVersion</key>
+				<string>{build_number}</string>
+				<key>URL</key>
+				<string>{url}{name}.safariextz</string>
+			</dict>
+		</array>
+	</dict>
+</plist>