gnash-commit
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Gnash-commit] gnash Makefile.am ChangeLog packaging/ipkg/Gnas...


From: Rob Savoye
Subject: [Gnash-commit] gnash Makefile.am ChangeLog packaging/ipkg/Gnas...
Date: Thu, 07 Feb 2008 03:20:46 +0000

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Rob Savoye <rsavoye>    08/02/07 03:20:46

Modified files:
        .              : Makefile.am ChangeLog 
        packaging/ipkg : Gnash.desktop 
Added files:
        packaging      : alp.am bsd.am deb.am ipkg.am rpm.am snapshot.am 

Log message:
                * packaging/snapshot.am, alp.am, bsd.am, deb.am, ipkg.am, 
rpm.am:
                Makefile fragments moved out of the top level where it was 
getting
                too clutters with install abd packaging targets.
                * Makefile.am: Move all the packaging support to the .am files
                packaging. Include packaging in EXTRA_DIST.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/Makefile.am?cvsroot=gnash&r1=1.101&r2=1.102
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.5580&r2=1.5581
http://cvs.savannah.gnu.org/viewcvs/gnash/packaging/alp.am?cvsroot=gnash&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/gnash/packaging/bsd.am?cvsroot=gnash&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/gnash/packaging/deb.am?cvsroot=gnash&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/gnash/packaging/ipkg.am?cvsroot=gnash&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/gnash/packaging/rpm.am?cvsroot=gnash&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/gnash/packaging/snapshot.am?cvsroot=gnash&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/gnash/packaging/ipkg/Gnash.desktop?cvsroot=gnash&r1=1.1&r2=1.2

Patches:
Index: Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/Makefile.am,v
retrieving revision 1.101
retrieving revision 1.102
diff -u -b -r1.101 -r1.102
--- Makefile.am 17 Jan 2008 00:18:50 -0000      1.101
+++ Makefile.am 7 Feb 2008 03:20:44 -0000       1.102
@@ -1,5 +1,5 @@
 # 
-#   Copyright (C) 2005, 2006, 2007 Free Software Foundation, Inc.
+#   Copyright (C) 2005, 2006, 2007, 2008 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
@@ -15,8 +15,6 @@
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 # 
 
-# $Id: Makefile.am,v 1.101 2008/01/17 00:18:50 rsavoye Exp $
-
 ## Process this file with automake to produce Makefile.in
 AUTOMAKE_OPTIONS = 1.6.0
 ACLOCAL_AMFLAGS = -I macros
@@ -76,114 +74,43 @@
 
 DIST_SUBDIRS = $(STD_DIRS) cygnal doc extensions
 
-EXTRA_DIST = config.rpath $(man_MANS) macros/incllist macros/libslist 
ChangeLog-0.8.0 ChangeLog-0.8.1
+EXTRA_DIST =  autogen.sh \
+       packaging \
+       config.rpath \
+       $(man_MANS) \
+       macros/incllist macros/libslist \
+       ChangeLog-0.8.0 ChangeLog-0.8.1
 
 noinst_HEADERS = compatibility_include.h
 
-# # Build an RPM package targeted to the OLPC http://www.laptop.org.
-# olpc: dist-gzip $(srcdir)/packaging/redhat/gnash.spec
-#      cp -f $(srcdir)/packaging/redhat/gnash.spec /usr/src/redhat/SPECS/
-#      cp -f gnash-$(VERSION).tar.gz /usr/src/redhat/SOURCES/
-#      rpmbuild -rcfile=$(srcdir)/packaging/redhat/rpmrc:/usr/lib/rpm/rpmrc \
-#               -ba --target=geode-olpc /usr/src/redhat/SPECS/gnash.spec
-
-# Build an Redhat/Fedora .rpm package
-rpm redhat: dist-gzip $(srcdir)/packaging/redhat/gnash.spec
-       cp -f $(srcdir)/packaging/redhat/gnash.spec /usr/src/redhat/SPECS/
-       cp -f gnash-$(VERSION).tar.gz /usr/src/redhat/SOURCES/
-       rpmbuild -ba /usr/src/redhat/SPECS/gnash.spec
+#
+# Build an RPM package
+#
+include $(srcdir)/packaging/rpm.am
 
 # Build a Debian/Ubuntu .deb GNU/Linux package
-deb debian: dist-bzip2 $(srcdir)/packaging/debian/rules
-       rm -rf gnash-${VERSION}
-       tar jxf gnash-${VERSION}.tar.bz2
-       cp -fr $(srcdir)/packaging/debian gnash-${VERSION}/
-       (cd gnash-${VERSION}; dpkg-buildpackage)
+include $(srcdir)/packaging/deb.am
 
 #
 # Build a Debian Familiar .ipk GNU/Linux package. These are always
 # cross compiled, typically for the ARM or XScale.
 #
+include $(srcdir)/packaging/ipkg.am
 
-# this is where the output of "make install" goes, which is what
-# we use to build the package.
-IPKG_TMP=/tmp/$(host_alias)-gnash
-
-# this is where the gnash gets compiled
-IPKG_BUILD=gnash-${VERSION}
-
-CLEANFILES = ipkg-*
-
-ipkg-configure: ipkg-unpack $(IPKG_BUILD)
-       address@hidden -f ipkg-configure
-       cd $(IPKG_BUILD); ./configure --host=$(host_alias) \
-         --build=$(build_triplet) --prefix=/usr \
-         --mandir=/usr/share/man \
-         --infodir=/usr/share/info \
-         --with-plugindir=/usr/lib/mozilla/plugins \
-         --enable-static --disable-shared --disable-kparts \
-         --enable-gui=qtopia --enable-media=none
-       @touch ipkg-configure
-
-ipkg-unpack: $(top_builddir)/config.status
-       address@hidden -f ipkg-*                # nuke everything, we're 
starting over
-       address@hidden -f ipkg-unpack
-       rm -rf $(IPKG_BUILD)
-       tar jxf $(IPKG_BUILD).tar.bz2
-       @touch ipkg-unpack
-
-ipkg-build: ipkg-configure
-       address@hidden -f ipkg-build
-       $(MAKE) -C $(IPKG_BUILD) all
-       @touch ipkg-build
-
-ipkg-install: ipkg-build Makefile
-       address@hidden -f ipkg-install
-       $(MAKE) -C $(IPKG_BUILD) install DESTDIR=$(IPKG_TMP)
-       @touch ipkg-install
-
-ipkg-depend: 
-       address@hidden -f ipkg-depend
-       rsync -avc $(libdir)/libcurl* $(IPKG_TMP)/usr/lib
-       rsync -avc $(libdir)/libagg* $(IPKG_TMP)/usr/lib
-       rsync -avc $(libdir)/libboost_thread* $(IPKG_TMP)/usr/lib
-       rsync -avc $(libdir)/libboost_serialization* $(IPKG_TMP)/usr/lib
-       @touch ipkg-depend
-
-ipk ipkg ipkg-bundle: ipkg-install # ipkg-depend
-       if ! test -d $(IPKG_TMP)/CONTROL ; then \
-         mkdir $(IPKG_TMP)/CONTROL; \
-       fi
-       topdir=`cd ${top_srcdir}; pwd`; \
-       for i in control postinst; do \
-         cp -f $${topdir}/packaging/ipkg/$$i $(IPKG_TMP)/CONTROL; \
-       done; \
-       for i in rules Gnash.desktop; do \
-         cp -f $${topdir}/packaging/ipkg/$$i $(IPKG_TMP)/ ; \
-       done;
-       ipkg-build $(IPKG_TMP)
-
-ipkg-clean:
-       rm -fr ipkg-* $(IPKG_BUILD) $(IPKG_TMP) gnash*$(VERSION)*.ipk
-
-#
-# OpenBSD package building
-#
-
-bsd-pkg:
-       $(MAKE) checksum
-       $(MAKE) extract
-       $(MAKE) build
-       $(MAKE) fake
-       $(MAKE) plist
-       $(MAKE) package
-
-# build a snapshot
-snapshot: distdir
-       now=`date -u "+%Y%m%d"`; \
-       mv gnash-${VERSION} gnash-$${now}; \
-       tardir=gnash-$${now} && $(am__tar) | bzip2 -9 -c > 
gnash-$${now}.tar.bz2; \
-       $(RM) -fr gnash-$${now}
+#
+# Access Linux Platform support.
+#
+include $(srcdir)/packaging/alp.am
+
+#
+# BSD package building
+#
+include $(srcdir)/packaging/bsd.am
+
+#
+# Binary tarball packaging
+#
+include $(srcdir)/packaging/snapshot.am
 
 mudflap:
        @echo "Rebuilding with GCC Mudflap support"
@@ -392,7 +319,15 @@
 anal testreport checksum:
        $(srcdir)/testsuite/anaylse-results.sh
 
-.PHONY : dumpconfig anal testreport checksum check mudflap mudflap-check 
snapshot deb debian rpm redhat ipkg ipk ipkg-bundle alp alp-bundle alp-ip 
install-plugins install-plugin
+.PHONY : dumpconfig \
+       anal \
+       testreport \
+       checksum \
+       check \
+       mudflap \
+       mudflap-check \
+       install-plugins \
+       install-plugin
 
 install-plugins install-plugin:
        $(MAKE) -C plugin $@

Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.5580
retrieving revision 1.5581
diff -u -b -r1.5580 -r1.5581
--- ChangeLog   7 Feb 2008 02:43:56 -0000       1.5580
+++ ChangeLog   7 Feb 2008 03:20:44 -0000       1.5581
@@ -1,5 +1,11 @@
 2008-02-06  Rob Savoye  <address@hidden>
 
+       * packaging/snapshot.am, alp.am, bsd.am, deb.am, ipkg.am, rpm.am:
+       Makefile fragments moved out of the top level where it was getting
+       too clutters with install abd packaging targets.
+       * Makefile.am: Move all the packaging support to the .am files
+       packaging. Include packaging in EXTRA_DIST.
+
        * packaging/install-gnash.sh: Install script for installting
        binary tarballs.
        * extensions/launcher: New extension for launching application

Index: packaging/ipkg/Gnash.desktop
===================================================================
RCS file: /sources/gnash/gnash/packaging/ipkg/Gnash.desktop,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- packaging/ipkg/Gnash.desktop        3 Dec 2007 00:22:04 -0000       1.1
+++ packaging/ipkg/Gnash.desktop        7 Feb 2008 03:20:45 -0000       1.2
@@ -1,6 +1,10 @@
 [Desktop Entry]
-Comment=Gnash, the GNU swf movie player
-Exec=gnash
-Icon=gnash.png
 Type=Application
-Name=FooBar
\ No newline at end of file
+Encoding=UTF-8
+Name=Gnash SWF Viewer
+GenericName=
+Comment=
+Icon=/usr/share/pixmaps/GnashG.xpm
+Exec=/usr/bin/gnash
+Terminal=false
+Categories=AudioVideo;Player;GTK;

Index: packaging/alp.am
===================================================================
RCS file: packaging/alp.am
diff -N packaging/alp.am
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ packaging/alp.am    7 Feb 2008 03:20:45 -0000       1.1
@@ -0,0 +1,94 @@
+# 
+#   Copyright (C) 2005, 2006, 2007, 2008 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
+# 
+
+#
+# Access Linux Platform support. ALP use netcat to install files,
+# as well as a simple remote command set for the phone
+#
+NETCAT_REMOTE   = $(NETCAT) -q 10 `cat /tmp/alp.ip` 5038
+NETCAT_REMOTE_Q = $(NETCAT) -q 8  `cat /tmp/alp.ip` 5038
+ALP_UML_IP      = 192.168.3.101
+ALP_REMOTE_IP  = 192.168.1.101
+ALP_NAMESPACE   = org.gnu.gnash
+ALP_BAR         = $(ALP_NAMESPACE).bar
+ALP_BUNDLE_DIR  = /opt/alp/bundles/
+
+ALP_TMP=/tmp/$(host_alias)-gnash
+
+# this is where the gnash gets compiled
+ALP_BUILD=gnash-${VERSION}
+
+CLEANFILES += alp-* $(ALP_NAMESPACE)
+
+alp-ip: 
+       @if test ! -f /tmp/alp.ip; then \
+         if test "`uname -m`" = "i486" -o "`uname -m`" = "i686" ; then \
+           echo "$(ALP_UML_IP)" | cut -d ' ' -f1 > /tmp/alp.ip ; \
+         else \
+           echo "$(ALP_REMOTE_IP)" | cut -d ' ' -f1 > /tmp/alp.ip ; \
+         fi ; \
+       fi      
+
+alp alp-bundle: alp-install
+       rm -f alp-bundle
+       $(mkinstalldirs) $(ALP_NAMESPACE)/rsc
+       cp -f $(top_srcdir)/packaging/alp/Manifest.xml $(ALP_NAMESPACE)/
+       cp -vf $(ALP_TMP)/usr/local/lib/* $(ALP_NAMESPACE)/
+       cp -f $(top_srcdir)/gui/images/GnashGTiny.png $(ALP_NAMESPACE)/rsc/
+       cp -f $(top_srcdir)/testsuite/movies.all/gravity.swf 
$(ALP_NAMESPACE)/rsc/
+       @touch alp-bundle
+
+alp-install: 
+       address@hidden -f alp-install
+       $(MAKE) install DESTDIR=$(ALP_TMP)
+       @touch alp-install
+
+# Don't ask me why, but you have to register with bartender
+# to get a bar file.
+alp-bar: #alp-bundle
+       rm -f alp-bar
+       $(BARTENDER) pack $(ALP_NAMESPACE) $(ALP_NAMESPACE).bar
+       @touch alp-bar
+
+alp-install-device: # alp-bar alp-install-files
+       @echo "Installing new bar file..."
+       size=`ls -la $(ALP_BAR) | cut --delim=' ' --fields=6,6`; \
+       (echo "install $(ALP_BAR) $$size 0 0 0755" ; cat $(ALP_BAR) ) | 
$(NETCAT_REMOTE)
+       @echo; echo "Registering new bar file with target..."
+       @echo 'package install /tmp/$(ALP_BAR)' | $(NETCAT_REMOTE)
+       @echo " "
+
+alp-install-bundle: alp-bundle
+       $(mkinstalldirs) $(DEST_BND_ROOT)/$(ALP_NAMESPACE)
+       @echo "Installing new bundle files..."
+       cp -Rf $(ALP_NAMESPACE) $(DEST_BND_ROOT)
+
+alp-uninstall-bundle: 
+       @# Note: bundle delete requires rdbgd version 11
+       @echo " "
+       @echo "Removing old bundle..."
+       @echo "(If this returns an error, the target is probably not running.)"
+       @echo "(In that case, the bundle should be gone when you next boot the 
target.)"
+       @echo " "
+       address@hidden 'package delete bar:$(ALP_NAMESPACE)' | $(NETCAT_REMOTE)
+       @echo " "
+
+alp-clean:
+       rm -fr alp-* $(ALP_NAMESPACE)
+
+.PHONY : alp alp-bundle alp-ip
+

Index: packaging/bsd.am
===================================================================
RCS file: packaging/bsd.am
diff -N packaging/bsd.am
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ packaging/bsd.am    7 Feb 2008 03:20:45 -0000       1.1
@@ -0,0 +1,31 @@
+# 
+#   Copyright (C) 2005, 2006, 2007, 2008 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
+# 
+
+#
+# BSD package building
+#
+
+bsd-pkg:
+       $(MAKE) checksum
+       $(MAKE) extract
+       $(MAKE) build
+       $(MAKE) fake
+       $(MAKE) plist
+       $(MAKE) package
+
+.PHONY: bsd-pkg
+

Index: packaging/deb.am
===================================================================
RCS file: packaging/deb.am
diff -N packaging/deb.am
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ packaging/deb.am    7 Feb 2008 03:20:45 -0000       1.1
@@ -0,0 +1,27 @@
+# 
+#   Copyright (C) 2005, 2006, 2007, 2008 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 Debian/Ubuntu .deb GNU/Linux package
+deb debian: dist-bzip2 $(srcdir)/packaging/debian/rules
+       rm -rf gnash-${VERSION}
+       tar jxf gnash-${VERSION}.tar.bz2
+       cp -fr $(srcdir)/packaging/debian gnash-${VERSION}/
+       (cd gnash-${VERSION}; dpkg-buildpackage)
+
+.PHONY : deb debian 
+
+

Index: packaging/ipkg.am
===================================================================
RCS file: packaging/ipkg.am
diff -N packaging/ipkg.am
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ packaging/ipkg.am   7 Feb 2008 03:20:45 -0000       1.1
@@ -0,0 +1,86 @@
+# 
+#   Copyright (C) 2005, 2006, 2007, 2008 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 Debian Familiar .ipk GNU/Linux package. These are always
+# cross compiled, typically for the ARM or XScale.
+#
+
+# this is where the output of "make install" goes, which is what
+# we use to build the package.
+IPKG_TMP=/tmp/$(host_alias)-gnash
+
+# this is where the gnash gets compiled
+IPKG_BUILD=gnash-${VERSION}
+
+CLEANFILES = ipkg-*
+
+ipkg-configure: ipkg-unpack $(IPKG_BUILD)
+       address@hidden -f ipkg-configure
+       cd $(IPKG_BUILD); ./configure --host=$(host_alias) \
+         --build=$(build_triplet) --prefix=/usr \
+         --mandir=/usr/share/man \
+         --infodir=/usr/share/info \
+         --with-plugindir=/usr/lib/mozilla/plugins \
+         --enable-static --disable-shared --disable-kparts \
+         --enable-gui=qtopia --enable-media=none
+       @touch ipkg-configure
+
+ipkg-unpack: $(top_builddir)/config.status
+       address@hidden -f ipkg-*                # nuke everything, we're 
starting over
+       address@hidden -f ipkg-unpack
+       rm -rf $(IPKG_BUILD)
+       tar jxf $(IPKG_BUILD).tar.bz2
+       @touch ipkg-unpack
+
+ipkg-build: ipkg-configure
+       address@hidden -f ipkg-build
+       $(MAKE) -C $(IPKG_BUILD) all
+       @touch ipkg-build
+
+ipkg-install: ipkg-build Makefile
+       address@hidden -f ipkg-install
+       $(MAKE) -C $(IPKG_BUILD) install DESTDIR=$(IPKG_TMP)
+       @touch ipkg-install
+
+ipkg-depend: 
+       address@hidden -f ipkg-depend
+       rsync -avc $(libdir)/libcurl* $(IPKG_TMP)/usr/lib
+       rsync -avc $(libdir)/libagg* $(IPKG_TMP)/usr/lib
+       rsync -avc $(libdir)/libboost_thread* $(IPKG_TMP)/usr/lib
+       rsync -avc $(libdir)/libboost_serialization* $(IPKG_TMP)/usr/lib
+       @touch ipkg-depend
+
+ipk ipkg ipkg-bundle: ipkg-install # ipkg-depend
+       if ! test -d $(IPKG_TMP)/CONTROL ; then \
+         mkdir $(IPKG_TMP)/CONTROL; \
+       fi
+       topdir=`cd ${top_srcdir}; pwd`; \
+       for i in control postinst; do \
+         cp -f $${topdir}/packaging/ipkg/$$i $(IPKG_TMP)/CONTROL; \
+       done; \
+       for i in rules Gnash.desktop; do \
+         cp -f $${topdir}/packaging/ipkg/$$i $(IPKG_TMP)/ ; \
+       done;
+       ipkg-build $(IPKG_TMP)
+
+ipkg-clean:
+       rm -fr ipkg-* $(IPKG_BUILD) $(IPKG_TMP) gnash*$(VERSION)*.ipk
+
+.PHONY : ipkg ipk ipkg-bundle
+
+

Index: packaging/rpm.am
===================================================================
RCS file: packaging/rpm.am
diff -N packaging/rpm.am
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ packaging/rpm.am    7 Feb 2008 03:20:45 -0000       1.1
@@ -0,0 +1,33 @@
+# 
+#   Copyright (C) 2005, 2006, 2007, 2008 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 an RPM package targeted to the OLPC http://www.laptop.org.
+# olpc: dist-gzip $(srcdir)/packaging/redhat/gnash.spec
+#      cp -f $(srcdir)/packaging/redhat/gnash.spec /usr/src/redhat/SPECS/
+#      cp -f gnash-$(VERSION).tar.gz /usr/src/redhat/SOURCES/
+#      rpmbuild -rcfile=$(srcdir)/packaging/redhat/rpmrc:/usr/lib/rpm/rpmrc \
+#               -ba --target=geode-olpc /usr/src/redhat/SPECS/gnash.spec
+
+# Build an Redhat/Fedora .rpm package
+rpm redhat: dist-gzip $(srcdir)/packaging/redhat/gnash.spec
+       cp -f $(srcdir)/packaging/redhat/gnash.spec /usr/src/redhat/SPECS/
+       cp -f gnash-$(VERSION).tar.gz /usr/src/redhat/SOURCES/
+       rpmbuild -ba /usr/src/redhat/SPECS/gnash.spec
+
+.PHONY : rpm redhat
+
+

Index: packaging/snapshot.am
===================================================================
RCS file: packaging/snapshot.am
diff -N packaging/snapshot.am
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ packaging/snapshot.am       7 Feb 2008 03:20:45 -0000       1.1
@@ -0,0 +1,92 @@
+# 
+#   Copyright (C) 2005, 2006, 2007, 2008 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
+# 
+
+NOW = `date -u "+%Y%m%d"`
+
+# 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-${NOW}
+SNAPSHOT_BUILD = gnash-${NOW}/_build
+
+#
+# build a binary snapshot from of Gnash for systems we don't have
+# packaging support for.
+#
+
+# start by creating the initial tarball using the dist-bzip2 target.
+# This uses the default version for Gnash. which is 'cvs'. So we
+# rename it to the dir we want to stay clear. Then we change the default
+# version from 'cvs' to a date stamped version of cvs, like '20080202cvs'
+snapshot: distdir
+       now=`date -u "+%Y%m%d"`; \
+       snapshot_dir="gnash-$${now}"; \
+       snapshot_build="$${snapshot_dir}/_build"; \
+       if test -d $${snapshot_dir} ; then \
+         rm -fr $${snapshot_dir};\
+       fi ; \
+       mv -f gnash-cvs $${snapshot_dir}; \
+       mv -f $${snapshot_dir}/configure.ac $${snapshot_dir}/configure.ac.orig; 
\
+       sed -e "s/AC_INIT(gnash, cvs)/AC_INIT(gnash, $${now}cvs)/" \
+         $${snapshot_dir}/configure.ac.orig > $${snapshot_dir}/configure.ac; \
+       cd $${snapshot_dir} ; ./autogen.sh
+#      tardir=$${snapshot_dir} && $(am__tar) | bzip2 -9 -c > 
$${snapshot_dir}.tar.bz2;
+#      $(RM) -fr $${snapshot_dir}
+
+
+snapshot-configure: snapshot-unpack $(SNAPSHOT_BUILD)
+       $(MKINSTALLDIRS) $(SNAPSHOT_BUILD)
+       address@hidden -f snapshot-configure
+       cd $(SNAPSHOT_BUILD); ./configure \
+         --prefix=/usr \
+         --mandir=/usr/share/man \
+         --infodir=/usr/share/info \
+         --with-plugindir=/usr/lib/mozilla/plugins \
+         --with-extension=all
+         --enable-gui=all
+       @touch snapshot-configure
+
+snapshot-unpack: $(top_builddir)/config.status
+       address@hidden -f snapshot-*            # nuke everything, we're 
starting over
+       address@hidden -f snapshot-unpack
+       rm -rf $(SNAPSHOT_BUILD)
+       tar jxf $(SNAPSHOT_BUILD).tar.bz2
+       @touch snapshot-unpack
+
+snapshot-build: snapshot-configure
+       address@hidden -f snapshot-build
+       $(MAKE) -C $(SNAPSHOT_BUILD) all
+       @touch snapshot-build
+
+snapshot-install: snapshot-build Makefile
+       address@hidden -f snapshot-install
+       $(MAKE) -C $(SNAPSHOT_BUILD) install DESTDIR=$(SNAPSHOT_TMP)
+       @touch snapshot-install
+
+snapshot-depend: 
+       address@hidden -f snapshot-depend
+       rsync -avc $(libdir)/libcurl* $(SNAPSHOT_TMP)/usr/lib
+       rsync -avc $(libdir)/libagg* $(SNAPSHOT_TMP)/usr/lib
+       rsync -avc $(libdir)/libboost_thread* $(SNAPSHOT_TMP)/usr/lib
+       rsync -avc $(libdir)/libboost_serialization* $(SNAPSHOT_TMP)/usr/lib
+       @touch snapshot-depend
+
+snapshot-clean:
+       rm -fr snapshot-* $(SNAPSHOT_BUILD) $(SNAPSHOT_TMP) 
gnash*$(VERSION)*.ipk
+
+
+.PHONY : snapshot
+




reply via email to

[Prev in Thread] Current Thread [Next in Thread]