[Gnash-commit] gnash ChangeLog testsuite/misc-ming.all/DefineE...

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  06/10/11 16:36:45

Modified files:
        .              : ChangeLog 
        testsuite/misc-ming.all: DefineEditTextVariableNameTest.c 
                                 Makefile.am 
Added files:
        testsuite/misc-ming.all: ming_utils.c ming_utils.h 

Log message:
                * testsuite/misc-ming.all/Makefile.am: added the new files,
                  fixed yet another $(top_srcdir) misuse.
                * testsuite/misc-ming.all/DefineEditTextVariableNameTest.c,
                  testsuite/misc-ming.all/ming_utils.c,
                  testsuite/misc-ming.all/ming_utils.h:
                  extracted useful Ming functions from a single test, for reuse.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.1149&r2=1.1150
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/misc-ming.all/DefineEditTextVariableNameTest.c?cvsroot=gnash&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/misc-ming.all/Makefile.am?cvsroot=gnash&r1=1.15&r2=1.16
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/misc-ming.all/ming_utils.c?cvsroot=gnash&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/misc-ming.all/ming_utils.h?cvsroot=gnash&rev=1.1

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.1149
retrieving revision 1.1150
diff -u -b -r1.1149 -r1.1150
--- ChangeLog   11 Oct 2006 16:26:15 -0000      1.1149
+++ ChangeLog   11 Oct 2006 16:36:45 -0000      1.1150
@@ -1,5 +1,14 @@
 2006-10-11 Sandro Santilli <address@hidden>
 
+       * testsuite/misc-ming.all/Makefile.am: added the new files,
+         fixed yet another $(top_srcdir) misuse.
+       * testsuite/misc-ming.all/DefineEditTextVariableNameTest.c,
+         testsuite/misc-ming.all/ming_utils.c,
+         testsuite/misc-ming.all/ming_utils.h:
+         extracted useful Ming functions from a single test, for reuse.
+
+2006-10-11 Sandro Santilli <address@hidden>
+
        * backend/render_handler_agg.cpp: fixed typo in compatibility
          layer inclusion.
        * configure.ac, Makefile.am, macros/agg.m4: report need for

Index: testsuite/misc-ming.all/DefineEditTextVariableNameTest.c
===================================================================
RCS file: 
/sources/gnash/gnash/testsuite/misc-ming.all/DefineEditTextVariableNameTest.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- testsuite/misc-ming.all/DefineEditTextVariableNameTest.c    10 Oct 2006 
16:44:18 -0000      1.5
+++ testsuite/misc-ming.all/DefineEditTextVariableNameTest.c    11 Oct 2006 
16:36:45 -0000      1.6
@@ -62,27 +62,13 @@
 #include <stdio.h>
 #include <ming.h>
 
+#include "ming_utils.h"
+
 #define OUTPUT_VERSION 6
 #define OUTPUT_FILENAME "DefineEditTextVariableNameTest.swf"
 
 void add_text_field(SWFMovieClip mo, SWFBlock font, const char* varname, const 
char* text);
 
-void
-add_xtrace_function(SWFMovie mo, int depth, int x, int y, int width, int 
height)
-{
-       SWFAction ac;
-       char buf[1024];
-
-       sprintf(buf, "createTextField(\"out\", %d, %d, %d, %d, %d); "
-               " xtrace = function (msg) { "
-               " trace (msg); "
-               " _level0.out.text = msg; "
-               "};",
-               depth, x, y, width, height);
-       ac = compileSWFActionCode(buf);
-
-       SWFMovie_add(mo, (SWFBlock)ac);
-}
 
 void
 add_text_field(SWFMovieClip mo, SWFBlock font, const char* varname,

Index: testsuite/misc-ming.all/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/testsuite/misc-ming.all/Makefile.am,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- testsuite/misc-ming.all/Makefile.am 11 Oct 2006 14:30:43 -0000      1.15
+++ testsuite/misc-ming.all/Makefile.am 11 Oct 2006 16:36:45 -0000      1.16
@@ -78,14 +78,18 @@
 DefineEditTextTest_SOURCES =  DefineEditTextTest.c
 DefineEditTextTest_LDADD = $(MING_LIBS)
 
-DefineEditTextVariableNameTest_SOURCES =  DefineEditTextVariableNameTest.c
+DefineEditTextVariableNameTest_SOURCES =       \
+       DefineEditTextVariableNameTest.c        \
+       ming_utils.h                            \
+       ming_utils.c                            \
+       $(NULL)
 DefineEditTextVariableNameTest_LDADD = $(MING_LIBS)
 
 DefineEditTextVariableNameTest_Runner_SOURCES = \
        DefineEditTextVariableNameTest-Runner.cpp \
        $(NULL)
 DefineEditTextVariableNameTest_Runner_LDADD = \
-       $(top_srcdir)/testsuite/libtestsuite.la \
+       $(top_builddir)/testsuite/libtestsuite.la \
        $(NULL)
 
 spritehier_SOURCES =  spritehier.c

Index: testsuite/misc-ming.all/ming_utils.c
===================================================================
RCS file: testsuite/misc-ming.all/ming_utils.c
diff -N testsuite/misc-ming.all/ming_utils.c
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ testsuite/misc-ming.all/ming_utils.c        11 Oct 2006 16:36:45 -0000      
1.1
@@ -0,0 +1,58 @@
+/* 
+ *   Copyright (C) 2005, 2006 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
+ *
+ * Linking Gnash statically or dynamically with other modules is making a
+ * combined work based on Gnash. Thus, the terms and conditions of the GNU
+ * General Public License cover the whole combination.
+ *
+ * As a special exception, the copyright holders of Gnash give you
+ * permission to combine Gnash with free software programs or libraries
+ * that are released under the GNU LGPL and with code included in any
+ * release of Talkback distributed by the Mozilla Foundation. You may
+ * copy and distribute such a system following the terms of the GNU GPL
+ * for all but the LGPL-covered parts and Talkback, and following the
+ * LGPL for the LGPL-covered parts.
+ *
+ * Note that people who make modified versions of Gnash are not obligated
+ * to grant this special exception for their modified versions; it is their
+ * choice whether to do so. The GNU General Public License gives permission
+ * to release a modified version without this exception; this exception
+ * also makes it possible to release a modified version which carries
+ * forward this exception.
+ *
+ */ 
+
+#include <stdlib.h>
+#include <stdio.h>
+#include <ming.h>
+
+void
+add_xtrace_function(SWFMovie mo, int depth, int x, int y, int width, int 
height)
+{
+       SWFAction ac;
+       char buf[1024];
+
+       sprintf(buf, "createTextField(\"out\", %d, %d, %d, %d, %d); "
+               " xtrace = function (msg) { "
+               " trace (msg); "
+               " _level0.out.text = msg; "
+               "};",
+               depth, x, y, width, height);
+       ac = compileSWFActionCode(buf);
+
+       SWFMovie_add(mo, (SWFBlock)ac);
+}
+

Index: testsuite/misc-ming.all/ming_utils.h
===================================================================
RCS file: testsuite/misc-ming.all/ming_utils.h
diff -N testsuite/misc-ming.all/ming_utils.h
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ testsuite/misc-ming.all/ming_utils.h        11 Oct 2006 16:36:45 -0000      
1.1
@@ -0,0 +1,47 @@
+/* 
+ *   Copyright (C) 2005, 2006 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
+ *
+ * Linking Gnash statically or dynamically with other modules is making a
+ * combined work based on Gnash. Thus, the terms and conditions of the GNU
+ * General Public License cover the whole combination.
+ *
+ * As a special exception, the copyright holders of Gnash give you
+ * permission to combine Gnash with free software programs or libraries
+ * that are released under the GNU LGPL and with code included in any
+ * release of Talkback distributed by the Mozilla Foundation. You may
+ * copy and distribute such a system following the terms of the GNU GPL
+ * for all but the LGPL-covered parts and Talkback, and following the
+ * LGPL for the LGPL-covered parts.
+ *
+ * Note that people who make modified versions of Gnash are not obligated
+ * to grant this special exception for their modified versions; it is their
+ * choice whether to do so. The GNU General Public License gives permission
+ * to release a modified version without this exception; this exception
+ * also makes it possible to release a modified version which carries
+ * forward this exception.
+ *
+ */ 
+
+#ifndef GNASH_MING_UTILS_H
+#define GNASH_MING_UTILS_H
+
+#include <ming.h>
+
+/// Add an 'xtrace' function that both traces usin 'trace' and
+/// printing to a textfield created using the given depth, position and size
+void add_xtrace_function(SWFMovie mo, int depth, int x, int y, int width, int 
height);
+
+#endif // GNASH_MING_UTILS_H