[Gnash-commit] /srv/bzr/gnash/trunk r9573: Add actionscript.all and libnet.all into DIST_SUBDIRS

[rob]

------------------------------------------------------------
revno: 9573
committer: address@hidden
branch nick: trunk
timestamp: Sat 2008-08-09 18:09:12 -0600
message:
  Add actionscript.all and libnet.all into DIST_SUBDIRS
  Ming release rc1 is *after* beta5.
modified:
  macros/ming.m4
  testsuite/Makefile.am
    ------------------------------------------------------------
    revno: 9568.1.2
    committer: address@hidden
    branch nick: build
    timestamp: Fri 2008-08-08 14:37:56 -0600
    message:
      update from trunk
    added:
      libcore/swf/DefineButtonCxformTag.h
    modified:
      libcore/Makefile.am
      libcore/impl.cpp
      libcore/impl.h
      libcore/movie_root.cpp
      libcore/parser/button_character_def.cpp
      libcore/parser/button_character_def.h
      libcore/parser/shape_character_def.cpp
      libcore/sprite_instance.cpp
      libcore/swf/PlaceObject2Tag.cpp
    ------------------------------------------------------------
    revno: 9568.1.3
    committer: address@hidden
    branch nick: build
    timestamp: Sat 2008-08-09 16:41:46 -0600
    message:
      update from trunk
    removed:
      doc/C/amf.xml
      doc/C/debugger.xml
      doc/C/internals.xml
      doc/C/rtmp.xml
      doc/C/sources.xml
    modified:
      doc/C/preformatted/gnash_user.info.in
      doc/C/refmanual/building.xml
      doc/C/refmanual/code_dependencies.xml
    ------------------------------------------------------------
    revno: 9568.1.4
    committer: address@hidden
    branch nick: build
    timestamp: Sat 2008-08-09 17:47:22 -0600
    message:
      Update from trunk.
    modified:
      po/cs.po
      po/de.po
      po/es.po
      po/fi.po
      po/fr.po
      po/it.po
      po/ja.po
      po/sv.po
    ------------------------------------------------------------
    revno: 9568.1.5
    committer: address@hidden
    branch nick: build
    timestamp: Sat 2008-08-09 17:47:44 -0600
    message:
      Add actionscript.all and libnet.all to DIST_SUBDIRS, so they get included 
in
      the the dist tarball.
    modified:
      testsuite/Makefile.am
    ------------------------------------------------------------
    revno: 9568.1.6
    committer: address@hidden
    branch nick: build
    timestamp: Sat 2008-08-09 17:48:36 -0600
    message:
      Get the version numbers right, ming release rc1 is after ming release
      beta5.
    modified:
      macros/ming.m4

=== modified file 'macros/ming.m4'
--- a/macros/ming.m4    2008-04-08 01:48:56 +0000
+++ b/macros/ming.m4    2008-08-09 23:48:36 +0000
@@ -51,10 +51,18 @@
 
   if test x"$MING_CONFIG" != "x"; then
     MING_VERSION=`$MING_CONFIG --version`
-    major=`echo $MING_VERSION | sed 
's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\).*/\1/'`
-    minor=`echo $MING_VERSION | sed 
's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\).*/\2/'`
-    micro=`echo $MING_VERSION | sed 
's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\).*/\3/'`
+    major=`echo $MING_VERSION | cut -d '.' -f 1`
+    minor=`echo $MING_VERSION | cut -d '.' -f 2`
+    micro=`echo $MING_VERSION | cut -d '.' -f 3`
     beta=`echo $MING_VERSION | sed -ne 's/.*beta\([[0-9]]*\).*/\1/p'`
+    dnl This is a little screwy. The previous Ming release was tagged beta5,
+    dnl but the newer one is tagged rc1. This makes it look like rc1 is older 
the
+    dnl beta 5 release, as it only looks at the last integer. So we fudge the
+    dnl numbers so tc1 comes after beta 5. ie.. this looks like beta 6.
+    if test -z $beta; then
+      beta=`echo $MING_VERSION | sed -ne 's/.*rc\([[0-9]]*\).*/\1/p'`
+      beta=`eval expr $beta + 5`
+    fi
     MING_VERSION_CODE=`printf %2.2d%2.2d%2.2d%2.2d $major $minor $micro $beta`
     MING_CFLAGS=`$MING_CONFIG --cflags`
     MING_LIBS=`$MING_CONFIG --libs`

=== modified file 'testsuite/Makefile.am'
--- a/testsuite/Makefile.am     2008-08-04 13:27:32 +0000
+++ b/testsuite/Makefile.am     2008-08-09 23:47:44 +0000
@@ -42,9 +42,10 @@
 endif
 
 DIST_SUBDIRS = \
-       libnet.all \
+       actionscript.all \
        libbase \
        libamf.all \
+       libnet.all \
        libcore.all \
        samples \
        swfdec \