[Gnash-commit] gnash configure.ac ChangeLog libbase/extension....

[Rob Savoye]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Rob Savoye <rsavoye>    06/11/24 19:17:37

Modified files:
        .              : configure.ac ChangeLog 
        libbase        : extension.cpp extension.h sharedlib.cpp 
                         sharedlib.h 
        extensions/dejagnu: Makefile.am dejagnu.cpp dejagnu.h 

Log message:
                * libbase/sharedlib.cpp: Use & instead of a pointer to an
                as_object. const_cast basename.
                * configure.ac: Test for libgen.h.
                * extensions/dejagnu/Makefile.am: Add libgnashvm to ldflags.
                * extensions/dejagnu/dejagnu.cpp, dejagnu.h: Use & instead of a
                pointer to an as_object.
                * libbase/extension.h, extension.cpp: Use & instead of a pointer
                to an as_object. 

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/configure.ac?cvsroot=gnash&r1=1.198&r2=1.199
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.1747&r2=1.1748
http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/extension.cpp?cvsroot=gnash&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/extension.h?cvsroot=gnash&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/sharedlib.cpp?cvsroot=gnash&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/sharedlib.h?cvsroot=gnash&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/gnash/extensions/dejagnu/Makefile.am?cvsroot=gnash&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/gnash/extensions/dejagnu/dejagnu.cpp?cvsroot=gnash&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/gnash/extensions/dejagnu/dejagnu.h?cvsroot=gnash&r1=1.1&r2=1.2

Patches:
Index: configure.ac
===================================================================
RCS file: /sources/gnash/gnash/configure.ac,v
retrieving revision 1.198
retrieving revision 1.199
diff -u -b -r1.198 -r1.199
--- configure.ac        24 Nov 2006 09:04:24 -0000      1.198
+++ configure.ac        24 Nov 2006 19:17:37 -0000      1.199
@@ -15,7 +15,7 @@
 dnl  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 dnl  
 
-dnl $Id: configure.ac,v 1.198 2006/11/24 09:04:24 strk Exp $
+dnl $Id: configure.ac,v 1.199 2006/11/24 19:17:37 rsavoye Exp $
 
 AC_PREREQ(2.50)
 AC_INIT(gnash, cvs)
@@ -351,6 +351,7 @@
 AC_CHECK_HEADERS(dejagnu.h)
 AC_CHECK_HEADERS(malloc.h)
 AC_CHECK_HEADERS(getopt.h)
+AC_CHECK_HEADERS(libgen.h)
 
 dnl seems unused
 dnl AC_CHECK_LIB(Xmu, XmuCvtStringToOrientation)
@@ -787,12 +788,12 @@
 testsuite/movies.all/Makefile
 testsuite/server/Makefile
 gui/Makefile
+extensions/Makefile
+extensions/dejagnu/Makefile
 plugin/Makefile
 plugin/klash/Makefile
 )
 dnl cygnal/Makefile
-dnl extensions/Makefile
-dnl extensions/dejagnu/Makefile
 
 echo ""
 echo "Configurable options are:"

Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.1747
retrieving revision 1.1748
diff -u -b -r1.1747 -r1.1748
--- ChangeLog   24 Nov 2006 19:07:14 -0000      1.1747
+++ ChangeLog   24 Nov 2006 19:17:37 -0000      1.1748
@@ -1,3 +1,14 @@
+2006-11-24  Rob Savoye  <address@hidden>
+
+       * libbase/sharedlib.cpp: Use & instead of a pointer to an
+       as_object. 
+       * configure.ac: Test for libgen.h.
+       * extensions/dejagnu/Makefile.am: Add libgnashvm to ldflags.
+       * extensions/dejagnu/dejagnu.cpp, dejagnu.h: Use & instead of a
+       pointer to an as_object.
+       * libbase/extension.h, extension.cpp: Use & instead of a pointer
+       to an as_object. 
+       
 2006-11-24 Markus Gothe <address@hidden>
 
        * libbase/sharedlib.cpp: Fixed include for basename and casting to

Index: libbase/extension.cpp
===================================================================
RCS file: /sources/gnash/gnash/libbase/extension.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- libbase/extension.cpp       24 Nov 2006 14:41:39 -0000      1.2
+++ libbase/extension.cpp       24 Nov 2006 19:17:37 -0000      1.3
@@ -14,25 +14,23 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-/* $Id: extension.cpp,v 1.2 2006/11/24 14:41:39 alexeev Exp $ */
+/* $Id: extension.cpp,v 1.3 2006/11/24 19:17:37 rsavoye Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 
-#if defined(_WIN32) || defined(WIN32)
-# define lock(lib_mutex);
-# define scoped_lock ;
-#define PLUGINSDIR "./"        //hack
-#define USE_DIRENT 1
-
-
-#else
-# include <boost/detail/lightweight_mutex.hpp>
-  using boost::detail::lightweight_mutex;
-# define scoped_lock lightweight_mutex::scoped_lock
-  static lightweight_mutex lib_mutex;
-#endif
+// #if defined(_WIN32) || defined(WIN32)
+// # define lock(lib_mutex);
+// # define scoped_lock ;
+// #define PLUGINSDIR "./"     //hack
+// #define USE_DIRENT 1
+// #else
+// # include <boost/detail/lightweight_mutex.hpp>
+//   using boost::detail::lightweight_mutex;
+// # define scoped_lock lightweight_mutex::scoped_lock
+//   static lightweight_mutex lib_mutex;
+// #endif
 
 #include <ltdl.h>
 #include <string.h>
@@ -99,7 +97,7 @@
 }
 
 bool
-Extension::scanAndLoad(const char *dir, as_object *obj)
+Extension::scanAndLoad(const char *dir, as_object &obj)
 {
     GNASH_REPORT_FUNCTION;
     
@@ -110,7 +108,7 @@
 }
 
 bool
-Extension::scanAndLoad(as_object *obj)
+Extension::scanAndLoad(as_object &obj)
 {
     GNASH_REPORT_FUNCTION;
 //    const char *mod;
@@ -131,7 +129,7 @@
 }
 
 bool
-Extension::initModule(const char *module, as_object *obj)
+Extension::initModule(const char *module, as_object &obj)
 {
     GNASH_REPORT_FUNCTION;
 
@@ -204,7 +202,7 @@
             // We only want shared libraries than end with the suffix, 
otherwise
             // we get all the duplicates.
             entry = readdir(library_dir);
-            if ((int)entry < 1) {
+            if (entry < NULL) {
                 break;
             }
             

Index: libbase/extension.h
===================================================================
RCS file: /sources/gnash/gnash/libbase/extension.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- libbase/extension.h 24 Nov 2006 04:45:05 -0000      1.1
+++ libbase/extension.h 24 Nov 2006 19:17:37 -0000      1.2
@@ -39,12 +39,12 @@
     bool scanDir();
     bool scanDir(const char *dir);
     // scan the directory and open the module
-    bool scanAndLoad(as_object *obj);
-    bool scanAndLoad(const char *dir, as_object *obj);
+    bool scanAndLoad(as_object &obj);
+    bool scanAndLoad(const char *dir, as_object &obj);
     // open a module
     // initialize the module within Gnash
-    bool initModule(const char *module, as_object *obj);
-    bool initNewObject(as_object *obj);
+    bool initModule(const char *module, as_object &obj);
+    bool initNewObject(as_object &obj);
     void dumpModules();
 private:
     std::vector<std::string> _modules;

Index: libbase/sharedlib.cpp
===================================================================
RCS file: /sources/gnash/gnash/libbase/sharedlib.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- libbase/sharedlib.cpp       24 Nov 2006 19:07:14 -0000      1.7
+++ libbase/sharedlib.cpp       24 Nov 2006 19:17:37 -0000      1.8
@@ -14,7 +14,7 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-/* $Id: sharedlib.cpp,v 1.7 2006/11/24 19:07:14 nihilus Exp $ */
+/* $Id: sharedlib.cpp,v 1.8 2006/11/24 19:17:37 rsavoye Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -85,9 +85,6 @@
     : _filespec(0)
 {
     GNASH_REPORT_FUNCTION;
-
-    char *plugindir;
-    
 #ifdef LT_DLMUTEX
 //     return lt_dlmutex_register (gnash_mutex_lock, gnash_mutex_unlock,
 //                                 gnash_mutex_seterror, gnash_mutex_geterror);
@@ -153,8 +150,6 @@
 {
     GNASH_REPORT_FUNCTION;
     
-    int errors = 0;
-    
 #if 0
     // ltdl should use the same mallocation as us
     lt_dlmalloc = (lt_ptr (*) (size_t)) xmalloc;

Index: libbase/sharedlib.h
===================================================================
RCS file: /sources/gnash/gnash/libbase/sharedlib.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- libbase/sharedlib.h 24 Nov 2006 04:45:05 -0000      1.3
+++ libbase/sharedlib.h 24 Nov 2006 19:17:37 -0000      1.4
@@ -26,6 +26,11 @@
 #include <ltdl.h>
 #include "as_object.h"
 
+// Used on Darwin for basename
+#ifdef HAVE_LIBGEN_H
+#include <libgen.h>
+#endif
+
 namespace gnash 
 {
   
@@ -36,7 +41,7 @@
 public:
     // Typedefs for function pointers to keep the code readable
     typedef bool entrypoint (void *obj);
-    typedef void initentry (as_object *obj);
+    typedef void initentry (as_object &obj);
     
     SharedLib();
     SharedLib(const char *filespec);

Index: extensions/dejagnu/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/extensions/dejagnu/Makefile.am,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- extensions/dejagnu/Makefile.am      24 Nov 2006 04:45:05 -0000      1.1
+++ extensions/dejagnu/Makefile.am      24 Nov 2006 19:17:37 -0000      1.2
@@ -28,11 +28,12 @@
 INCLUDES = -I$(srcdir)  \
             -I$(top_srcdir)/libbase \
             -I$(top_srcdir)/server \
-            -I$(top_srcdir)/asobjs \
+            -I$(top_srcdir)/server/vm \
            $(INCLTDL)
 
 AM_LDFLAGS =  \
        $(top_builddir)/backend/libgnashbackend.la \
+       $(top_builddir)/server/vm/libgnashvm.la \
        $(LIBADD_DL) \
        $(LIBLTDL) \
        $(PTHREAD_LIBS) \

Index: extensions/dejagnu/dejagnu.cpp
===================================================================
RCS file: /sources/gnash/gnash/extensions/dejagnu/dejagnu.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- extensions/dejagnu/dejagnu.cpp      24 Nov 2006 04:45:05 -0000      1.1
+++ extensions/dejagnu/dejagnu.cpp      24 Nov 2006 19:17:37 -0000      1.2
@@ -146,7 +146,7 @@
 
 extern "C" {
     void
-    dejagnu_class_init(as_object *obj)
+    dejagnu_class_init(as_object &obj)
     {
        GNASH_REPORT_FUNCTION;
        // This is going to be the global "class"/"function"
@@ -159,7 +159,7 @@
        }
        
        printf ("Hello World from %s !!!\n", __PRETTY_FUNCTION__);
-       obj->set_member("DejaGnu", cl.get());
+       obj.set_member("DejaGnu", cl.get());
     }
 } // end of extern C
 

Index: extensions/dejagnu/dejagnu.h
===================================================================
RCS file: /sources/gnash/gnash/extensions/dejagnu/dejagnu.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- extensions/dejagnu/dejagnu.h        24 Nov 2006 04:45:05 -0000      1.1
+++ extensions/dejagnu/dejagnu.h        24 Nov 2006 19:17:37 -0000      1.2
@@ -48,7 +48,7 @@
 };
 
 extern "C" {
-    void dejagnu_class_init(as_object *obj);  
+    void dejagnu_class_init(as_object &obj);  
 }
 
 /// Return an  instance