[Gnash-commit] [SCM] Gnash branch, master, updated. release_0_8_9_start-454-g0285d4f

[Bastiaan Jacques]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Gnash".

The branch, master has been updated
       via  0285d4f453742d5bf4fbb29e343a4ff3cef57d56 (commit)
       via  a0fa776adf3c583fe0bc339a04e26e0ee112d86f (commit)
       via  868df7495734818ce3c0c1aedb0dc838f6684f2f (commit)
      from  c7d1deae6e1234830584027efc16c12679afc398 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://git.savannah.gnu.org/cgit//commit/?id=0285d4f453742d5bf4fbb29e343a4ff3cef57d56


commit 0285d4f453742d5bf4fbb29e343a4ff3cef57d56
Author: Bastiaan Jacques <address@hidden>
Date:   Thu Mar 31 15:16:01 2011 +0200

    --with-cpu isn't used for anything, and you have to specify --host and 
--sysroot to get a cross build anyway.

diff --git a/configure.ac b/configure.ac
index 7ec8f19..edcd618 100644
--- a/configure.ac
+++ b/configure.ac
@@ -279,17 +279,6 @@ fi
 AC_SUBST(ANDROID_NDK)
 AM_CONDITIONAL(ANDROID, [ test x"${android_ndk}" != xno ])
 
-AC_ARG_WITH(cpu,
-  AC_HELP_STRING([--with-cpu],[specify a cpu when cross compiling.]),
-  [case "${withval}" in
-    geode) with_cpu=geode ;;
-    *)   AC_MSG_ERROR([bad value ${enableval} for --with-cpu option]) ;;
-   esac],with_cpu=none)
-
-if test x"$with_cpu" != x"none"; then
-   cross_compiling=yes
-fi
-
 AC_C_BIGENDIAN
 AC_C_CONST
 AC_C_INLINE

http://git.savannah.gnu.org/cgit//commit/?id=a0fa776adf3c583fe0bc339a04e26e0ee112d86f


commit a0fa776adf3c583fe0bc339a04e26e0ee112d86f
Author: Bastiaan Jacques <address@hidden>
Date:   Thu Mar 31 14:55:50 2011 +0200

    Drop XPI packaging code which is no longer usable.

diff --git a/Makefile.am b/Makefile.am
index f912c95..327b85d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -186,11 +186,6 @@ include $(srcdir)/packaging/alp.am
 #
 include $(srcdir)/packaging/bsd.am
 
-#
-# Mozille/Firefox XPI support
-#
-include $(srcdir)/packaging/xpi.am
-
 mudflap:
        @echo "Rebuilding with GCC Mudflap support"
        $(MAKE) CXXFLAGS="$(CXXFLAGS) -fmudflapth" LDFLAGS="$(LDFLAGS) 
-lmudflapth"
diff --git a/packaging/xpi.am b/packaging/xpi.am
deleted file mode 100644
index 72c3d42..0000000
--- a/packaging/xpi.am
+++ /dev/null
@@ -1,99 +0,0 @@
-# 
-#   Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, 
Inc.
-# 
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License, or
-# (at your option) any later version.
-# 
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-# 
-
-#
-# Build a Firefox XPI package
-#
-
-# 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.
-
-CONFIG_OPTS = \
-       -disable-dependency-tracking \
-       --disable-rpath \
-       --disable-cygnal \
-       --disable-testsuite \
-       --enable-xpcom \
-       --enable-media=ffmpeg \
-       --enable-gui=gtk \
-       --prefix=/usr \
-       --mandir=/usr/share/man \
-       --infodir=/usr/share/info \
-       --with-npapi-plugindir=/usr/lib/mozilla/plugins
-
-# Do the entire process to build an xpi package
-xpi: snapshot-src xpi-configure xpi-build xpi-install xpi-bundle
-
-# just use the default snapshot build process
-xpi-build: snapshot-build
-# just use the default snapshot installation process
-xpi-install: snapshot-install
-
-# configure the xpi build. snapshot needs to have been run already. If you 
wish the
-# automatic dependency checking, use the 'xpi' target instead, as this is 
meant only
-# to be called directly when debugging package building. We statically link the
-# executable so the executables don't have to find any of the gnash libraries 
at
-# runtime. This way you can have multiple versions of Gnash installed, and 
they all
-# use the appropriate libraries for each build.
-xpi-configure: force
-       snapshot_build="$(SNAPSHOT_BUILD)"; \
-       if test ! -d $${snapshot_build}; then \
-         $(MKINSTALLDIRS) $${snapshot_build}; \
-       fi; \
-       (cd $${snapshot_build}; ../configure \
-         --enable-static \
-         --disable-shared \
-         $(CONFIG_OPTS));
-       -cp revno.h $(SNAPSHOT_BUILD)
-
-# build the xpi package bundle. snapshot-build and snapshot-install need to
-# have been run already. If you wish the automatic dependency checking, use
-# the 'xpi' target instead, as this is meant only to be called directly when
-# debugging package building.
-# This gets a little messy as we build the executable statically linked so we
-# don't have to do something uglier to find dynamically linked libraries, plus
-# this way the xpi installed libs won't conflict with andy package installed 
libs.
-# Anyway, so after installing the statically linked gnash into the bundle, we 
then
-# have to reconfigure to enable shared libraries to be built, and then rebuild
-# the plugins and the xpcom support as dynamically loadable modules.
-xpi-bundle:  force
-       snapshot_dest="/tmp/$(SNAPSHOT_NAME)"; \
-       snapshot_dir="/tmp/$(SNAPSHOT_DIR)"; \
-       snapshot_xpi="/tmp/$(SNAPSHOT_NAME)-tmp"; \
-       mkdir -p $${snapshot_xpi}/plugins; \
-       for i in install.rdf; do \
-         cp -fr $(srcdir)/packaging/xpi/$$i $${snapshot_xpi}; \
-       done; \
-       strip  $${snapshot_dest}/usr/bin/gtk-gnash; \
-       cd $(SNAPSHOT_BUILD); ../configure --disable-static --enable-shared 
$(CONFIG_OPTS); \
-       $(MAKE) $(AM_MAKEFLAGS) -C plugin clean all install-plugin 
DESTDIR=$${snapshot_dest}; \
-       $(MAKE) $(AM_MAKEFLAGS) -C plugin/xpcom all install-pkglib 
DESTDIR=$${snapshot_dest}; \
-       cp -fr $${snapshot_dest}/usr/lib/mozilla/plugins/libgnashplugin.so 
$${snapshot_xpi}/plugins; \
-       cp -fr $${snapshot_dest}/usr/lib/mozilla/plugins/extensions/*.xpt 
$${snapshot_xpi}/plugins; \
-       cp -fr $${snapshot_dest}/usr/lib/mozilla/plugins/extensions/*.so 
$${snapshot_xpi}/plugins; \
-       cp -fr $${snapshot_dest}/usr/bin/gtk-gnash $${snapshot_xpi}; \
-       (cd $${snapshot_xpi}; $(ZIP) -r $${snapshot_dir}.xpi *);
-
-# remove files left from package building
-xpi-clean:  force
-       rm -fr xpi-* gnash-$(RELEASE)*.xpi
-
-.PHONY : xpi xpi-bundle xpi-configure xpi-install xpi-build snapshot-src
-
-force:
\ No newline at end of file

http://git.savannah.gnu.org/cgit//commit/?id=868df7495734818ce3c0c1aedb0dc838f6684f2f


commit 868df7495734818ce3c0c1aedb0dc838f6684f2f
Author: Bastiaan Jacques <address@hidden>
Date:   Thu Mar 31 14:38:23 2011 +0200

    We don't use zip anymore, so don't bother looking for it.

diff --git a/configure.ac b/configure.ac
index f31d54d..7ec8f19 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1782,10 +1782,6 @@ dnl 
-----------------------------------------------------------------
 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

-----------------------------------------------------------------------

Summary of changes:
 Makefile.am      |    5 ---
 configure.ac     |   15 --------
 packaging/xpi.am |   99 ------------------------------------------------------
 3 files changed, 0 insertions(+), 119 deletions(-)
 delete mode 100644 packaging/xpi.am


hooks/post-receive
-- 
Gnash