Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Narvaez <dwnarvaez@gmail.com>2013-02-02 14:37:42 (GMT)
committer Daniel Narvaez <dwnarvaez@gmail.com>2013-02-02 14:37:42 (GMT)
commitbc0b40d2cfb1459fffc6031bf48d005585b6326f (patch)
treec53f931c6f2f7c61f5c50aa2c3958594910a9b74
parent6ead22274f5bdd5b88e652a5d6a1bba3e5c307d0 (diff)
Build and install the addon
-rw-r--r--.gitmodules3
-rw-r--r--Makefile-addon.am6
-rw-r--r--Makefile.am3
m---------addon-sdk0
-rw-r--r--addon/package.json6
-rw-r--r--browser/sugar-html-browser.in10
6 files changed, 22 insertions, 6 deletions
diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 0000000..01abc7e
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "addon-sdk"]
+ path = addon-sdk
+ url = git://github.com/mozilla/addon-sdk.git
diff --git a/Makefile-addon.am b/Makefile-addon.am
new file mode 100644
index 0000000..98d841a
--- /dev/null
+++ b/Makefile-addon.am
@@ -0,0 +1,6 @@
+extensionsdir = $(pkglibdir)/extensions
+extensions_DATA = sugar.xpi
+
+sugar.xpi:
+ CUDDLEFISH_ROOT=$(ADDONSDKDIR) \
+ $(ADDONSDKDIR)/bin/cfx --pkgdir=$(ADDONSRCDIR) xpi
diff --git a/Makefile.am b/Makefile.am
index 94fc58a..96f767a 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,3 +1,6 @@
BROWSERSRCDIR=$(top_srcdir)/browser
+ADDONSRCDIR=$(top_srcdir)/addon
+ADDONSDKDIR=$(top_srcdir)/addon-sdk
include $(top_srcdir)/Makefile-browser.am
+include $(top_srcdir)/Makefile-addon.am
diff --git a/addon-sdk b/addon-sdk
new file mode 160000
+Subproject ac9eb0cd2df59812531716e92febffa2d6a48c1
diff --git a/addon/package.json b/addon/package.json
index 6418ef5..39328d4 100644
--- a/addon/package.json
+++ b/addon/package.json
@@ -1,9 +1,9 @@
{
- "name": "firefox-addon",
+ "name": "sugar",
"license": "MPL 2.0",
"author": "",
"version": "0.1",
- "fullName": "firefox-addon",
+ "fullName": "sugar",
"id": "jid1-RTyA5c7teVs4tA",
- "description": "a basic add-on"
+ "description": "sugar html addon"
}
diff --git a/browser/sugar-html-browser.in b/browser/sugar-html-browser.in
index 90cdd87..34b607b 100644
--- a/browser/sugar-html-browser.in
+++ b/browser/sugar-html-browser.in
@@ -1,7 +1,11 @@
#!/bin/sh
-profile=$SUGAR_BUNDLE_PATH/firefox-profile
+profiledir=$SUGAR_ACTIVITY_ROOT/data/firefox-profile
+extensionsdir=$profiledir/extensions
-mkdir -p $profile
+mkdir -p $extensionsdir
-exec firefox -no-remote -profile $profile index.html
+ln -s @pkglibdir@/extensions/sugar.xpi \
+ $extensionsdir/jid1-RTyA5c7teVs4tA@jetpack.xpi
+
+exec firefox -no-remote -profile $profiledir index.html