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

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  07/02/12 23:49:10

Modified files:
        .              : ChangeLog Makefile.am configure.ac 
        testsuite      : Makefile.am 
Added files:
        macros         : mtasc.m4 
        testsuite/misc-mtasc.all: Makefile.am hello.as 

Log message:
                * macros/mtasc.m4: provide some detection for mtasc
                  (CLASSPATH detection needs more work).
                * configure.ac: detect mtasc availability.
                * Makefile.am: dump MTASC info on 'make dumpconfig'.
                * testsuite/Makefile.am: descend in misc-mtasc.all
                * testsuite/misc-mtasc.all/Makefile.am: initial Makefile
                  for mtasc.
                * testsuite/misc-mtasc.all/hello.as: simple test
                  (build with 'make hello.swf').

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.2332&r2=1.2333
http://cvs.savannah.gnu.org/viewcvs/gnash/Makefile.am?cvsroot=gnash&r1=1.62&r2=1.63
http://cvs.savannah.gnu.org/viewcvs/gnash/configure.ac?cvsroot=gnash&r1=1.254&r2=1.255
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/mtasc.m4?cvsroot=gnash&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/Makefile.am?cvsroot=gnash&r1=1.26&r2=1.27
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/misc-mtasc.all/Makefile.am?cvsroot=gnash&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/misc-mtasc.all/hello.as?cvsroot=gnash&rev=1.1

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.2332
retrieving revision 1.2333
diff -u -b -r1.2332 -r1.2333
--- ChangeLog   12 Feb 2007 20:56:51 -0000      1.2332
+++ ChangeLog   12 Feb 2007 23:49:10 -0000      1.2333
@@ -1,5 +1,17 @@
 2007-02-12 Sandro Santilli <address@hidden>
 
+       * macros/mtasc.m4: provide some detection for mtasc
+         (CLASSPATH detection needs more work).
+       * configure.ac: detect mtasc availability.
+       * Makefile.am: dump MTASC info on 'make dumpconfig'.
+       * testsuite/Makefile.am: descend in misc-mtasc.all
+       * testsuite/misc-mtasc.all/Makefile.am: initial Makefile
+         for mtasc.
+       * testsuite/misc-mtasc.all/hello.as: simple test 
+         (build with 'make hello.swf').
+
+2007-02-12 Sandro Santilli <address@hidden>
+
        * server/button_character_instance.cpp (on_button_event):
          Survive MOUSE_DOWN and MOUSE_UP events.
        * server/movie_root.cpp: (generate_mouse_button_events):

Index: Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/Makefile.am,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -b -r1.62 -r1.63
--- Makefile.am 2 Feb 2007 01:57:57 -0000       1.62
+++ Makefile.am 12 Feb 2007 23:49:10 -0000      1.63
@@ -15,7 +15,7 @@
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 # 
 
-# $Id: Makefile.am,v 1.62 2007/02/02 01:57:57 rsavoye Exp $
+# $Id: Makefile.am,v 1.63 2007/02/12 23:49:10 strk Exp $
 
 ## Process this file with automake to produce Makefile.in
 AUTOMAKE_OPTIONS = 1.6.0
@@ -218,6 +218,8 @@
        @echo " MING_LIBS $(MING_LIBS) "
        @echo " MING_CFLAGS $(MING_CFLAGS) "
        @echo " MAKESWF $(MAKESWF) "
+       @echo " MTASC $(MTASC)"
+       @echo " MTASC CLASSPATH $(MTASC_CLASSPATH)"
        @echo "Graphics support..."     
        @echo " CAIRO_CFLAGS is $(CAIRO_CFLAGS)"
        @echo " CAIRO_LIBS is $(CAIRO_LIBS)"

Index: configure.ac
===================================================================
RCS file: /sources/gnash/gnash/configure.ac,v
retrieving revision 1.254
retrieving revision 1.255
diff -u -b -r1.254 -r1.255
--- configure.ac        9 Feb 2007 20:03:15 -0000       1.254
+++ configure.ac        12 Feb 2007 23:49:10 -0000      1.255
@@ -15,7 +15,7 @@
 dnl  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 dnl  
 
-dnl $Id: configure.ac,v 1.254 2007/02/09 20:03:15 rsavoye Exp $
+dnl $Id: configure.ac,v 1.255 2007/02/12 23:49:10 strk Exp $
 
 AC_PREREQ(2.50)
 AC_INIT(gnash, cvs)
@@ -445,6 +445,9 @@
 AC_PATH_PROG(DOXYGEN, doxygen)
 AM_CONDITIONAL(ENABLE_DOXYGEN, [ test x"$DOXYGEN" != x ])
 
+AC_PATH_MTASC
+AM_CONDITIONAL(ENABLE_MTASC, [ test x"$MTASC" != x ])
+
 dnl currently unused
 dnl GNASH_PKG_FIND(ogg, [ogg.h], [decode ogg streams], ogg_stream_init)
 
@@ -817,6 +820,7 @@
 testsuite/actionscript.all/Makefile
 testsuite/samples/Makefile
 testsuite/misc-ming.all/Makefile
+testsuite/misc-mtasc.all/Makefile
 testsuite/movies.all/Makefile
 testsuite/server/Makefile
 gui/Makefile
@@ -1351,6 +1355,15 @@
  run anyway."
 fi
 
+if test x"$MTASC" != x; then
+    echo "        MTASC is $MTASC"
+    echo "        MTASC CLASSPATH is $MTASC_CLASSPATH"
+else
+    echo "Warning:\
+ You need to have the MTASC compiler packages installed\
+ to run some of the tests in Gnash testsuite."
+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.26
retrieving revision 1.27
diff -u -b -r1.26 -r1.27
--- testsuite/Makefile.am       13 Dec 2006 15:15:09 -0000      1.26
+++ testsuite/Makefile.am       12 Feb 2007 23:49:10 -0000      1.27
@@ -8,6 +8,7 @@
        server                  \
        samples                 \
        misc-ming.all           \
+       misc-mtasc.all          \
        movies.all              \
        actionscript.all        \
        $(NULL)

Index: macros/mtasc.m4
===================================================================
RCS file: macros/mtasc.m4
diff -N macros/mtasc.m4
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ macros/mtasc.m4     12 Feb 2007 23:49:10 -0000      1.1
@@ -0,0 +1,69 @@
+dnl
+dnl    Copyright (C) 2005, 2006 Free Software Foundation, Inc.
+dnl
+dnl  This program is free software; you can redistribute it and/or modify
+dnl  it under the terms of the GNU General Public License as published by
+dnl  the Free Software Foundation; either version 2 of the License, or
+dnl  (at your option) any later version.
+dnl
+dnl  This program is distributed in the hope that it will be useful,
+dnl  but WITHOUT ANY WARRANTY; without even the implied warranty of
+dnl  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+dnl  GNU General Public License for more details.
+dnl  You should have received a copy of the GNU General Public License
+dnl  along with this program; if not, write to the Free Software
+dnl  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+dnl
+
+# Configure paths for Ming
+# Author: Sandro Santilli <address@hidden>
+#
+# This macro uses ming-config, which was
+# not available as of Ming 0.3beta1
+#
+#
+# Use: 
+#      AC_PATH_MTASC
+#
+# Provides:
+#      MTASC             - Path to mtasc executable
+#      MTASC_CLASSPATH   - Classpath for mtasc
+#
+
+AC_DEFUN([AC_PATH_MTASC], [
+  MTASC=""
+  MTASC_CLASSPATH=""
+
+  AC_ARG_WITH(mtasc, AC_HELP_STRING([--with-mtasc=<path>], [Path to the mtasc 
executable]), [
+    case "${withval}" in
+      yes|no) ;;
+      *) MTASC=${withval} ;;
+    esac
+  ], MTASC="")
+
+  AC_ARG_WITH(mtasc-classpath, AC_HELP_STRING([--with-mtasc-classpath=<path>], 
[CLASSPATH for mtasc]), [
+    case "${withval}" in
+      yes|no) ;;
+      *) MTASC_CLASSPATH=${withval} ;;
+    esac
+  ], MTASC="")
+
+  if test x"$MTASC" = "x"; then
+    AC_PATH_PROG(MTASC, mtasc, ,[${pathlist}])
+  fi
+
+  if test x"$MTASC" != "x" -a x"$MTASC_CLASSPATH" = "x"; then
+    # cross your fingers !
+    MTASC_CLASSPATH=`dirname ${MTASC}`/std
+  fi
+
+
+  AC_SUBST(MTASC)
+  AC_SUBST(MTASC_CLASSPATH)
+])
+
+# Local Variables:
+# c-basic-offset: 2
+# tab-width: 2
+# indent-tabs-mode: nil
+# End:

Index: testsuite/misc-mtasc.all/Makefile.am
===================================================================
RCS file: testsuite/misc-mtasc.all/Makefile.am
diff -N testsuite/misc-mtasc.all/Makefile.am
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ testsuite/misc-mtasc.all/Makefile.am        12 Feb 2007 23:49:10 -0000      
1.1
@@ -0,0 +1,11 @@
+
+# these need some autoconf work...
+CLASSPATH=/extra/mtasc/std
+MTASC = mtasc
+
+MTASC_FLAGS= -cp $(MTASC_CLASSPATH)
+
+hello.swf: hello.as
+       $(MTASC) $(MTASC_FLAGS) -swf $@ -main -header 800:600:20 $<
+
+CLEANFILES = hello.swf

Index: testsuite/misc-mtasc.all/hello.as
===================================================================
RCS file: testsuite/misc-mtasc.all/hello.as
diff -N testsuite/misc-mtasc.all/hello.as
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ testsuite/misc-mtasc.all/hello.as   12 Feb 2007 23:49:10 -0000      1.1
@@ -0,0 +1,9 @@
+class Test
+{
+
+static function main(mc)
+{
+       trace("Hello world");
+}
+
+}