On Thu, Jun 05, 2008 at 06:07:45PM +0200, Patrice Dumas wrote:
> On Wed, Jun 04, 2008 at 02:24:55PM -0400, Russ Nelson wrote:
> > rc2 builds on these platforms:
>
> make[3]: Entering directory
> `/home/dumas/tmp/gnash-0.8.3-rc2/testsuite/misc-ming.all'
> ....
> make[3]: *** No rule to make target `DrawingApiTest.as', needed by
> `DrawingApiTest.swf'. Stop.
>
> In fact the whole directory is empty. Looks like something is screwed in
> the release. I guess that make dist is not done in directories when misc
> or another test dependency is needed. I'll have a look.
The solution I propose is to select SUBDIRS in testsuite based on what
is available instead of skipping large parts of Makefile.am. This allows
to have make dist works correctly.
Patch against head, but works on release, done in the testsuite
directory.
I found another similar issue for po files, I'll investigate.
--
Pat
? misc-swfmill.all/.deps
Index: Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/testsuite/Makefile.am,v
retrieving revision 1.58
diff -u -3 -p -r1.58 Makefile.am
--- Makefile.am 22 May 2008 21:35:41 -0000 1.58
+++ Makefile.am 5 Jun 2008 22:10:39 -0000
@@ -17,22 +17,41 @@
AUTOMAKE_OPTIONS =
+if ENABLE_MING
+DIR_MING = misc-ming.all actionscript.all
+endif
+
+if ENABLE_MTASC
+DIR_MTASC = misc-mtasc.all
+endif
+
+if ENABLE_SWFMILL
+DIR_SWFMILL = misc-swfmill.all
+endif
+
+if ENABLE_SWFC
+DIR_SWFC = misc-swfc.all
+endif
+
+if ENABLE_SWFDEC_TESTSUITE
+DIR_SWFDEC_TESTSUITE = swfdec
+endif
+
# movies.all
SUBDIRS = \
. \
- swfdec \
+ $(DIR_SWFDEC_TESTSUITE) \
libnet.all \
libbase \
libamf.all \
libgeometry \
server \
samples \
- misc-ming.all \
- misc-mtasc.all \
- misc-swfmill.all \
- misc-swfc.all \
+ $(DIR_MING) \
+ $(DIR_MTASC) \
+ $(DIR_SWFMILL) \
+ $(DIR_SWFC) \
movies.all \
- actionscript.all \
$(NULL)
EXTRA_DIST = check.h DummyMovieDefinition.h DummyCharacter.h gnashrc.in
simple.exp media/README media/Bitstream-Vera-Sans.fdb
media/Bitstream-Vera-Sans.COPYRIGHT media/default.orc media/gnash.xml
media/majorscale.sco media/offspring.swf media/offspring.jpg media/green.jpg
media/green.swf media/lynch.swf media/lynch.jpg media/sound1.wav
media/sound1.mp3 media/square.flv media/square.ogg media/vars.txt
media/vars2.txt
Index: actionscript.all/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/testsuite/actionscript.all/Makefile.am,v
retrieving revision 1.93
diff -u -3 -p -r1.93 Makefile.am
--- actionscript.all/Makefile.am 9 May 2008 13:21:07 -0000 1.93
+++ actionscript.all/Makefile.am 5 Jun 2008 22:10:39 -0000
@@ -23,7 +23,6 @@ AUTOMAKE_OPTIONS = dejagnu
# of the generated SWF should work, but it's currently
# broken and needs to be used in misc-ming.all too
# so I take responsibility of dropping that for the moment...
-if ENABLE_MING
abs_mediadir = `cd $(srcdir)/../media; pwd`
DEF_MAKESWF_FLAGS=-DMING_VERSION_CODE=$(MING_VERSION_CODE)
-DMEDIADIR='\"$(abs_mediadir)\"'
@@ -383,4 +382,3 @@ site-update: site.exp
@echo "# This is a list of the pre-compiled testcases" >> site.exp
@echo "set testcases \"$(TEST_CASES)\"" >> site.exp
-endif
Index: misc-ming.all/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/testsuite/misc-ming.all/Makefile.am,v
retrieving revision 1.199
diff -u -3 -p -r1.199 Makefile.am
--- misc-ming.all/Makefile.am 8 May 2008 18:20:31 -0000 1.199
+++ misc-ming.all/Makefile.am 5 Jun 2008 22:10:40 -0000
@@ -21,8 +21,6 @@ AUTOMAKE_OPTIONS = dejagnu -Wno-portabil
abs_builddir=$(shell cd $(top_builddir)/testsuite/misc-ming.all; pwd)
abs_mediadir = $(shell cd $(srcdir)/../media; pwd)
-if ENABLE_MING
-
CLEANFILES = \
gnash-dbg.log \
site.exp.bak \
@@ -1887,5 +1885,3 @@ site-update: site.exp
@echo "# This is a list of the pre-compiled testcases" >> site.exp
@echo "set testcases \"$(TEST_CASES)\"" >> site.exp
-endif
-
Index: misc-mtasc.all/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/testsuite/misc-mtasc.all/Makefile.am,v
retrieving revision 1.29
diff -u -3 -p -r1.29 Makefile.am
--- misc-mtasc.all/Makefile.am 25 Apr 2008 09:00:21 -0000 1.29
+++ misc-mtasc.all/Makefile.am 5 Jun 2008 22:10:40 -0000
@@ -47,8 +47,6 @@ AUXMOVIES = \
EXTRA_DIST = $(ASTESTS) $(AUXMOVIES) TestClass.as ../check.h Dejagnu.as
check.as Derived1.as Base1.as implementsOp/BExtendingImplementation.as
implementsOp/ImplementationA.as implementsOp/ImplementationB.as
implementsOp/SimpleInterface.as
-if ENABLE_MTASC
-
MTASC_FLAGS = -version 6 -cp $(MTASC_CLASSPATH) -cp $(srcdir) -v -header
800:600:20
MTASC_CPP = $(CPP) -x c -P -I$(srcdir)
@@ -108,4 +106,3 @@ site-update: site.exp
@echo "# This is a list of the pre-compiled testcases" >> site.exp
@echo "set testcases \"$(TEST_CASES)\"" >> site.exp
-endif
Index: misc-swfc.all/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/testsuite/misc-swfc.all/Makefile.am,v
retrieving revision 1.34
diff -u -3 -p -r1.34 Makefile.am
--- misc-swfc.all/Makefile.am 25 Apr 2008 09:00:21 -0000 1.34
+++ misc-swfc.all/Makefile.am 5 Jun 2008 22:10:40 -0000
@@ -77,8 +77,6 @@ AUXMOVIES = \
EXTRA_DIST = $(SANE_SCTESTS) $(BOGO_SCTESTS) $(AUXMOVIES)
$(INTERACTIVE_SCTESTS) check.sc Dejagnu.sc hello.sc
-if ENABLE_SWFC
-
check_PROGRAMS = \
button_test1runner \
$(NULL)
@@ -160,4 +158,3 @@ site-update: site.exp
@echo "# This is a list of the pre-compiled testcases" >> site.exp
@echo "set testcases \"$(TEST_CASES)\"" >> site.exp
-endif # ENABLE_SWFC
Index: misc-swfmill.all/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/testsuite/misc-swfmill.all/Makefile.am,v
retrieving revision 1.19
diff -u -3 -p -r1.19 Makefile.am
--- misc-swfmill.all/Makefile.am 30 Apr 2008 18:31:50 -0000 1.19
+++ misc-swfmill.all/Makefile.am 5 Jun 2008 22:10:40 -0000
@@ -33,8 +33,6 @@ SC_XMLTESTS = \
EXTRA_DIST = $(SC_XMLTESTS)
-if ENABLE_SWFMILL
-
AM_CPPFLAGS = -I.. \
-I$(top_srcdir) \
-I$(top_srcdir)/libbase \
@@ -125,4 +123,3 @@ site-update: site.exp
@echo "# This is a list of the pre-compiled testcases" >> site.exp
@echo "set testcases \"$(TEST_CASES)\"" >> site.exp
-endif
Index: swfdec/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/testsuite/swfdec/Makefile.am,v
retrieving revision 1.12
diff -u -3 -p -r1.12 Makefile.am
--- swfdec/Makefile.am 25 Apr 2008 09:00:22 -0000 1.12
+++ swfdec/Makefile.am 5 Jun 2008 22:10:40 -0000
@@ -20,8 +20,6 @@ AUTOMAKE_OPTIONS = dejagnu -Wno-portabil
abs_topbuilddir=$(shell cd $(top_builddir); pwd)
-if ENABLE_SWFDEC_TESTSUITE
-
check_SCRIPTS = \
run_swfdec_testsuite_a \
run_swfdec_testsuite_b \
@@ -184,4 +182,3 @@ site-update: site.exp
@echo "# This is a list of the pre-compiled testcases" >> site.exp
@echo "set testcases \"$(TEST_CASES)\"" >> site.exp
-endif
_______________________________________________
Gnash-dev mailing list
[email protected]
http://lists.gnu.org/mailman/listinfo/gnash-dev
