[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gnash-commit] /srv/bzr/gnash/trunk r9574: update from branch, XPI packa
|
From: |
rob |
|
Subject: |
[Gnash-commit] /srv/bzr/gnash/trunk r9574: update from branch, XPI packaging now works. |
|
Date: |
Sun, 10 Aug 2008 08:47:17 -0600 |
|
User-agent: |
Bazaar (1.5) |
------------------------------------------------------------
revno: 9574
committer: address@hidden
branch nick: trunk
timestamp: Sun 2008-08-10 08:47:17 -0600
message:
update from branch, XPI packaging now works.
added:
packaging/xpi/update.rdf
modified:
configure.ac
packaging/xpi.am
packaging/xpi/install.rdf
------------------------------------------------------------
revno: 9568.1.7
committer: address@hidden
branch nick: build
timestamp: Sat 2008-08-09 21:45:25 -0600
message:
Substitute BUILDDATE. Look for the zip program, which we need for making
XPI packages.
modified:
configure.ac
------------------------------------------------------------
revno: 9568.1.8
committer: address@hidden
branch nick: build
timestamp: Sat 2008-08-09 21:46:02 -0600
message:
Build an XPI file that actually installs.
added:
packaging/xpi/update.rdf
modified:
packaging/xpi.am
packaging/xpi/install.rdf
=== modified file 'configure.ac'
--- a/configure.ac 2008-08-07 10:02:35 +0000
+++ b/configure.ac 2008-08-10 03:45:25 +0000
@@ -166,6 +166,7 @@
dnl Get build date for helping us debugging
BUILDDATE="`date +%Y%m%d`"
+AC_SUBST(BUILDDATE)
dnl These are required by automake
dnl AM_INIT_AUTOMAKE(gnash, "trunk$BUILDDATE")
@@ -1198,6 +1199,10 @@
dnl PLUGIN RELATED STUFF
dnl -----------------------------------------------------------------
+dnl Zip is used insted of tar when building an xpi package
+dnl for Mozilla/Firefox.
+AC_PATH_PROG(ZIP, zip, ,[${pathlist}])
+
dnl !! This has been moved here to make --enable-npapi work
dnl !! All of plugin-related macro calls could be moved into
dnl !! a specialized macros/plugin.m4
=== modified file 'packaging/xpi.am'
--- a/packaging/xpi.am 2008-06-07 13:14:18 +0000
+++ b/packaging/xpi.am 2008-08-10 03:46:02 +0000
@@ -16,21 +16,24 @@
#
#
-# Build a Debian Familiar .ipk GNU/Linux package. These are always
-# cross compiled, typically for the ARM or XScale.
+# Build a Firefox XPI package
#
# this is where the output of "make install" goes, which is what
# we use to build the package.
-XPI_TMP=/tmp/$(host_alias)-gnash
+XPI_TMP=/tmp/gnash-$(BUILDDATE)
# this is where we build the bundle that goes in the xpi file
-XPI_BUNDLE=$(XPI_TMP)/bundle
+XPI_BUNDLE=/tmp/gnash-$(BUILDDATE)-bundle
# this is where the gnash gets compiled
XPI_BUILD=gnash-${VERSION}
-xpi-unpack: $(top_builddir)/config.status
+CONFIG_OPTS = $(DISTCHECK_CONFIGURE_FLAGS) \
+ --disable-kparts \
+ --enable-gui=gtk
+
+xpi-unpack: Makefile #$(top_builddir)/config.status
address@hidden -f xpi-* # nuke everything, we're starting over
address@hidden -f xpi-unpack
rm -rf $(XPI_BUILD)
@@ -39,38 +42,34 @@
xpi-configure: xpi-unpack $(XPI_BUILD)
address@hidden -f ipkg-configure
- cd $(XPI_BUILD); ./configure \
- --disable-kparts --enable-gui=gtk \
- --with-plugins-install=system
- @touch xpi-configure
+ cd $(XPI_BUILD); ./configure $(CONFIG_OPTS) --disable-shared
--enable-static
+ @touch xpi-configure
-xpi-build: xpi-configure
+xpi-build: #xpi-configure
address@hidden -f xpi-build
$(MAKE) -C $(XPI_BUILD) all
+ $(MAKE) -C $(XPI_BUILD) install DESTDIR=$(XPI_TMP)
@touch xpi-build
-xpi-install: xpi-build Makefile
- address@hidden -f xpi-install
- $(MAKE) -C $(XPI_BUILD) install install-plugin DESTDIR=$(XPI_TMP)
- @touch xpi-install
-
-xpi-depend:
- address@hidden -f xpi-depend
- @touch xpi-depend
-
-xpi xpi-bundle: xpi-install # xpi-depend
- if ! test -d $(XPI_TMP)/plugins ; then \
- mkdir $(XPI_TMP)/plugins; \
+xpi-plugin:
+ cd $(XPI_BUILD); ./configure $(CONFIG_OPTS) --disable-static
--enable-shared
+ $(MAKE) -C $(XPI_BUILD)/plugin clean all
+ $(MAKE) -C $(XPI_BUILD) install-plugin DESTDIR=$(XPI_TMP)
+
+xpi xpi-bundle: # xpi-build xpi-plugin
+ if ! test -d $(XPI_BUNDLE)/ ; then \
+ mkdir $(XPI_BUNDLE); \
fi
topdir=`cd ${top_srcdir}; pwd`; \
for i in install.rdf; do \
- cp -f $${topdir}/packaging/xpi/$$i $(XPI_BUNDLE)/; \
- done; \
- xpi-build $(XPI_TMP)
+ cp -fr $${topdir}/packaging/xpi/$$i $(XPI_BUNDLE)/; \
+ done;
+ cp -fr $(XPI_TMP)/usr/local/bin/*gnash $(XPI_BUNDLE)/
+ cp -fr $(XPI_TMP)/usr/local/share/locale $(XPI_BUNDLE)/
+ cp -fr $(XPI_TMP)/usr/local/npapi/libgnashplugin.so $(XPI_BUNDLE)/
+ (cd $(XPI_BUNDLE) ; $(ZIP) -r /tmp/gnash.xpi *)
xpi-clean:
- rm -fr xpi-* $(XPI_BUILD) $(XPI_TMP) gnash*$(VERSION)*.ipk
+ rm -fr xpi-* $(XPI_BUILD) $(XPI_TMP) gnash-$(VERSION)*.xpi
.PHONY : xpi xpi-bundle
-
-
=== modified file 'packaging/xpi/install.rdf'
--- a/packaging/xpi/install.rdf 2008-06-07 13:14:18 +0000
+++ b/packaging/xpi/install.rdf 2008-08-10 03:46:02 +0000
@@ -1,17 +1,72 @@
<?xml version="1.0"?>
<RDF xmlns="http://www.w3.org/1999/02/22-rdf-syntax-ns#";
- xmlns:em="http://www.mozilla.org/2004/em-rdf#";>
- <Description about="urn:mozilla:install-manifest">
- <!-- properties -->
- <em:name>Gnash</em:name>
- <em:id>address@hidden</em:id>
- <em:version>0.8.3</em:version>
- <em:type>2</em:type>
- <em:updateURL>http://www.gnashdev.org/updates</em:updateURL>
- <em:homepageURL>http://www.gnu.org/software/gnash</em:homepageURL>
- <em:description>GNU swf file player</em:description>
- <em:creator>Gnash Team</em:creator>
- </Description>
+ xmlns:em="http://www.mozilla.org/2004/em-rdf#";>
+
+ <Description about="urn:mozilla:install-manifest">
+
+ <em:id>address@hidden</em:id>
+ <em:version>0.8.3</em:version>
+
+ <!-- Target Application this extension can install into,
+ with minimum and maximum supported versions. -->
+
+ <!-- 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>
+
+ <!-- SeaMonkey -->
+ <em:targetApplication>
+ <Description>
+ <em:id>{92650c4d-4b8e-4d2a-b7eb-24ecf4f6b63a}</em:id>
+ <em:minVersion>1.0</em:minVersion>
+ <em:maxVersion>2.0a1</em:maxVersion>
+ </Description>
+ </em:targetApplication>
+
+ <!-- Flock -->
+ <em:targetApplication>
+ <Description>
+ <em:id>{a463f10c-3994-11da-9945-000d60ca027b}</em:id>
+ <em:minVersion>0.5</em:minVersion>
+ <em:maxVersion>1.0+</em:maxVersion>
+ </Description>
+ </em:targetApplication>
+
+ <!-- Songbird -->
+ <em:targetApplication>
+ <Description>
+ <em:id>address@hidden</em:id>
+ <em:minVersion>0.5</em:minVersion>
+ <em:maxVersion>0.6.*</em:maxVersion>
+ </Description>
+ </em:targetApplication>
+
+ <!-- Midbrowser -->
+ <em:targetApplication>
+ <Description>
+ <em:id>{aa5ca914-c309-495d-91cf-3141bbb04115}</em:id>
+ <em:minVersion>0.2</em:minVersion>
+ <em:maxVersion>0.3</em:maxVersion>
+ </Description>
+ </em:targetApplication>
+
+ <!-- Front End MetaData -->
+ <em:name>Gnash</em:name>
+ <em:description>The GNU Flash player</em:description>
+ <em:creator>Gnash Team</em:creator>
+ <em:homepageURL>http://adblockplus.org/</em:homepageURL>
+
+ <!-- Front End Integration Hooks (used by Extension Manager)-->
+<!--
<em:updateURL>"http://www.getgnash.org/updates/update.rdf";</em:updateURL> -->
+ <em:homepageURL>"http://www.gnu.org/software/gnash";<em:homepageURL>
+ <em:targetPlatform>Linux_x86-gcc3</em:targetPlatform>
+
+ </Description>
</RDF>
=== added file 'packaging/xpi/update.rdf'
--- a/packaging/xpi/update.rdf 1970-01-01 00:00:00 +0000
+++ b/packaging/xpi/update.rdf 2008-08-10 03:46:02 +0000
@@ -0,0 +1,27 @@
+<?xml version="1.0"?>
+<r:RDF xmlns:r="http://www.w3.org/1999/02/22-rdf-syntax-ns#";
+ xmlns="http://www.mozilla.org/2004/em-rdf#";>
+<!-- Foo Widget Extension -->
+<r:Description about="urn:mozilla:extension:
+{b4fb60db-ac1c-4c10-b0f6-39b0b0f56ea5}">
+ <updates>
+ <r:Seq>
+ <r:li>
+ <r:Description>
+ <version>0.8.3</version>
+ <targetApplication>
+ <r:Description>
+ <id>{ec8030f7-c20a-464f-9b0e-13a3a9e97384}</id>
+ <minVersion>0.8</minVersion>
+ <maxVersion>1.9</maxVersion>
+
<updateLink>http://www.getgnash.org/updates/gnash.xpi</updateLink>
+ </r:Description>
+ </targetApplication>
+ </r:Description>
+ </r:li>
+ </r:Seq>
+ </updates>
+ <version>0.8.3</version>
+ <updateLink>http://www.getgnash.org/updates/getgnash.xpi</updateLink>
+</r:Description>
+</r:RDF>
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Gnash-commit] /srv/bzr/gnash/trunk r9574: update from branch, XPI packaging now works.,
rob <=