summaryrefslogtreecommitdiffabout
Side-by-side diff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--Makefile.am5
-rw-r--r--configure.ac2
-rw-r--r--install.rdf.in1
-rw-r--r--update-template.rdf.in (renamed from update.rdf.in)1
4 files changed, 7 insertions, 2 deletions
diff --git a/Makefile.am b/Makefile.am
index 06aeaae..a3236ce 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,30 +2,33 @@ SUBDIRS = content locale
xpi_DATA = \
install.rdf \
AUTHORS COPYING NEWS
EXTRA_DIST = NEWS NEWS.xml NEWS.xsl chrome.manifest
XPI=${PACKAGE}-${VERSION}.xpi
xpi: ${XPI}
${XPI}: install
- test -z "${NO_UPDATE}" || sed -i -e '/em:updateURL/d' ${xpidir}/install.rdf
+ test -z "${NO_UPDATE}" || sed -i -e '/em:update\(URL\|Key\)/d' ${xpidir}/install.rdf
cd ${xpichromedir} \
&& ${ZIP} -r -m ${PACKAGE}.jar */
cd ${xpidir} \
&& ${ZIP} -r @abs_builddir@/$@ .
+update.rdf: update-template.rdf ${XPI}
+ sed -e "s/<!--SHA1-->/$$(sha1sum ${XPI}|cut -d\ -f1)/" <$< >$@
+
install-data-local: ${xpidir}/chrome.manifest
${xpidir}/chrome.manifest: chrome.manifest Makefile
sed \
-e 's,^content[[:space:]]\+\([^[:space:]]\+\)[[:space:]]\+\([^[:space:]]\+\)$$,content \1 jar:chrome/${PACKAGE}.jar!/\2,' \
-e 's,^locale[[:space:]]\+\([^[:space:]]\+\)[[:space:]]\+\([^[:space:]]\+\)[[:space:]]\+\([^[:space:]]\+\)$$,locale \1 \2 jar:chrome/${PACKAGE}.jar!/\3,' \
$< >$@
clean-local:
rm -rf ${xpidir} ${XPI}
all-local: NEWS
diff --git a/configure.ac b/configure.ac
index 61b9747..6a478db 100644
--- a/configure.ac
+++ b/configure.ac
@@ -11,18 +11,18 @@ AC_PATH_PROG([XSLTPROC],[xsltproc],[true])
AC_SUBST([xpidir],[\${top_builddir}/xpi])
AC_SUBST([xpichromedir],[\${xpidir}/chrome])
AC_SUBST([xpichromecontentdir],[\${xpichromedir}/content])
AC_SUBST([xpichromelocaledir],[\${xpichromedir}/locale])
COPYING="`sed -e 's/\\"/\\&quot;/g' -e 's,$,<br/>,g' -e 's/(c)/\\&#xa9;/g' ${srcdir}/COPYING|tr '\n' ' '`"
AC_SUBST([COPYING])
AC_CONFIG_FILES([
Makefile
install.rdf
- update.rdf
+ update-template.rdf
content/Makefile
content/autoconf.dtd
locale/Makefile
])
AC_OUTPUT
diff --git a/install.rdf.in b/install.rdf.in
index 9a00e0d..8ccdf34 100644
--- a/install.rdf.in
+++ b/install.rdf.in
@@ -4,24 +4,25 @@
<Description about="urn:mozilla:install-manifest">
<em:id>@MOZ_EXT_ID@</em:id>
<em:name>Fireflix</em:name>
<em:version>@VERSION@</em:version>
<em:description>Sidebar flickr management tool</em:description>
<em:creator>Klever Group; http://www.klever.net/</em:creator>
<em:homepageURL>http://kin.klever.net/fireflix/</em:homepageURL>
<em:iconURL>chrome://fireflix/content/icons/32x32/fireflix.png</em:iconURL>
<em:updateURL>http://kin.klever.net/fireflix/update?v=@VERSION@</em:updateURL>
<em:aboutURL>chrome://fireflix/content/about.xul</em:aboutURL>
+ <em:updateKey>MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDc/WnetE1dTmWKY+KzphLYfqrjOc88fK7FaGSnHbwa4lpvt3gt6W0GwiCjUATvXu9zWoDU60VKPVhN0ohIOAnUuvtqSTfxjDBwDcsRXjg7fg4nofmA2mTeZtULYMymSCYZB+w6krmlOpEBpWZl14yf5Jc93Lc3gCZPDvH0xXZl9QIDAQAB</em:updateKey>
<!-- Firefox -->
<em:targetApplication>
<Description>
<em:id>{ec8030f7-c20a-464f-9b0e-13a3a9e97384}</em:id>
<em:minVersion>1.5</em:minVersion>
<em:maxVersion>3.0.*</em:maxVersion>
</Description>
</em:targetApplication>
</Description>
diff --git a/update.rdf.in b/update-template.rdf.in
index aa368a6..4326468 100644
--- a/update.rdf.in
+++ b/update-template.rdf.in
@@ -10,17 +10,18 @@
</RDF:Seq>
</em:updates>
</RDF:Description>
<RDF:Description about="urn:mozilla:extension:@MOZ_EXT_ID@:@VERSION@">
<em:version>@VERSION@</em:version>
<em:targetApplication>
<Description>
<em:id>{ec8030f7-c20a-464f-9b0e-13a3a9e97384}</em:id>
<em:minVersion>1.5</em:minVersion>
<em:maxVersion>2.0.0.*</em:maxVersion>
<em:updateLink>http://kin.klever.net/dist/@PACKAGE@-@VERSION@.xpi</em:updateLink>
+ <em:updateHash>sha1:<!--SHA1--></em:updateHash>
</Description>
</em:targetApplication>
</RDF:Description>
</RDF:RDF>