[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gnash-commit] gnash ChangeLog configure.ac testsuite/misc-min...
|
From: |
Sandro Santilli |
|
Subject: |
[Gnash-commit] gnash ChangeLog configure.ac testsuite/misc-min... |
|
Date: |
Thu, 29 Mar 2007 06:54:10 +0000 |
CVSROOT: /sources/gnash
Module name: gnash
Changes by: Sandro Santilli <strk> 07/03/29 06:54:09
Modified files:
. : ChangeLog configure.ac
testsuite/misc-ming.all: Makefile.am ming_utils.c ming_utils.h
Log message:
* configure.ac: provide MING_SUPPORTS_INIT_ACTIONS conditional.
* testsuite/misc-ming.all/ming_utils.{h,c}: provide
MING_SUPPORTS_INIT_ACTIONS macro and use it to conditinally
buil the init acion interface.
* testsuite/misc-ming.all/Makefile.am: provide MING_VERSION_CODE
macro, enable build of init_action_test when
MING_SUPPORTS_INIT_ACTIONS.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.2709&r2=1.2710
http://cvs.savannah.gnu.org/viewcvs/gnash/configure.ac?cvsroot=gnash&r1=1.278&r2=1.279
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/misc-ming.all/Makefile.am?cvsroot=gnash&r1=1.84&r2=1.85
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/misc-ming.all/ming_utils.c?cvsroot=gnash&r1=1.22&r2=1.23
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/misc-ming.all/ming_utils.h?cvsroot=gnash&r1=1.15&r2=1.16
Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.2709
retrieving revision 1.2710
diff -u -b -r1.2709 -r1.2710
--- ChangeLog 29 Mar 2007 02:45:22 -0000 1.2709
+++ ChangeLog 29 Mar 2007 06:54:09 -0000 1.2710
@@ -1,4 +1,14 @@
-2007-03-22 Zou Lunkai <address@hidden>
+2007-03-29 Sandro Santilli <address@hidden>
+
+ * configure.ac: provide MING_SUPPORTS_INIT_ACTIONS conditional.
+ * testsuite/misc-ming.all/ming_utils.{h,c}: provide
+ MING_SUPPORTS_INIT_ACTIONS macro and use it to conditinally
+ buil the init acion interface.
+ * testsuite/misc-ming.all/Makefile.am: provide MING_VERSION_CODE
+ macro, enable build of init_action_test when
+ MING_SUPPORTS_INIT_ACTIONS.
+
+2007-03-28 Zou Lunkai <address@hidden>
* testsuite/misc-ming.all: init_action_test.c
add a new testcase for DoInitAction.
Index: configure.ac
===================================================================
RCS file: /sources/gnash/gnash/configure.ac,v
retrieving revision 1.278
retrieving revision 1.279
diff -u -b -r1.278 -r1.279
--- configure.ac 28 Mar 2007 23:42:19 -0000 1.278
+++ configure.ac 29 Mar 2007 06:54:09 -0000 1.279
@@ -15,7 +15,7 @@
dnl Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
dnl
-dnl $Id: configure.ac,v 1.278 2007/03/28 23:42:19 rsavoye Exp $
+dnl $Id: configure.ac,v 1.279 2007/03/29 06:54:09 strk Exp $
AC_PREREQ(2.50)
AC_INIT(gnash, cvs)
@@ -494,6 +494,8 @@
AM_CONDITIONAL(ENABLE_MING, [ test x"$MAKESWF" != x ])
AM_CONDITIONAL(MAKESWF_SUPPORTS_PREBUILT_CLIPS,
[ test x"$MAKESWF" != x && test $MING_VERSION_CODE -ge 00040002 ])
+AM_CONDITIONAL(MING_SUPPORTS_INIT_ACTIONS,
+ [ test x"$MAKESWF" != x && test $MING_VERSION_CODE -ge 00040004 ])
AC_ARG_WITH([swfdec_testsuite],
AC_HELP_STRING([--with-swfdec-testsuite],
Index: testsuite/misc-ming.all/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/testsuite/misc-ming.all/Makefile.am,v
retrieving revision 1.84
retrieving revision 1.85
diff -u -b -r1.84 -r1.85
--- testsuite/misc-ming.all/Makefile.am 28 Mar 2007 23:42:20 -0000 1.84
+++ testsuite/misc-ming.all/Makefile.am 29 Mar 2007 06:54:09 -0000 1.85
@@ -49,6 +49,7 @@
-I$(top_srcdir)/libgeometry \
-I$(top_srcdir)/testsuite \
$(MING_CFLAGS) \
+ -DMING_VERSION_CODE=$(MING_VERSION_CODE) \
$(NULL)
@@ -107,6 +108,12 @@
intervalTestRunner
endif
+if MING_SUPPORTS_INIT_ACTIONS
+check_PROGRAMS += \
+ init_action_test \
+ $(NULL)
+endif
+
check_SCRIPTS = \
timeline_var_test-Runner \
place_object_testrunner \
@@ -133,6 +140,13 @@
FlashVarsTest-Runner
endif
+if MING_SUPPORTS_INIT_ACTIONS
+check_SCRIPTS += \
+ init_action_testrunner \
+ $(NULL)
+endif
+
+
# TESTS = \
# DefineEditTextVariableNameTest-Runner
@@ -690,6 +704,20 @@
echo "$(top_builddir)/gui/gnash -1 -r0 -v -P
'FlashVars=?a=a_in_fvars&v=v_in_fvars'
'FlashVarsTest.swf?a=a_in_qstring&q=q_in_qstring'" > $@
chmod 755 $@
+init_action_test_SOURCES = \
+ init_action_test.c \
+ ming_utils.h \
+ ming_utils.c \
+ $(NULL)
+init_action_test_LDADD = $(MING_LIBS)
+
+init_action_test.swf: init_action_test
+ ./init_action_test $(top_srcdir)/testsuite/media
+
+init_action_testrunner: $(srcdir)/../generic-testrunner.sh init_action_test.swf
+ sh $< $(top_builddir) init_action_test.swf > $@
+ chmod 755 $@
+
intervalTest.swf: $(srcdir)/../media/green.swf ../Dejagnu.swf
$(srcdir)/intervalTest.as
$(MAKESWF) -o $@ ../Dejagnu.swf $(srcdir)/intervalTest.as
intervalTestRunner_SOURCES = \
@@ -806,6 +834,12 @@
gotoFrame2Test-Runner
endif
+if MING_SUPPORTS_INIT_ACTIONS
+TEST_CASES += \
+ init_action_testrunner \
+ $(NULL)
+endif
+
check-DEJAGNU: site-update $(check_PROGRAMS)
@runtest=$(RUNTEST); \
if $(SHELL) -c "$$runtest --version" > /dev/null 2>&1; then \
Index: testsuite/misc-ming.all/ming_utils.c
===================================================================
RCS file: /sources/gnash/gnash/testsuite/misc-ming.all/ming_utils.c,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -b -r1.22 -r1.23
--- testsuite/misc-ming.all/ming_utils.c 29 Mar 2007 02:45:22 -0000
1.22
+++ testsuite/misc-ming.all/ming_utils.c 29 Mar 2007 06:54:09 -0000
1.23
@@ -289,7 +289,7 @@
SWFMovieClip_add(mo, (SWFBlock)ac);
}
-#if 0
+#ifdef MING_SUPPORTS_INIT_ACTIONS
void
add_clip_init_actions(SWFMovieClip mo, const char* code)
{
@@ -297,7 +297,7 @@
ac = compileSWFActionCode(code);
SWFMovieClip_addInitAction(mo, (SWFBlock)ac);
}
-#endif
+#endif // MING_SUPPORTS_INIT_ACTIONS
SWFAction
compile_actions(const char* fmt, ...)
Index: testsuite/misc-ming.all/ming_utils.h
===================================================================
RCS file: /sources/gnash/gnash/testsuite/misc-ming.all/ming_utils.h,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- testsuite/misc-ming.all/ming_utils.h 29 Mar 2007 02:45:22 -0000
1.15
+++ testsuite/misc-ming.all/ming_utils.h 29 Mar 2007 06:54:09 -0000
1.16
@@ -22,6 +22,10 @@
#include <ming.h>
+#if MING_VERSION_CODE >= 00040004
+# define MING_SUPPORTS_INIT_ACTIONS
+#endif
+
/* Missing define to allow using older Ming releases */
#ifndef SWFACTION_INIT
@@ -226,6 +230,7 @@
void add_clip_actions(SWFMovieClip mc, const char* code);
+#ifdef MING_SUPPORTS_INIT_ACTIONS
/** \brief
* Add an Init ActionScript code in the given movieclip
*
@@ -235,7 +240,8 @@
* @param code
* Init ActionScript code to be compiled in.
*/
-//void add_clip_init_actions(SWFMovieClip mo, const char* code);
+void add_clip_init_actions(SWFMovieClip mo, const char* code);
+#endif // MING_SUPPORTS_INIT_ACTIONS
/** \brief
* Create an outline square shape with given offset, size and colors