gnash-commit
[Top][All Lists]
Advanced

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

[Gnash-commit] gnash ChangeLog Makefile.am configure.ac testsu...


From: Sandro Santilli
Subject: [Gnash-commit] gnash ChangeLog Makefile.am configure.ac testsu...
Date: Fri, 18 May 2007 10:14:11 +0000

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  07/05/18 10:14:11

Modified files:
        .              : ChangeLog Makefile.am configure.ac 
        testsuite      : Makefile.am 
Added files:
        testsuite/misc-swfmill.all: .cvsignore Makefile.am hello.xml 

Log message:
                * Makefile.am, configure.ac: detect 'swfmill'
                * testsuite/misc-swfmill.all/: .cvsignore, Makefile.am:
                  new testsuite dir for swfmill
                * testsuite/misc-swfmill.all/hello.xml: small example on
                  how to produce an swf. Build with 'make hello.swf'.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.3262&r2=1.3263
http://cvs.savannah.gnu.org/viewcvs/gnash/Makefile.am?cvsroot=gnash&r1=1.73&r2=1.74
http://cvs.savannah.gnu.org/viewcvs/gnash/configure.ac?cvsroot=gnash&r1=1.317&r2=1.318
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/Makefile.am?cvsroot=gnash&r1=1.37&r2=1.38
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/misc-swfmill.all/.cvsignore?cvsroot=gnash&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/misc-swfmill.all/Makefile.am?cvsroot=gnash&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/misc-swfmill.all/hello.xml?cvsroot=gnash&rev=1.1

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.3262
retrieving revision 1.3263
diff -u -b -r1.3262 -r1.3263
--- ChangeLog   18 May 2007 07:54:42 -0000      1.3262
+++ ChangeLog   18 May 2007 10:14:10 -0000      1.3263
@@ -1,3 +1,11 @@
+2007-05-18 Sandro Santilli <address@hidden>
+
+       * Makefile.am, configure.ac: detect 'swfmill'
+       * testsuite/misc-swfmill.all/: .cvsignore, Makefile.am:
+         new testsuite dir for swfmill
+       * testsuite/misc-swfmill.all/hello.xml: small example on
+         how to produce an swf. Build with 'make hello.swf'.
+
 2007-05-18 Zou Lunkai <address@hidden>
 
        * testsuite/misc-ming.all/getTimer_test.c,

Index: Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/Makefile.am,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -b -r1.73 -r1.74
--- Makefile.am 15 May 2007 16:31:01 -0000      1.73
+++ Makefile.am 18 May 2007 10:14:10 -0000      1.74
@@ -15,7 +15,7 @@
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 # 
 
-# $Id: Makefile.am,v 1.73 2007/05/15 16:31:01 rsavoye Exp $
+# $Id: Makefile.am,v 1.74 2007/05/18 10:14:10 strk Exp $
 
 ## Process this file with automake to produce Makefile.in
 AUTOMAKE_OPTIONS = 1.6.0
@@ -220,6 +220,9 @@
        @echo " MTASC $(MTASC)"
        @echo " MTASC CLASSPATH $(MTASC_CLASSPATH)"
 endif
+if ENABLE_SWFMILL
+       @echo " SWFMILL $(SWFMILL) "
+endif
 if ENABLE_SWFDEC_TESTSUITE
        @echo " SWFDEC_TESTSUITE $(SWFDEC_TESTSUITE)"
 endif

Index: configure.ac
===================================================================
RCS file: /sources/gnash/gnash/configure.ac,v
retrieving revision 1.317
retrieving revision 1.318
diff -u -b -r1.317 -r1.318
--- configure.ac        18 May 2007 03:14:01 -0000      1.317
+++ configure.ac        18 May 2007 10:14:10 -0000      1.318
@@ -15,7 +15,7 @@
 dnl  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 dnl  
 
-dnl $Id: configure.ac,v 1.317 2007/05/18 03:14:01 martinwguy Exp $
+dnl $Id: configure.ac,v 1.318 2007/05/18 10:14:10 strk Exp $
 
 AC_PREREQ(2.50)
 AC_INIT(gnash, cvs)
@@ -676,6 +676,12 @@
 AC_SUBST(SWFDEC_TESTSUITE)
 AM_CONDITIONAL(ENABLE_SWFDEC_TESTSUITE, [ test x"$SWFDEC_TESTSUITE" != x ])
 
+dnl
+dnl See if we can use the swfmill based testsuite
+dnl
+AC_PATH_PROG(SWFMILL, swfmill)
+AM_CONDITIONAL(ENABLE_SWFMILL, [ test x"$SWFMILL" != x ])
+
 AC_PATH_PROG(DOXYGEN, doxygen)
 AM_CONDITIONAL(ENABLE_DOXYGEN, [ test x"$DOXYGEN" != x ])
 
@@ -1067,6 +1073,7 @@
 testsuite/swfdec/Makefile
 testsuite/misc-ming.all/Makefile
 testsuite/misc-mtasc.all/Makefile
+testsuite/misc-swfmill.all/Makefile
 testsuite/movies.all/Makefile
 testsuite/server/Makefile
 testsuite/libamf.all/Makefile
@@ -1649,6 +1656,14 @@
     echo "                 or .deb users: apt-get install mtasc"
 fi
 
+if test x"$SWFMILL" != x; then
+    echo "        SWFMILL is $SWFMILL"
+else
+    echo "        WARNING: You need to have the 'swfmill' tool installed"
+    echo "                 to run some of the tests in Gnash testsuite."
+    echo "                 You can install it from 
http://iterative.org/swfmill/";
+fi
+
 if test x"$Z_LIBS" != x; then
   if test x"$Z_CFLAGS" != x; then
     echo "        Z flags are: $Z_CFLAGS"

Index: testsuite/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/testsuite/Makefile.am,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -b -r1.37 -r1.38
--- testsuite/Makefile.am       10 May 2007 15:50:20 -0000      1.37
+++ testsuite/Makefile.am       18 May 2007 10:14:11 -0000      1.38
@@ -11,6 +11,7 @@
        libamf.all \
        misc-ming.all \
        misc-mtasc.all \
+       misc-swfmill.all \
        movies.all \
        actionscript.all \
        $(NULL)

Index: testsuite/misc-swfmill.all/.cvsignore
===================================================================
RCS file: testsuite/misc-swfmill.all/.cvsignore
diff -N testsuite/misc-swfmill.all/.cvsignore
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ testsuite/misc-swfmill.all/.cvsignore       18 May 2007 10:14:11 -0000      
1.1
@@ -0,0 +1,11 @@
+Makefile
+Makefile.in
+gnash-dbg.log
+gnash.log
+gnash.sum
+site.exp
+*.swf
+testrun.*
+*.pp
+alltests-runner
+gmon.out

Index: testsuite/misc-swfmill.all/Makefile.am
===================================================================
RCS file: testsuite/misc-swfmill.all/Makefile.am
diff -N testsuite/misc-swfmill.all/Makefile.am
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ testsuite/misc-swfmill.all/Makefile.am      18 May 2007 10:14:11 -0000      
1.1
@@ -0,0 +1,75 @@
+## Process this fill with automake to generate Makefile.in
+# 
+# Copyright (C) 2007 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 2 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
+
+AUTOMAKE_OPTIONS = dejagnu
+
+abs_topbuilddir=$(shell cd $(top_builddir); pwd)
+
+if ENABLE_SWFMILL
+
+## Self-contained XML tests
+SC_XMLTESTS =          \
+       hello.xml       \
+       $(NULL)
+
+## Path to Dejagnu.swf file
+DEJAGNU_SO_PATH = ../misc-ming.all/Dejagnu.swf
+
+SC_XMLTESTS_OUT = $(SC_XMLTESTS:.xml=.swf)
+
+# Dependencies for all self-contained SWF tests
+$(SC_XMLTESTS_OUT) : Dejagnu.swf
+
+Dejagnu.swf: $(DEJAGNU_SO_PATH)
+       cp ../misc-ming.all/Dejagnu.swf .
+
+check_SCRIPTS = \
+       $(NULL)
+
+.xml.swf: 
+       $(SWFMILL) -v simple $(@:%.swf=$(srcdir)/%.xml) $@
+
+clean-local: 
+       rm -f $(check_SCRIPTS) $(SC_XMLTESTS_OUT) \
+               *.log *.trace-gnash \
+               site.bak site.exp site.exp.bak testrun.sum \
+               gnash.sum Dejagnu.swf 
+
+
+TEST_DRIVERS = ../simple.exp
+TEST_CASES = ${check_SCRIPTS}
+
+check-DEJAGNU: site-update $(check_PROGRAMS)
+       @runtest=$(RUNTEST); \
+       if $(SHELL) -c "$$runtest --version" > /dev/null 2>&1; then \
+           $$runtest $(RUNTESTFLAGS) $(TEST_DRIVERS); \
+       else \
+         echo "WARNING: could not find \`runtest'" 1>&2; \
+          for i in "$(TEST_CASES)"; do \
+           $(SHELL) $$i; \
+         done; \
+       fi
+
+site-update: site.exp
+       @rm -fr site.exp.bak
+       @cp site.exp site.exp.bak
+       @sed -e '/testcases/d' site.exp.bak > site.exp
+       @echo "# This is a list of the pre-compiled testcases" >> site.exp
+       @echo "set testcases \"$(TEST_CASES)\"" >> site.exp
+
+endif

Index: testsuite/misc-swfmill.all/hello.xml
===================================================================
RCS file: testsuite/misc-swfmill.all/hello.xml
diff -N testsuite/misc-swfmill.all/hello.xml
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ testsuite/misc-swfmill.all/hello.xml        18 May 2007 10:14:11 -0000      
1.1
@@ -0,0 +1,45 @@
+<?xml version="1.0"?>
+<swf version="6" compressed="1">
+
+<!--
+Simple source code example for swfmill.
+Build with 'swfmill xml2swf hello.xml hello.swf'.
+When in gnash testsuite, 'make hello.swf' is enough.
+
+TODO:
+  - Find out how to embed the Dejagnu.swf lib
+  - Find out how to call the Dejagnu.swf interfaces
+-->
+
+  <Header width="12800" height="9600" framerate="12" frames="1">
+    <size>
+      <Rectangle left="0" right="12800" top="0" bottom="9600"/>
+    </size>
+
+    <tags>
+
+      <background color="#ffffff"/>
+
+      <DoAction>
+        <actions>
+          <Dictionary>
+            <strings>
+              <String value="hello world"/>
+            </strings>
+          </Dictionary>
+          <PushData>
+            <items>
+              <StackDictionaryLookup index="0"/>
+            </items>
+          </PushData>
+          <Trace/>
+          <EndAction/>
+        </actions>
+      </DoAction>
+
+      <ShowFrame/>
+      <End/>
+    </tags>
+
+  </Header>
+</swf>




reply via email to

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