summaryrefslogtreecommitdiffabout
Unidiff
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
@@ -1,38 +1,41 @@
1SUBDIRS = content locale 1SUBDIRS = content locale
2 2
3xpi_DATA = \ 3xpi_DATA = \
4 install.rdf \ 4 install.rdf \
5 AUTHORS COPYING NEWS 5 AUTHORS COPYING NEWS
6 6
7EXTRA_DIST = NEWS NEWS.xml NEWS.xsl chrome.manifest 7EXTRA_DIST = NEWS NEWS.xml NEWS.xsl chrome.manifest
8 8
9XPI=${PACKAGE}-${VERSION}.xpi 9XPI=${PACKAGE}-${VERSION}.xpi
10 10
11xpi: ${XPI} 11xpi: ${XPI}
12 12
13${XPI}: install 13${XPI}: install
14 test -z "${NO_UPDATE}" || sed -i -e '/em:updateURL/d' ${xpidir}/install.rdf 14 test -z "${NO_UPDATE}" || sed -i -e '/em:update\(URL\|Key\)/d' ${xpidir}/install.rdf
15 cd ${xpichromedir} \ 15 cd ${xpichromedir} \
16 && ${ZIP} -r -m ${PACKAGE}.jar */ 16 && ${ZIP} -r -m ${PACKAGE}.jar */
17 cd ${xpidir} \ 17 cd ${xpidir} \
18 && ${ZIP} -r @abs_builddir@/$@ . 18 && ${ZIP} -r @abs_builddir@/$@ .
19 19
20update.rdf: update-template.rdf ${XPI}
21 sed -e "s/<!--SHA1-->/$$(sha1sum ${XPI}|cut -d\ -f1)/" <$< >$@
22
20install-data-local: ${xpidir}/chrome.manifest 23install-data-local: ${xpidir}/chrome.manifest
21 24
22${xpidir}/chrome.manifest: chrome.manifest Makefile 25${xpidir}/chrome.manifest: chrome.manifest Makefile
23 sed \ 26 sed \
24 -e 's,^content[[:space:]]\+\([^[:space:]]\+\)[[:space:]]\+\([^[:space:]]\+\)$$,content \1 jar:chrome/${PACKAGE}.jar!/\2,' \ 27 -e 's,^content[[:space:]]\+\([^[:space:]]\+\)[[:space:]]\+\([^[:space:]]\+\)$$,content \1 jar:chrome/${PACKAGE}.jar!/\2,' \
25 -e 's,^locale[[:space:]]\+\([^[:space:]]\+\)[[:space:]]\+\([^[:space:]]\+\)[[:space:]]\+\([^[:space:]]\+\)$$,locale \1 \2 jar:chrome/${PACKAGE}.jar!/\3,' \ 28 -e 's,^locale[[:space:]]\+\([^[:space:]]\+\)[[:space:]]\+\([^[:space:]]\+\)[[:space:]]\+\([^[:space:]]\+\)$$,locale \1 \2 jar:chrome/${PACKAGE}.jar!/\3,' \
26 $< >$@ 29 $< >$@
27 30
28clean-local: 31clean-local:
29 rm -rf ${xpidir} ${XPI} 32 rm -rf ${xpidir} ${XPI}
30 33
31all-local: NEWS 34all-local: NEWS
32 35
33NEWS: NEWS.xsl NEWS.xml 36NEWS: NEWS.xsl NEWS.xml
34 ${XSLTPROC} -o $@ NEWS.xsl NEWS.xml 37 ${XSLTPROC} -o $@ NEWS.xsl NEWS.xml
35 38
36mozextptr: ${MOZ_EXT_ID} 39mozextptr: ${MOZ_EXT_ID}
37${MOZ_EXT_ID}: 40${MOZ_EXT_ID}:
38 echo @abs_srcdir@ >$@ 41 echo @abs_srcdir@ >$@
diff --git a/configure.ac b/configure.ac
index 61b9747..6a478db 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,28 +1,28 @@
1AC_INIT([fireflix], [0.0.6.2], [fireflix-bugs@klever.net]) 1AC_INIT([fireflix], [0.0.6.2], [fireflix-bugs@klever.net])
2AC_CONFIG_SRCDIR([install.rdf.in]) 2AC_CONFIG_SRCDIR([install.rdf.in])
3AM_INIT_AUTOMAKE([dist-bzip2]) 3AM_INIT_AUTOMAKE([dist-bzip2])
4AC_SUBST([MOZ_EXT_ID],[{4269f719-86de-4668-b8ad-04752c23a69e}]) 4AC_SUBST([MOZ_EXT_ID],[{4269f719-86de-4668-b8ad-04752c23a69e}])
5 5
6AC_PATH_PROG([ZIP],[zip],[false]) 6AC_PATH_PROG([ZIP],[zip],[false])
7if test "${ZIP}" = "false" ; then 7if test "${ZIP}" = "false" ; then
8 AC_MSG_ERROR([zip is required to produce packaged extension]) 8 AC_MSG_ERROR([zip is required to produce packaged extension])
9fi 9fi
10AC_PATH_PROG([XSLTPROC],[xsltproc],[true]) 10AC_PATH_PROG([XSLTPROC],[xsltproc],[true])
11 11
12AC_SUBST([xpidir],[\${top_builddir}/xpi]) 12AC_SUBST([xpidir],[\${top_builddir}/xpi])
13AC_SUBST([xpichromedir],[\${xpidir}/chrome]) 13AC_SUBST([xpichromedir],[\${xpidir}/chrome])
14AC_SUBST([xpichromecontentdir],[\${xpichromedir}/content]) 14AC_SUBST([xpichromecontentdir],[\${xpichromedir}/content])
15AC_SUBST([xpichromelocaledir],[\${xpichromedir}/locale]) 15AC_SUBST([xpichromelocaledir],[\${xpichromedir}/locale])
16 16
17COPYING="`sed -e 's/\\"/\\&quot;/g' -e 's,$,<br/>,g' -e 's/(c)/\\&#xa9;/g' ${srcdir}/COPYING|tr '\n' ' '`" 17COPYING="`sed -e 's/\\"/\\&quot;/g' -e 's,$,<br/>,g' -e 's/(c)/\\&#xa9;/g' ${srcdir}/COPYING|tr '\n' ' '`"
18AC_SUBST([COPYING]) 18AC_SUBST([COPYING])
19 19
20AC_CONFIG_FILES([ 20AC_CONFIG_FILES([
21 Makefile 21 Makefile
22 install.rdf 22 install.rdf
23 update.rdf 23 update-template.rdf
24 content/Makefile 24 content/Makefile
25 content/autoconf.dtd 25 content/autoconf.dtd
26 locale/Makefile 26 locale/Makefile
27]) 27])
28AC_OUTPUT 28AC_OUTPUT
diff --git a/install.rdf.in b/install.rdf.in
index 9a00e0d..8ccdf34 100644
--- a/install.rdf.in
+++ b/install.rdf.in
@@ -1,28 +1,29 @@
1<?xml version="1.0"?> 1<?xml version="1.0"?>
2<RDF xmlns="http://www.w3.org/1999/02/22-rdf-syntax-ns#" 2<RDF xmlns="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
3 xmlns:em="http://www.mozilla.org/2004/em-rdf#"> 3 xmlns:em="http://www.mozilla.org/2004/em-rdf#">
4 4
5 <Description about="urn:mozilla:install-manifest"> 5 <Description about="urn:mozilla:install-manifest">
6 6
7 <em:id>@MOZ_EXT_ID@</em:id> 7 <em:id>@MOZ_EXT_ID@</em:id>
8 <em:name>Fireflix</em:name> 8 <em:name>Fireflix</em:name>
9 <em:version>@VERSION@</em:version> 9 <em:version>@VERSION@</em:version>
10 <em:description>Sidebar flickr management tool</em:description> 10 <em:description>Sidebar flickr management tool</em:description>
11 <em:creator>Klever Group; http://www.klever.net/</em:creator> 11 <em:creator>Klever Group; http://www.klever.net/</em:creator>
12 <em:homepageURL>http://kin.klever.net/fireflix/</em:homepageURL> 12 <em:homepageURL>http://kin.klever.net/fireflix/</em:homepageURL>
13 <em:iconURL>chrome://fireflix/content/icons/32x32/fireflix.png</em:iconURL> 13 <em:iconURL>chrome://fireflix/content/icons/32x32/fireflix.png</em:iconURL>
14 <em:updateURL>http://kin.klever.net/fireflix/update?v=@VERSION@</em:updateURL> 14 <em:updateURL>http://kin.klever.net/fireflix/update?v=@VERSION@</em:updateURL>
15 <em:aboutURL>chrome://fireflix/content/about.xul</em:aboutURL> 15 <em:aboutURL>chrome://fireflix/content/about.xul</em:aboutURL>
16 <em:updateKey>MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDc/WnetE1dTmWKY+KzphLYfqrjOc88fK7FaGSnHbwa4lpvt3gt6W0GwiCjUATvXu9zWoDU60VKPVhN0ohIOAnUuvtqSTfxjDBwDcsRXjg7fg4nofmA2mTeZtULYMymSCYZB+w6krmlOpEBpWZl14yf5Jc93Lc3gCZPDvH0xXZl9QIDAQAB</em:updateKey>
16 17
17 <!-- Firefox --> 18 <!-- Firefox -->
18 <em:targetApplication> 19 <em:targetApplication>
19 <Description> 20 <Description>
20 <em:id>{ec8030f7-c20a-464f-9b0e-13a3a9e97384}</em:id> 21 <em:id>{ec8030f7-c20a-464f-9b0e-13a3a9e97384}</em:id>
21 <em:minVersion>1.5</em:minVersion> 22 <em:minVersion>1.5</em:minVersion>
22 <em:maxVersion>3.0.*</em:maxVersion> 23 <em:maxVersion>3.0.*</em:maxVersion>
23 </Description> 24 </Description>
24 </em:targetApplication> 25 </em:targetApplication>
25 26
26 </Description> 27 </Description>
27 28
28</RDF> 29</RDF>
diff --git a/update.rdf.in b/update-template.rdf.in
index aa368a6..4326468 100644
--- a/update.rdf.in
+++ b/update-template.rdf.in
@@ -1,26 +1,27 @@
1<?xml version="1.0"?> 1<?xml version="1.0"?>
2<RDF:RDF 2<RDF:RDF
3 xmlns:RDF="http://www.w3.org/1999/02/22-rdf-syntax-ns#" 3 xmlns:RDF="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
4 xmlns:em="http://www.mozilla.org/2004/em-rdf#"> 4 xmlns:em="http://www.mozilla.org/2004/em-rdf#">
5 5
6 <RDF:Description about="urn:mozilla:extension:@MOZ_EXT_ID@"> 6 <RDF:Description about="urn:mozilla:extension:@MOZ_EXT_ID@">
7 <em:updates> 7 <em:updates>
8 <RDF:Seq> 8 <RDF:Seq>
9 <RDF:li resource="urn:mozilla:extension:@MOZ_EXT_ID@:@VERSION@"/> 9 <RDF:li resource="urn:mozilla:extension:@MOZ_EXT_ID@:@VERSION@"/>
10 </RDF:Seq> 10 </RDF:Seq>
11 </em:updates> 11 </em:updates>
12 </RDF:Description> 12 </RDF:Description>
13 13
14 <RDF:Description about="urn:mozilla:extension:@MOZ_EXT_ID@:@VERSION@"> 14 <RDF:Description about="urn:mozilla:extension:@MOZ_EXT_ID@:@VERSION@">
15 <em:version>@VERSION@</em:version> 15 <em:version>@VERSION@</em:version>
16 <em:targetApplication> 16 <em:targetApplication>
17 <Description> 17 <Description>
18 <em:id>{ec8030f7-c20a-464f-9b0e-13a3a9e97384}</em:id> 18 <em:id>{ec8030f7-c20a-464f-9b0e-13a3a9e97384}</em:id>
19 <em:minVersion>1.5</em:minVersion> 19 <em:minVersion>1.5</em:minVersion>
20 <em:maxVersion>2.0.0.*</em:maxVersion> 20 <em:maxVersion>2.0.0.*</em:maxVersion>
21 <em:updateLink>http://kin.klever.net/dist/@PACKAGE@-@VERSION@.xpi</em:updateLink> 21 <em:updateLink>http://kin.klever.net/dist/@PACKAGE@-@VERSION@.xpi</em:updateLink>
22 <em:updateHash>sha1:<!--SHA1--></em:updateHash>
22 </Description> 23 </Description>
23 </em:targetApplication> 24 </em:targetApplication>
24 </RDF:Description> 25 </RDF:Description>
25 26
26</RDF:RDF> 27</RDF:RDF>