[Gnash-commit] gnash packaging/snapshot.am ChangeLog

[Rob Savoye]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Rob Savoye <rsavoye>    08/02/16 17:58:51

Modified files:
        packaging      : snapshot.am 
        .              : ChangeLog 

Log message:
                * packaging/snapshot.am: Set the name higher up so we don't have
                to add "cvs" everywhere for the snapshot version. Build the
                tarball with the correct path.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/packaging/snapshot.am?cvsroot=gnash&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.5669&r2=1.5670

Patches:
Index: packaging/snapshot.am
===================================================================
RCS file: /sources/gnash/gnash/packaging/snapshot.am,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- packaging/snapshot.am       10 Feb 2008 06:49:50 -0000      1.3
+++ packaging/snapshot.am       16 Feb 2008 17:58:50 -0000      1.4
@@ -33,28 +33,32 @@
 # 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 "+%Y%m%d"`; \
-       snapshot_dir="gnash-$${now}cvs"; \
-       snapshot_build="$${snapshot_dir}/_build"; \
-       if test -d gnash-cvs -a ! -d $${snapshot_dir}; then \
-         mv -f gnash-cvs $${snapshot_dir}; \
-       fi; \
-       if test ! -d $${snapshot_build}; then \
-         $(MKINSTALLDIRS) $${snapshot_build}; \
+       now=`date "+%Y%m%d"`; \
+       pkgname="gnash-$${now}cvs"; \
+       snapshot_dir="$${pkgname}"; \
+       snapshot_tar="$${pkgname}.tar.gz"; \
+       if test -d $${snapshot_dir}; then \
+         rm -fr $${snapshot_dir}; \
        fi; \
+       mv -f gnash-cvs $${snapshot_dir}; \
        if test ! -f $${snapshot_dir}/configure.ac.orig; then \
          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; \
-       fi
-#      tardir=$${snapshot_dir} && $(am__tar) | bzip2 -9 -c > 
$${snapshot_dir}.tar.bz2;
+         cd $${snapshot_dir} ; ./autogen.sh; cd .. ;\
+       fi; \
+       tar zcvf $${snapshot_tar} --exclude=$${snapshot_dir}/autom4te.cache \
+         --exclude=$${snapshot_dir}/configure.ac.orig $${snapshot_dir}
 #      $(RM) -fr $${snapshot_dir}
 
 snapshot-configure: snapshot
        @now=`date "+%Y%m%d"`; \
-       snapshot_dir="gnash-$${now}cvs"; \
+       pkgname="gnash-$${now}cvs"; \
+       snapshot_dir="$${pkgname}"; \
        snapshot_build="$${snapshot_dir}/_build"; \
+       if test ! -d $${snapshot_build}; then \
+         $(MKINSTALLDIRS) $${snapshot_build}; \
+       fi; \
        if test -d /usr/local/mozilla-firefox/plugins; then \
           plugindir=/usr/local/mozilla-firefox/plugins; \
        else \
@@ -66,15 +70,15 @@
          --mandir=/usr/share/man \
          --infodir=/usr/share/info \
          --with-plugindir=$${plugindir} \
-         --disable-static \
-         --enable-allstatic \
-         CXXFLAGS=-g
+         --disable-static
+#        --enable-docbook
 #        --with-extensions=all 
 #        --enable-gui=all 
 
 snapshot-build: snapshot-configure
        @now=`date "+%Y%m%d"`; \
-       snapshot_dir="gnash-$${now}cvs"; \
+       pkgname="gnash-$${now}cvs"; \
+       snapshot_dir="$${pkgname}"; \
        snapshot_build="$${snapshot_dir}/_build"; \
        $(MAKE) $(AM_MAKEFLAGS) -C $${snapshot_build} all
 
@@ -89,9 +93,10 @@
 # correct
 snapshot-bundle: #snapshot-install
        now=`date "+%Y%m%d"`; \
-       snapshot_dest="/tmp/gnash-$${now}cvs-tmp"; \
-       snapshot_tmp="/tmp/gnash-$${now}cvs"; \
-       snapshot_tar="$${snapshot_tmp}-$(host_cpu).tar.bz2"; \
+       pkgname="gnash-$${now}cvs"; \
+       snapshot_dest="/tmp/$${pkgname}-tmp"; \
+       snapshot_tmp="/tmp/$${pkgname}"; \
+       snapshot_tar="$${snapshot_tmp}-$(host_cpu).tar.gz"; \
        if test ! -d $${snapshot_tmp}; then \
          $(MKINSTALLDIRS) $${snapshot_tmp}; \
        fi; \
@@ -108,14 +113,13 @@
        strip $${snapshot_tmp}/bin/gprocessor; \
        strip $${snapshot_tmp}/bin/dumpshm; \
        strip $${snapshot_tmp}/bin/soldumper; \
-       cd /tmp; tar jcvf $${snapshot_tar} gnash-$${now}cvs
+       tar zcvCf /tmp $${snapshot_tar} $${pkgname}
 
 snapshot-rpm: snapshot $(srcdir)/packaging/redhat/gnash.spec
        rm -f /usr/src/redhat/SPECS/gnash.spec
        now=`date "+%Y%m%d"`; \
        pkgname="gnash-$${now}cvs"; \
-       snapshot_tar="/tmp/$${pkgname}cvs.tar.bz2"; \
-        tar jcvf $${snapshot_tar} --exclude=gnash-$${now}cvs/_build 
gnash-$${now}cvs; \
+       snapshot_tar="$${pkgname}.tar.gz"; \
        sed -e "s:%define version .*:%define version $${now}:" 
$(srcdir)/packaging/redhat/gnash.spec > /usr/src/redhat/SPECS/gnash.spec; \
        cp $${snapshot_tar} /usr/src/redhat/SOURCES/
        rpmbuild -ba --clean --rmsource --rmspec 
/usr/src/redhat/SPECS/gnash.spec

Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.5669
retrieving revision 1.5670
diff -u -b -r1.5669 -r1.5670
--- ChangeLog   16 Feb 2008 17:51:04 -0000      1.5669
+++ ChangeLog   16 Feb 2008 17:58:50 -0000      1.5670
@@ -1,5 +1,9 @@
 2008-02-16  Rob Savoye  <address@hidden>
 
+       * packaging/snapshot.am: Set the name higher up so we don't have
+       to add "cvs" everywhere for the snapshot version. Build the
+       tarball with the correct path.
+
        * doc/C/dumpshm-man.xml, gprocessor-man.xml, soldumper-man.xml,
        gnash-man.xml: Rename all man page source to *.man-xml so we can
        use a SUFFIX rule for transformations.