[Gnash-commit] [SCM] Gnash branch, master, updated. release_0_8_9_final-349-g60c583b

[Sandro Santilli]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Gnash".

The branch, master has been updated
       via  60c583baedd2610c2a0cfeb9f6074c47696cb07e (commit)
       via  2226bd9d05799119a834fa327cdfbf9845e4e661 (commit)
      from  f8f4baef3d27311261a5f1a93dc7b67ea4b1b556 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://git.savannah.gnu.org/cgit//commit/?id=60c583baedd2610c2a0cfeb9f6074c47696cb07e


commit 60c583baedd2610c2a0cfeb9f6074c47696cb07e
Author: Sandro Santilli <address@hidden>
Date:   Thu May 19 11:58:52 2011 +0200

    Re-enable building index for online tests, for some reason removed in 
commit 6afad08f5ac4416ac0205cd3c2df8ef703adc531 (which was unrelated...)

diff --git a/testsuite/actionscript.all/Makefile.am 
b/testsuite/actionscript.all/Makefile.am
index d3e3053..9c78a4d 100644
--- a/testsuite/actionscript.all/Makefile.am
+++ b/testsuite/actionscript.all/Makefile.am
@@ -56,7 +56,7 @@ TEST_DRIVERS = ../simple.exp
 TEST_CASES = \
        $(base_RUNNERS)
 
-dist_noinst_SCRIPTS = gen-test.sh
+dist_noinst_SCRIPTS = gen-test.sh gen-index.sh
 
 AM_CPPFLAGS = \
        -I$(top_srcdir)/libbase \
@@ -211,6 +211,7 @@ v8-online-tests:
        $(MAKE) $(ASTESTS_V8_OUT) alltests-v8.swf 
DEF_MAKESWF_FLAGS="$(COM_MAKESWF_FLAGS) -DMEDIADIR='\\\"../media\\\"'" 
DEJAGNU_SO_URL=../Dejagnu.swf
        mkdir -p online-tests/v8
        mv $(ASTESTS_V8_OUT) alltests-v8.swf online-tests/v8
+       sh $(srcdir)/gen-index.sh alltests-v8.swf $(ASTESTS_V8_OUT)
        mv index.html embed.html online-tests/v8
 
 v7-online-tests: 
@@ -218,6 +219,7 @@ v7-online-tests:
        $(MAKE) $(ASTESTS_V7_OUT) alltests-v7.swf 
DEF_MAKESWF_FLAGS="$(COM_MAKESWF_FLAGS) -DMEDIADIR='\\\"../media\\\"'" 
DEJAGNU_SO_URL=../Dejagnu.swf
        mkdir -p online-tests/v7
        mv $(ASTESTS_V7_OUT) alltests-v7.swf online-tests/v7
+       sh $(srcdir)/gen-index.sh alltests-v7.swf $(ASTESTS_V7_OUT)
        mv index.html embed.html online-tests/v7
 
 v6-online-tests: 
@@ -225,6 +227,7 @@ v6-online-tests:
        $(MAKE) $(ASTESTS_V6_OUT) alltests-v6.swf 
DEF_MAKESWF_FLAGS="$(COM_MAKESWF_FLAGS) -DMEDIADIR='\\\"../media\\\"'" 
DEJAGNU_SO_URL=../Dejagnu.swf
        mkdir -p online-tests/v6
        mv $(ASTESTS_V6_OUT) alltests-v6.swf online-tests/v6
+       sh $(srcdir)/gen-index.sh alltests-v6.swf $(ASTESTS_V6_OUT)
        mv index.html embed.html online-tests/v6
 
 v5-online-tests: 
@@ -232,6 +235,7 @@ v5-online-tests:
        $(MAKE) $(ASTESTS_V5_OUT) alltests-v5.swf 
DEF_MAKESWF_FLAGS="$(COM_MAKESWF_FLAGS) -DMEDIADIR='\\\"../media\\\"'" 
DEJAGNU_SO_URL=../Dejagnu.swf
        mkdir -p online-tests/v5
        mv $(ASTESTS_V5_OUT) alltests-v5.swf online-tests/v5
+       sh $(srcdir)/gen-index.sh alltests-v5.swf $(ASTESTS_V5_OUT)
        mv index.html embed.html online-tests/v5
 
 index.wiki: gen-index-wiki.sh

http://git.savannah.gnu.org/cgit//commit/?id=2226bd9d05799119a834fa327cdfbf9845e4e661


commit 2226bd9d05799119a834fa327cdfbf9845e4e661
Author: Sandro Santilli <address@hidden>
Date:   Thu May 19 11:53:45 2011 +0200

    Fix MAKESWF flags for online-tests

diff --git a/testsuite/actionscript.all/Makefile.am 
b/testsuite/actionscript.all/Makefile.am
index e2a143d..d3e3053 100644
--- a/testsuite/actionscript.all/Makefile.am
+++ b/testsuite/actionscript.all/Makefile.am
@@ -25,8 +25,12 @@ AUTOMAKE_OPTIONS = dejagnu -Wno-portability
 # so I take responsibility of dropping that for the moment...
 
 abs_mediadir = $(shell cd $(srcdir)/../media; pwd)
-swfdir = `cd $(top_builddir)/testsuite/actionscript.all; pwd`
-DEF_MAKESWF_FLAGS=-DMING_VERSION_CODE=$(MING_VERSION_CODE) 
-DMEDIADIR='\"$(abs_mediadir)\"' -DSWFDIR='\"$(swfdir)\"' -I"$(top_builddir)"
+swfdir = $(shell cd $(top_builddir)/testsuite/actionscript.all; pwd)
+
+COM_MAKESWF_FLAGS=-DMING_VERSION_CODE=$(MING_VERSION_CODE) -I"$(top_builddir)"
+DEF_MAKESWF_FLAGS=$(COM_MAKESWF_FLAGS) \
+       -DMEDIADIR='\"$(abs_mediadir)\"' \
+       -DSWFDIR='\"$(swfdir)\"' 
 
 quickcheck_RUNNERS = \
        alltests-v5-Runner \
@@ -204,28 +208,28 @@ ONLINETEST_RULES = v5-online-tests v6-online-tests 
v7-online-tests v8-online-tes
 
 v8-online-tests: 
        rm -f $(ASTESTS_V8_OUT) # force rebuild
-       $(MAKE) $(ASTESTS_V8_OUT) alltests-v8.swf 
DEF_MAKESWF_FLAGS="-DMING_VERSION_CODE=$(MING_VERSION_CODE) 
-DMEDIADIR='\\\"../media\\\"'" DEJAGNU_SO_URL=../Dejagnu.swf
+       $(MAKE) $(ASTESTS_V8_OUT) alltests-v8.swf 
DEF_MAKESWF_FLAGS="$(COM_MAKESWF_FLAGS) -DMEDIADIR='\\\"../media\\\"'" 
DEJAGNU_SO_URL=../Dejagnu.swf
        mkdir -p online-tests/v8
        mv $(ASTESTS_V8_OUT) alltests-v8.swf online-tests/v8
        mv index.html embed.html online-tests/v8
 
 v7-online-tests: 
        rm -f $(ASTESTS_V7_OUT) # force rebuild
-       $(MAKE) $(ASTESTS_V7_OUT) alltests-v7.swf 
DEF_MAKESWF_FLAGS="-DMING_VERSION_CODE=$(MING_VERSION_CODE) 
-DMEDIADIR='\\\"../media\\\"'" DEJAGNU_SO_URL=../Dejagnu.swf
+       $(MAKE) $(ASTESTS_V7_OUT) alltests-v7.swf 
DEF_MAKESWF_FLAGS="$(COM_MAKESWF_FLAGS) -DMEDIADIR='\\\"../media\\\"'" 
DEJAGNU_SO_URL=../Dejagnu.swf
        mkdir -p online-tests/v7
        mv $(ASTESTS_V7_OUT) alltests-v7.swf online-tests/v7
        mv index.html embed.html online-tests/v7
 
 v6-online-tests: 
        rm -f $(ASTESTS_V6_OUT) # force rebuild
-       $(MAKE) $(ASTESTS_V6_OUT) alltests-v6.swf 
DEF_MAKESWF_FLAGS="-DMING_VERSION_CODE=$(MING_VERSION_CODE) 
-DMEDIADIR='\\\"../media\\\"'" DEJAGNU_SO_URL=../Dejagnu.swf
+       $(MAKE) $(ASTESTS_V6_OUT) alltests-v6.swf 
DEF_MAKESWF_FLAGS="$(COM_MAKESWF_FLAGS) -DMEDIADIR='\\\"../media\\\"'" 
DEJAGNU_SO_URL=../Dejagnu.swf
        mkdir -p online-tests/v6
        mv $(ASTESTS_V6_OUT) alltests-v6.swf online-tests/v6
        mv index.html embed.html online-tests/v6
 
 v5-online-tests: 
        rm -f $(ASTESTS_V5_OUT) # force rebuild
-       $(MAKE) $(ASTESTS_V5_OUT) alltests-v5.swf 
DEF_MAKESWF_FLAGS="-DMING_VERSION_CODE=$(MING_VERSION_CODE) 
-DMEDIADIR='\\\"../media\\\"'" DEJAGNU_SO_URL=../Dejagnu.swf
+       $(MAKE) $(ASTESTS_V5_OUT) alltests-v5.swf 
DEF_MAKESWF_FLAGS="$(COM_MAKESWF_FLAGS) -DMEDIADIR='\\\"../media\\\"'" 
DEJAGNU_SO_URL=../Dejagnu.swf
        mkdir -p online-tests/v5
        mv $(ASTESTS_V5_OUT) alltests-v5.swf online-tests/v5
        mv index.html embed.html online-tests/v5

-----------------------------------------------------------------------

Summary of changes:
 testsuite/actionscript.all/Makefile.am |   22 +++++++++++++++-------
 1 files changed, 15 insertions(+), 7 deletions(-)


hooks/post-receive
-- 
Gnash