[Gnash-commit] gnash ChangeLog extensions/fileio/Makefile.am l...

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  07/05/25 16:32:38

Modified files:
        .              : ChangeLog 
        extensions/fileio: Makefile.am 
        libbase        : rc.cpp 
Added files:
        extensions     : gnashrc 

Log message:
                * extensions/gnashrc: new file, with required variables
                  for running extensions tests.
                * extensions/fileio/Makefile.am: Provide a GNASHRC variable
                  to the generic-testrunner.sh
                * libbase/rc.cpp (loadFiles): load a GNASHRC if specified, after
                  all precedent files are loaded. See task #6937.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.3358&r2=1.3359
http://cvs.savannah.gnu.org/viewcvs/gnash/extensions/gnashrc?cvsroot=gnash&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/gnash/extensions/fileio/Makefile.am?cvsroot=gnash&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/rc.cpp?cvsroot=gnash&r1=1.23&r2=1.24

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.3358
retrieving revision 1.3359
diff -u -b -r1.3358 -r1.3359
--- ChangeLog   25 May 2007 16:12:58 -0000      1.3358
+++ ChangeLog   25 May 2007 16:32:37 -0000      1.3359
@@ -1,5 +1,14 @@
 2007-05-25 Sandro Santilli <address@hidden>
 
+       * extensions/gnashrc: new file, with required variables
+         for running extensions tests.
+       * extensions/fileio/Makefile.am: Provide a GNASHRC variable
+         to the generic-testrunner.sh
+       * libbase/rc.cpp (loadFiles): load a GNASHRC if specified, after
+         all precedent files are loaded. See task #6937.
+
+2007-05-25 Sandro Santilli <address@hidden>
+
        * testsuite/libbase/: TCXXRc.cpp, gnashrc.in: test EnableExtensions.
        * doc/C/gnashrc.xml: document new EnableExtensions gnashrc
          variable

Index: extensions/fileio/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/extensions/fileio/Makefile.am,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- extensions/fileio/Makefile.am       8 May 2007 21:13:48 -0000       1.4
+++ extensions/fileio/Makefile.am       25 May 2007 16:32:38 -0000      1.5
@@ -61,7 +61,7 @@
        $(RM) $(DESTDIR)$(pluginsdir)/*.a 
 
 test: $(srcdir)/../../testsuite/generic-testrunner.sh test.swf
-       GNASH_PLUGINS=$(PWD) sh $< $(top_builddir) test.swf > $@
+       GNASH_PLUGINS=$(PWD) GNASHRC=$(srcdir)/../gnashrc sh $< $(top_builddir) 
test.swf > $@
        chmod +x $@
 
 test.swf: test.as

Index: libbase/rc.cpp
===================================================================
RCS file: /sources/gnash/gnash/libbase/rc.cpp,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -b -r1.23 -r1.24
--- libbase/rc.cpp      25 May 2007 16:04:11 -0000      1.23
+++ libbase/rc.cpp      25 May 2007 16:32:38 -0000      1.24
@@ -90,6 +90,13 @@
     if (home) {
         loadfile = home;
         loadfile += "/.gnashrc";
+        parseFile(loadfile);
+    }
+
+    // Check the GNASHRC environment variable
+    char *gnashrc = getenv("GNASHRC");
+    if (gnashrc) {
+        loadfile = gnashrc;
         return parseFile(loadfile);
     }
     

Index: extensions/gnashrc
===================================================================
RCS file: extensions/gnashrc
diff -N extensions/gnashrc
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ extensions/gnashrc  25 May 2007 16:32:37 -0000      1.1
@@ -0,0 +1,9 @@
+# This file should be pointed to by a GNASHRC environment variable
+# whenever an extensions test is run
+#
+# Do this by adding GNASHRC=$(srcdir)/../gnasrc prefix to your
+# generic_testrunner.sh invokation inside Makefile.am
+#
+
+# Enable extensions for allowing testing them..
+set EnableExtensions on