[Gnash-commit] /srv/bzr/gnash/trunk r10581: add cygnal.h so it gets in the distfile.

[rob]

------------------------------------------------------------
revno: 10581
committer: address@hidden
branch nick: trunk
timestamp: Sat 2009-02-14 11:10:55 -0700
message:
  add cygnal.h so it gets in the distfile.
  add some documentation on package building.
  Get xpi packages to build again, but using the snapshot-* targets.
modified:
  cygnal/Makefile.am
  packaging/rpm.am
  packaging/snapshot.am
  packaging/xpi.am

=== modified file 'cygnal/Makefile.am'
--- a/cygnal/Makefile.am        2009-01-22 20:10:39 +0000
+++ b/cygnal/Makefile.am        2009-02-14 18:10:55 +0000
@@ -67,6 +67,7 @@
        $(PTHREAD_CFLAGS)
 
 noinst_HEADERS = \
+       cygnal.h \
        crc.h
 
 bin_PROGRAMS = cygnal

=== modified file 'packaging/rpm.am'
--- a/packaging/rpm.am  2009-02-14 16:31:57 +0000
+++ b/packaging/rpm.am  2009-02-14 18:10:55 +0000
@@ -24,12 +24,13 @@
 
 RPMBUILD_FLAGS = --clean --rmsource --rmspec
 
-spec: $(srcdir)/packaging/redhat/gnash.spec
+spec: $(srcdir)/packaging/redhat/gnash.spec 
$(srcdir)/packaging/redhat/klash.spec
        @echo "Editing the version in the spec file ..."
        address@hidden "+%Y%m%d"`; \
        pkgname="gnash-trunk_$${now}"; \
        snapshot_tar="$${pkgname}.tar.gz"; \
-       sed -e "s/Version.*/Version:    trunk_$${now}/" 
$(srcdir)/packaging/redhat/gnash.spec > gnash.spec;
+       sed -e "s/Version.*/Version:    trunk_$${now}/" 
$(srcdir)/packaging/redhat/gnash.spec > gnash.spec; \
+       sed -e "s/Version.*/Version:    trunk_$${now}/" 
$(srcdir)/packaging/redhat/klash.spec > klash.spec;
 
 # Build an Redhat/Fedora .rpm package
 # We do this by using the source snapshot that we know is 'distclean'.
@@ -38,14 +39,21 @@
 # older versions of Fedora used /usr/src/redhat/{SOURCES, BUILD} for
 # everything, but the newer version appears to use one's hone directory
 # instead, so now you don't have to be root to build rpm packages.
-rpm redhat: snapshot spec
+rpm redhat rpm-gnash: snapshot spec
        address@hidden "+%Y%m%d"`; \
        pkgname="gnash-trunk_$${now}"; \
        snapshot_tar="$${pkgname}.tar.gz"; \
        cp $${snapshot_tar} $${HOME}/rpmbuild/SOURCES/
        rpmbuild -ba $(RPMBUILD_FLAGS) gnash.spec
 
+# build klash and the konqueror plugin as a sepaate step.
+rpm-klash: snapshot spec
+       address@hidden "+%Y%m%d"`; \
+       pkgname="gnash-trunk_$${now}"; \
+       snapshot_tar="$${pkgname}.tar.gz"; \
+       cp $${snapshot_tar} $${HOME}/rpmbuild/SOURCES/
+       rpmbuild -ba $(RPMBUILD_FLAGS) klash.spec
 
-.PHONY : rpm redhat
+.PHONY : rpm redhat rpm-klash
 
 

=== modified file 'packaging/snapshot.am'
--- a/packaging/snapshot.am     2009-02-14 16:31:57 +0000
+++ b/packaging/snapshot.am     2009-02-14 18:10:55 +0000
@@ -16,12 +16,15 @@
 # 
 
 NOW = `date "+%Y%m%d"`
+# for snapshots, this should always be something like trunk or head
+# for an official release, it should be unset
+RELEASE = trunk_
 
 # these is the directories where the snapshot gets built. Sources are
 # in the top level, the build goes in a _build subdirectory
-SNAPSHOT_DIR = gnash-trunk_${NOW}
-SNAPSHOT_BUILD = gnash-trunk_${NOW}/_build
-SNAPSHOT_TMP = /tmp/gnash-trunk_$(NOW)
+SNAPSHOT_DIR = gnash-${RELEASE}${NOW}
+SNAPSHOT_BUILD = gnash-${RELEASE}${NOW}/_build
+SNAPSHOT_TMP = /tmp/gnash-${RELEASE}$(NOW)
 
 #
 # build a binary snapshot from of Gnash for systems we don't have
@@ -35,8 +38,8 @@
 # '20080202trunk'
 snapshot: distdir
        address@hidden "+%Y%m%d"`; \
-       pkgname="gnash-trunk_$${now}"; \
-       snapshot_dir="gnash-trunk_$${now}"; \
+       pkgname="gnash-${RELEASE}$${now}"; \
+       snapshot_dir="gnash-${RELEASE}$${now}"; \
        snapshot_tar="$${pkgname}.tar.gz"; \
        if test -d $${snapshot_dir}; then \
          rm -fr $${snapshot_dir}; \
@@ -54,7 +57,7 @@
 
 snapshot-configure: snapshot
        address@hidden "+%Y%m%d"`; \
-       pkgname="gnash-trunk_$${now}"; \
+       pkgname="gnash-${RELEASE}$${now}"; \
        snapshot_dir="$${pkgname}"; \
        snapshot_build="$${snapshot_dir}/_build"; \
        if test ! -d $${snapshot_build}; then \
@@ -78,12 +81,11 @@
 #        --with-extensions=all 
 #        --enable-gui=all 
 
-snapshot-build: snapshot-configure
+snapshot-build: # snapshot-configure
        address@hidden "+%Y%m%d"`; \
-       pkgname="gnash-trunk_$${now}"; \
+       pkgname="gnash-${RELEASE}$${now}"; \
        snapshot_dir="$${pkgname}"; \
        snapshot_build="$${snapshot_dir}/_build"; \
-       $(LN_S) -f $${snapshot_build}/packaging/doc 
$${snapshot_build}/packaging/; \
        $(MAKE) $(AM_MAKEFLAGS) -C $${snapshot_build}; \
        $(MAKE) $(AM_MAKEFLAGS) -C $${snapshot_build}/doc/C info man html
 
@@ -91,18 +93,18 @@
 # DocBook and DocBook2X aren't installed on this machine.
 snapshot-install: #snapshot-build
        now=`date "+%Y%m%d"`; \
-       snapshot_dir="gnash-trunk_$${now}"; \
+       snapshot_dir="gnash-${RELEASE}$${now}"; \
        snapshot_build="$${snapshot_dir}/_build"; \
-       snapshot_dest="/tmp/gnash_trunk_$${now}-tmp"; \
-       $(MAKE) $(AM_MAKEFLAGS) -C $${snapshot_build} install install-plugins 
DESTDIR=$${snapshot_dest}
+       snapshot_tmp="/tmp/gnash_${RELEASE}$${now}-tmp"; \
+       $(MAKE) $(AM_MAKEFLAGS) -C $${snapshot_build} install install-plugins 
DESTDIR=$${snapshot_tmp}
 
 # We only want to bundle an installed gnash, so all the linker paths are
 # correct
-snapshot-bundle: #snapshot-install
+snapshot-bundle: snapshot snapshot-build snapshot-install
        address@hidden "+%Y%m%d"`; \
        pkgname="gnash-trunk_$${now}"; \
-       snapshot_dest="/tmp/$${pkgname}-tmp"; \
-       snapshot_tmp="/tmp/$${pkgname}"; \
+       snapshot_dest="/tmp/$${pkgname}"; \
+       snapshot_tmp="/tmp/$${pkgname}-tmp"; \
        snapshot_tar="$${snapshot_tmp}-$(host_cpu)-$(host_os).tar.gz"; \
        if test ! -d $${snapshot_tmp}; then \
          $(MKINSTALLDIRS) $${snapshot_tmp}; \
@@ -119,7 +121,8 @@
        strip $${snapshot_tmp}/bin/*-gnash; \
        strip $${snapshot_tmp}/bin/gprocessor; \
        strip $${snapshot_tmp}/bin/dumpshm; \
-       strip $${snapshot_tmp}/bin/soldumper; \
+       strip $${snapshot_tmp}/bin/flvdumper; \
+       strip $${snapshot_tmp}/bin/rtmpget; \
        tar zcvCf /tmp $${snapshot_tar} $${pkgname}
 
 

=== modified file 'packaging/xpi.am'
--- a/packaging/xpi.am  2008-10-07 07:05:35 +0000
+++ b/packaging/xpi.am  2009-02-14 18:10:55 +0000
@@ -19,58 +19,60 @@
 # 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/gnash-$(BUILDDATE)
-
-# this is where we build the bundle that goes in the xpi file
-XPI_BUNDLE=/tmp/gnash-$(BUILDDATE)-bundle
-
-# this is where the gnash gets compiled
-XPI_BUILD=gnash-${VERSION}
-
-# These are the options we want to use to build the standalone
-# gnash player to ship within the .xpi
-CONFIG_OPTS = \
-       --disable-kparts \
-    --disable-testsuite \
-       --enable-gui=gtk \
-    --enable-xpcom \
-       --with-npapi-plugindir=/tmp/plugin
-
-xpi xpi-bundle:
-       rm -rf $(XPI_BUILD) # extract the tarball.
-       tar jxf $(XPI_BUILD).tar.bz2
-
-       (cd $(XPI_BUILD); ./configure $(CONFIG_OPTS) --disable-shared 
--enable-static) # configure for standalone player.
-
-       $(MAKE) -C $(XPI_BUILD) all # build and install in temp
-       $(MAKE) -C $(XPI_BUILD) install DESTDIR=$(XPI_TMP)
-
-       (cd $(XPI_BUILD); ./configure $(CONFIG_OPTS) --disable-static 
--enable-shared) # configure for plugin.
-       $(MAKE) -C $(XPI_BUILD)/plugin clean all CXXFLAGS=-DGNASH_XPI_PLUGIN # 
build and get the plugin
-       $(MAKE) -C $(XPI_BUILD) install-plugin DESTDIR=$(XPI_TMP)
-       $(MAKE) -C $(XPI_BUILD)/plugin/xpcom install-pkglib DESTDIR=$(XPI_TMP)
-
-       if ! test -d $(XPI_BUNDLE)/ ; then \
-         mkdir $(XPI_BUNDLE); \
+# building an xpi is similar to building a binary snapshot, the main difference
+# being how it gets configured, and how the bundle of the package gets made.
+# for an xpi package, we have to configure with --enable-xpcom, which the 
plugin
+# uses to find the directory where Gnash lives.
+
+# build the xpi package
+xpi-bundle: # snapshot
+       address@hidden "+%Y%m%d"`; \
+       pkgname="gnash-${RELEASE}$${now}"; \
+       snapshot_dir="gnash-${RELEASE}$${now}"; \
+       snapshot_build="$${snapshot_dir}/_build"; \
+       snapshot_dest="/tmp/gnash_${RELEASE}$${now}"; \
+       snapshot_tmp="/tmp/gnash_${RELEASE}$${now}-tmp"; \
+       if ! test -d $${snapshot_dest}/ ; then \
+         mkdir $${snapshot_dest}; \
         else \
-          rm -rf $(XPI_BUNDLE)/*; \
-       fi
-       topdir=`cd ${top_srcdir}; pwd`; \
+          rm -rf $${snapshot_dest}/*; \
+       fi; \
        for i in install.rdf; do \
-         cp -fr $${topdir}/packaging/xpi/$$i $(XPI_BUNDLE)/; \
-       done;
-       mkdir -p $(XPI_BUNDLE)/plugins
-       cp -fr $(XPI_TMP)$(bindir)/*gnash $(XPI_BUNDLE)/plugins
-       strip $(XPI_BUNDLE)/plugins/gtk-gnash
-       cp -fr $(XPI_TMP)$(localedir) $(XPI_BUNDLE)/
-       cp -fr $(XPI_TMP)/tmp/plugin/libgnashplugin.so $(XPI_BUNDLE)/plugins
-       cp -fr $(XPI_TMP)/tmp/plugin/extensions/*.xpt $(XPI_BUNDLE)/plugins
-       cp -fr $(XPI_TMP)/tmp/plugin/extensions/*.so $(XPI_BUNDLE)/plugins
-       (cd $(XPI_BUNDLE) ; $(ZIP) -r /tmp/gnash-$(VERSION).xpi *)
+         cp -fr $(srcdir)/packaging/xpi/$$i $${snapshot_tmp}; \
+       done; \
+       mkdir -p $${snapshot_dest}/plugins; \
+       cp -fr $${snapshot_dest}/$(bindir)/*gnash $${snapshot_tmp}/plugins; \
+       strip $${snapshot_dest}/plugins/gtk-gnash; \
+       cp -fr $${snapshot_dest}$(localedir) $${snapshot_tmp}/; \
+       cp -fr $${snapshot_dest}/tmp/plugin/libgnashplugin.so 
$${snapshot_tmp}/plugins; \
+       cp -fr $${snapshot_dest}/tmp/plugin/extensions/*.xpt 
$${snapshot_tmp}/plugins; \
+       cp -fr $${snapshot_dest}/tmp/plugin/extensions/*.so 
$${snapshot_tmp}/plugins; \
+       (cd $${snapshot_tmp}; $(ZIP) -r /tmp/gnash-$${snapshot_dir}.xpi *)
+
+xpi-configure: # snapshot
+       address@hidden "+%Y%m%d"`; \
+       pkgname="gnash-${RELEASE}$${now}"; \
+       snapshot_dir="$${pkgname}"; \
+       snapshot_build="$${snapshot_dir}/_build"; \
+       if test ! -d $${snapshot_build}; then \
+         $(MKINSTALLDIRS) $${snapshot_build}; \
+       fi; \
+       cd $${snapshot_build}; ../configure \
+         --disable-dependency-tracking \
+         --disable-rpath \
+         --disable-testsuite \
+         --enable-xpcom \
+         --enable-media=ffmpeg \
+         --enable-jemalloc \
+         --enable-gui=gtk \
+         --prefix=/usr \
+         --mandir=/usr/share/man \
+         --infodir=/usr/share/info \
+         --with-npapi-plugindir=/usr/lib/mozilla/plugins
+
+xpi: snapshot xpi-configure snapshot-build snapshot-install
 
 xpi-clean:
-       rm -fr xpi-* $(XPI_BUILD) $(XPI_TMP) gnash-$(VERSION)*.xpi
+       rm -fr xpi-* gnash-$(RELEASE)*.xpi
 
-.PHONY : xpi xpi-bundle
+.PHONY : xpi xpi-bundle xpi-configure