[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gnash-commit] gnash configure.ac Makefile.am ChangeLog gui/Ma...
|
From: |
Rob Savoye |
|
Subject: |
[Gnash-commit] gnash configure.ac Makefile.am ChangeLog gui/Ma... |
|
Date: |
Sun, 17 Dec 2006 20:24:58 +0000 |
CVSROOT: /sources/gnash
Module name: gnash
Changes by: Rob Savoye <rsavoye> 06/12/17 20:24:58
Modified files:
. : configure.ac Makefile.am ChangeLog
gui : Makefile.am
utilities : Makefile.am
libbase : log.cpp network.cpp network.h
server : Makefile.am impl.cpp
server/asobj : Global.cpp
server/vm : Makefile.am
extensions : Makefile.am
extensions/dejagnu: Makefile.am dejagnu.cpp test.as
extensions/mysql: Makefile.am mysql_db.cpp test.as
Added files:
macros : mysql.m4
Log message:
* configure.ac: USe new GNASH_PATH_MYSQL instead of
GNASH_PKG_FIND. Fix debug display. Don't build extensions by
default. Don't build extensions by default.
* server/asobjs/Global.cpp: If extensions are enabled, scan the
plugin directories and load them.
* Makefile.am: Only build in the extensions or cygnal
directories
if enabled. Add MYSQL to dumpconfig. Dump $SUBDIRS list too.
* libbase/network.cpp: Change from log_msg() to
GNASH_REPORT_FUNCTION.
* gui/Makefile.am: Add MYSQL_LIBS if extensions are enabled.
* utilities/Makefile.am: Add MYSQL_LIBS if extensions are
enabled.
* macros/mysql.m4: New file to find MySQL dependancies. Uses
mysql-config, and then a path search if that fails.
* extensions/Makefile.am: Don't try to build MySQL extension if
MySQL isn't installed.
* extensions/mysql/Makefile.am: Use new MYSQL_* flags from new
macro.
* extensions/mysql/mysql_db.cpp: Attach the Interfaces when
initializing.
* extensions/mysql/test.as: Don't try to run if extensions are
disabled.
* extensions/dejagnu/test.as: Don't try to run if extensions are
disabled.
* extensions/dejagnu/Makefile.am: Add libgnashvm.
* extensions/dejagnu/dejagnu.cpp: Attach the Interfaces when
initializing.
* libbase/log.cpp: Only check for verbose not being zero when
tracing.
* server/vm/Makefile.am: Install the gnashvm library, so
extensions work again.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/configure.ac?cvsroot=gnash&r1=1.225&r2=1.226
http://cvs.savannah.gnu.org/viewcvs/gnash/Makefile.am?cvsroot=gnash&r1=1.53&r2=1.54
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.1951&r2=1.1952
http://cvs.savannah.gnu.org/viewcvs/gnash/gui/Makefile.am?cvsroot=gnash&r1=1.52&r2=1.53
http://cvs.savannah.gnu.org/viewcvs/gnash/utilities/Makefile.am?cvsroot=gnash&r1=1.42&r2=1.43
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/mysql.m4?cvsroot=gnash&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/log.cpp?cvsroot=gnash&r1=1.39&r2=1.40
http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/network.cpp?cvsroot=gnash&r1=1.19&r2=1.20
http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/network.h?cvsroot=gnash&r1=1.11&r2=1.12
http://cvs.savannah.gnu.org/viewcvs/gnash/server/Makefile.am?cvsroot=gnash&r1=1.96&r2=1.97
http://cvs.savannah.gnu.org/viewcvs/gnash/server/impl.cpp?cvsroot=gnash&r1=1.84&r2=1.85
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/Global.cpp?cvsroot=gnash&r1=1.25&r2=1.26
http://cvs.savannah.gnu.org/viewcvs/gnash/server/vm/Makefile.am?cvsroot=gnash&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/gnash/extensions/Makefile.am?cvsroot=gnash&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/gnash/extensions/dejagnu/Makefile.am?cvsroot=gnash&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/gnash/extensions/dejagnu/dejagnu.cpp?cvsroot=gnash&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/gnash/extensions/dejagnu/test.as?cvsroot=gnash&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/gnash/extensions/mysql/Makefile.am?cvsroot=gnash&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/gnash/extensions/mysql/mysql_db.cpp?cvsroot=gnash&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/gnash/extensions/mysql/test.as?cvsroot=gnash&r1=1.1&r2=1.2
Patches:
Index: configure.ac
===================================================================
RCS file: /sources/gnash/gnash/configure.ac,v
retrieving revision 1.225
retrieving revision 1.226
diff -u -b -r1.225 -r1.226
--- configure.ac 17 Dec 2006 02:38:55 -0000 1.225
+++ configure.ac 17 Dec 2006 20:24:57 -0000 1.226
@@ -15,7 +15,7 @@
dnl Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
dnl
-dnl $Id: configure.ac,v 1.225 2006/12/17 02:38:55 rsavoye Exp $
+dnl $Id: configure.ac,v 1.226 2006/12/17 20:24:57 rsavoye Exp $
AC_PREREQ(2.50)
AC_INIT(gnash, cvs)
@@ -96,12 +96,12 @@
AM_CONDITIONAL(XML, test x$xml = xyes)
dnl Don't build the extensions if specified.
-AC_ARG_ENABLE(extensions, AC_HELP_STRING([--disable-extensions], [Disable
support for Gnash EXTENSIONS]),
+AC_ARG_ENABLE(extensions, AC_HELP_STRING([--enable-extensions], [Enable
support for Gnash EXTENSIONS]),
[case "${enableval}" in
yes) extensions=yes ;;
no) extensions=no ;;
- *) AC_MSG_ERROR([bad value ${enableval} for disable-extensions option]) ;;
-esac],extensions=yes)
+ *) AC_MSG_ERROR([bad value ${enableval} for enable-extensions option]) ;;
+esac],extensions=no)
AM_CONDITIONAL(EXTENSIONS, test x$extensions = xyes)
@@ -232,7 +232,7 @@
no) mp3_decoder=none ;;
*) AC_MSG_ERROR([invalid mp3_decoder ${withval} given (accept:
ffmpeg|mad)]) ;;
esac],
- [mp3_decoder=mad]
+ [mp3_decoder=ffmpeg]
)
if test x"$sound_handler" != xsdl -a x"$mp3_decoder" != xnone; then
@@ -441,7 +441,14 @@
dnl AC_CHECK_LIB(c, mremap)
GNASH_PKG_FIND(z, [zlib.h], [zlib compression library], compress)
GNASH_PKG_FIND(jpeg, [jpeglib.h], [jpeg images], jpeg_mem_init)
-GNASH_PKG_FIND(mysqlclient, [mysql/mysql.h], [MySQL database], mysql_init)
+
+dnl if we're not building the extensions, then the _FLAGS and _LIBS settings
+dnl found in these tests are blank. This way they can be used in
+dnl Makefiles, but won't add bloat to the Makefiles.
+if test x$extensions = xyes; then
+ GNASH_PATH_MYSQL
+ AC_DEFINE(USE_EXTENSIONS, [], [Defined if you enable building the
exetensions])
+fi
AM_CONDITIONAL(ENABLE_MYSQL, [ test x"$mysql" = xyes ])
dnl currently unused
@@ -881,11 +888,17 @@
fi
if test x"$extensions" = x"yes"; then
- echo " Build extensions enabled (default). Use --disable-extensions
to disable."
+ echo " Building extensions enabled (default). Use
--disable-extensions to disable."
else
echo " Building Gnash extensions disabled."
fi
+if test x"$cygnal" = x"yes"; then
+ echo " Building Cygnal media server enabled (default). Use
--disable-cygnal to disable."
+else
+ echo " Building Cygnal media server disabled."
+fi
+
echo " Renderer engine: "$renderer
echo " GUI: "$gui
echo " Sound handler: "$sound_handler
@@ -893,7 +906,6 @@
echo " MP3 decoder: "$mp3_decoder
fi
-
echo ""
echo "Configured paths for ${build} are:"
@@ -922,13 +934,15 @@
fi
fi
-if test x$mysql != xno; then
- if test x"$MYSQLCLIENT_LIBS" != x; then
- echo " MYSQL flags are: $MYSQCLIENT_CFLAGS"
- echo " MYSQL libs are: $MYSQLCLIENT_LIBS"
+if test x$extensions = xyes; then
+ if test x$mysql != xno; then
+ if test x"$MYSQL_LIBS" != x; then
+ echo " MYSQL flags are: $MYSQC_CFLAGS"
+ echo " MYSQL libs are: $MYSQL_LIBS"
else
echo " ERROR: No MySQL development package installed!"
fi
+ fi
fi
if test x$kde = xyes; then
Index: Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/Makefile.am,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -b -r1.53 -r1.54
--- Makefile.am 28 Nov 2006 12:10:26 -0000 1.53
+++ Makefile.am 17 Dec 2006 20:24:57 -0000 1.54
@@ -15,7 +15,7 @@
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#
-# $Id: Makefile.am,v 1.53 2006/11/28 12:10:26 strk Exp $
+# $Id: Makefile.am,v 1.54 2006/12/17 20:24:57 rsavoye Exp $
## Process this file with automake to produce Makefile.in
AUTOMAKE_OPTIONS = 1.6.0
@@ -34,8 +34,6 @@
testsuite \
$(NULL)
-#extensions
-
if PLUGIN
if HAVE_GTK2
PLUGIN_DIRS = plugin
@@ -46,7 +44,15 @@
DOC_DIRS = doc
endif
-SUBDIRS = $(STD_DIRS) $(DOC_DIRS) $(PLUGIN_DIRS)
+if CYGNAL
+CYGNAL_DIRS = cygnal
+endif
+
+if EXTENSIONS
+EXTEND_DIRS = extensions
+endif
+
+SUBDIRS = $(STD_DIRS) $(DOC_DIRS) $(PLUGIN_DIRS) $(EXTEND_DIRS)
$(CYGNAL_DIRS)
man_MANS = doc/gnash.1
@@ -129,7 +135,9 @@
dumpconfig:
@uname -a
- $(CC) -v
+ $(CXX) -v
+ @echo "MYSQL_CFLAGS is $(MYSQL_CFLAGS)"
+ @echo "MYSQL_LIBS is $(MYSQL_LIBS)"
@echo "JPEG_CFLAGS is $(JPEG_CFLAGS)"
@echo "JPEG_LIBS is $(JPEG_LIBS)"
@echo "PNG_CFLAGS is $(PNG_CFLAGS)"
@@ -186,6 +194,9 @@
@echo "default system header location. All the LIBS should have a"
@echo "legit value"
@echo ""
+ @echo "Building in directories: $(SUBDIRS)"
+ @echo "Some directories may be excluded from the build"
+ @echo ""
@echo "Configurable options are:"
@echo "Sound handler: $(SOUND_OPT)"
@echo "MP3 decoder: $(ENGINE_OPT)"
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.1951
retrieving revision 1.1952
diff -u -b -r1.1951 -r1.1952
--- ChangeLog 17 Dec 2006 20:19:16 -0000 1.1951
+++ ChangeLog 17 Dec 2006 20:24:57 -0000 1.1952
@@ -1,3 +1,35 @@
+2006-12-17 Rob Savoye <address@hidden>
+
+ * configure.ac: USe new GNASH_PATH_MYSQL instead of
+ GNASH_PKG_FIND. Fix debug display. Don't build extensions by
+ default. Don't build extensions by default.
+ * server/asobjs/Global.cpp: If extensions are enabled, scan the
+ plugin directories and load them.
+ * Makefile.am: Only build in the extensions or cygnal directories
+ if enabled. Add MYSQL to dumpconfig. Dump $SUBDIRS list too.
+ * libbase/network.cpp: Change from log_msg() to
+ GNASH_REPORT_FUNCTION.
+ * gui/Makefile.am: Add MYSQL_LIBS if extensions are enabled.
+ * utilities/Makefile.am: Add MYSQL_LIBS if extensions are enabled.
+ * macros/mysql.m4: New file to find MySQL dependancies. Uses
+ mysql-config, and then a path search if that fails.
+ * extensions/Makefile.am: Don't try to build MySQL extension if
+ MySQL isn't installed.
+ * extensions/mysql/Makefile.am: Use new MYSQL_* flags from new
+ macro.
+ * extensions/mysql/mysql_db.cpp: Attach the Interfaces when
+ initializing.
+ * extensions/mysql/test.as: Don't try to run if extensions are
+ disabled.
+ * extensions/dejagnu/test.as: Don't try to run if extensions are
+ disabled.
+ * extensions/dejagnu/Makefile.am: Add libgnashvm.
+ * extensions/dejagnu/dejagnu.cpp: Attach the Interfaces when
+ initializing.
+ * libbase/log.cpp: Only check for verbose not being zero when tracing.
+ * server/vm/Makefile.am: Install the gnashvm library, so
+ extensions work again.
+
2006-12-17 Markus Gothe <address@hidden>
* libamf/amf.cpp: reinterive cast.
@@ -22,7 +54,7 @@
* cygnal/netstats.cpp, netstats.h: Collect statistics on
network performance.
* cygnal/statistics.cpp, statistics.h: Collect statistics on each
- movie being played for performance tweaking.
+ movie being played for performance tweaking and bandwidth shaping.
* cygnal/http.c, http.h: Support for a simple subset of HTTP,
enough to respond to GET requests.
* cygnal/alloc.cpp: Threadsafe new & delete to keep STL containers
@@ -44,10 +76,9 @@
* server/array.cpp: Add the size operator, which wasn't being added
as a member.
- * extensions/mysql/Makefile.am:
* extensions/mysql/mysql_table.h: Remove.
* extensions/mysql/mysql_db.cpp, mysql_db.h: Tottally
- reqritten. Work as a Gnash extension. Add methods for MySQL API,
+ rewritten. Work as a Gnash extension. Add methods for MySQL API,
as well as a generic getData() method for simple queries.
* extensions/mysql/test.as: Test the MySQL extension.
* extensions/mysql/test.sql: MySQL schema for test case.
Index: gui/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/gui/Makefile.am,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -b -r1.52 -r1.53
--- gui/Makefile.am 17 Dec 2006 01:49:49 -0000 1.52
+++ gui/Makefile.am 17 Dec 2006 20:24:57 -0000 1.53
@@ -17,7 +17,7 @@
#
-# $Id: Makefile.am,v 1.52 2006/12/17 01:49:49 rsavoye Exp $
+# $Id: Makefile.am,v 1.53 2006/12/17 20:24:57 rsavoye Exp $
AUTOMAKE_OPTIONS =
@@ -220,6 +220,7 @@
gnash_LDFLAGS = -export-dynamic
gnash_DEPENDENCIES = $(GNASH_LIBS)
gnash_LDADD = \
+ $(MYSQL_LIBS) \
$(GNASH_LIBS)
# $(LIBLTDL) "-dlopen" self "-dlopen"
Index: utilities/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/utilities/Makefile.am,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -b -r1.42 -r1.43
--- utilities/Makefile.am 1 Dec 2006 16:35:39 -0000 1.42
+++ utilities/Makefile.am 17 Dec 2006 20:24:57 -0000 1.43
@@ -27,18 +27,18 @@
$(top_builddir)/server/libgnashserver.la \
$(top_builddir)/libbase/libgnashbase.la
-#AM_CPPFLAGS = # -Wall
-
## WARNING: make sure GLIB_LIBS appears first
## See: http://lists.gnu.org/archive/html/gnash-dev/2006-07/msg00076.html
AM_LDFLAGS = \
$(CURL_LIBS) \
$(LIBADD_DL) \
$(LIBLTDL) \
+ $(MYSQL_LIBS) \
$(NULL)
# $(GLIB_LIBS) \
# $(PTHREAD_LIBS)
+#AM_CPPFLAGS = # -Wall
AM_CPPFLAGS = -I.. \
-I$(top_srcdir) \
-I$(top_srcdir)/libgeometry \
@@ -48,6 +48,7 @@
-I$(top_srcdir)/server/vm \
$(BOOST_CFLAGS) \
$(LIBXML_CFLAGS) \
+ $(MYSQL_CFLAGS) \
$(NULL)
if USE_FFMPEG_ENGINE
Index: libbase/log.cpp
===================================================================
RCS file: /sources/gnash/gnash/libbase/log.cpp,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -b -r1.39 -r1.40
--- libbase/log.cpp 8 Dec 2006 12:56:29 -0000 1.39
+++ libbase/log.cpp 17 Dec 2006 20:24:57 -0000 1.40
@@ -18,7 +18,7 @@
//
//
-/* $Id: log.cpp,v 1.39 2006/12/08 12:56:29 strk Exp $ */
+/* $Id: log.cpp,v 1.40 2006/12/17 20:24:57 rsavoye Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -609,7 +609,6 @@
cout << c;
}
}
-
if (_write) {
_outstream << c;
}
@@ -692,7 +691,7 @@
{
scoped_lock lock(io_mutex);
if (_trace) {
- if (_verbose >= TRACELEVEL) {
+ if (_verbose) {
cout << "\r" << endl;
}
} else {
Index: libbase/network.cpp
===================================================================
RCS file: /sources/gnash/gnash/libbase/network.cpp,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -b -r1.19 -r1.20
--- libbase/network.cpp 1 Dec 2006 10:22:12 -0000 1.19
+++ libbase/network.cpp 17 Dec 2006 20:24:57 -0000 1.20
@@ -110,14 +110,16 @@
bool
Network::createServer(void)
{
- log_msg("%s: \n", __PRETTY_FUNCTION__);
+ GNASH_REPORT_FUNCTION;
+
return createServer(DEFAULTPORT);
}
bool
Network::createServer(short port)
{
- log_msg("%s: \n", __PRETTY_FUNCTION__);
+ GNASH_REPORT_FUNCTION;
+
struct protoent *ppe;
struct sockaddr_in sock_in;
int on, type;
@@ -216,7 +218,7 @@
bool
Network::newConnection(void)
{
- log_msg("%s: \n", __PRETTY_FUNCTION__);
+ GNASH_REPORT_FUNCTION;
return newConnection(true);
}
@@ -224,7 +226,8 @@
bool
Network::newConnection(bool block)
{
- log_msg("%s: \n", __PRETTY_FUNCTION__);
+ GNASH_REPORT_FUNCTION;
+
struct sockaddr newfsin;
socklen_t alen;
int ret;
@@ -306,23 +309,31 @@
bool
Network::createClient(void)
{
+ GNASH_REPORT_FUNCTION;
+
return createClient("localhost", RTMP);
}
bool
Network::createClient(short /* port */)
{
+ GNASH_REPORT_FUNCTION;
+
return false;
}
bool
Network::createClient(const char *hostname)
{
+ GNASH_REPORT_FUNCTION;
+
return createClient(hostname, RTMP);
}
bool
Network::createClient(const char *hostname, short port)
{
+ GNASH_REPORT_FUNCTION;
+
struct sockaddr_in sock_in;
fd_set fdset;
struct timeval tval;
@@ -445,7 +456,8 @@
bool
Network::closeNet()
{
-// log_msg("%s: \n", __PRETTY_FUNCTION__);
+ GNASH_REPORT_FUNCTION;
+
if (_sockfd > 0) {
closeNet(_sockfd);
_sockfd = 0;
@@ -458,6 +470,8 @@
bool
Network::closeNet(int sockfd)
{
+ GNASH_REPORT_FUNCTION;
+
int retries = 0;
// If we can't close the socket, other processes must be
@@ -485,7 +499,7 @@
}
#endif
if (close(sockfd) < 0) {
- log_msg("WARNING: Unable to close the socket for fd%d\n%s\n",
+ log_msg("WARNING: Unable to close the socket for fd #%d\n%s\n",
sockfd, strerror(errno));
#ifndef HAVE_WINSOCK_H
sleep(1);
@@ -503,9 +517,10 @@
bool
Network::closeConnection(void)
{
- log_msg("%s: \n", __FUNCTION__);
+ GNASH_REPORT_FUNCTION;
closeConnection(_sockfd);
+ _sockfd = 0;
_listenfd = 0;
_connected = false;
@@ -515,9 +530,11 @@
bool
Network::closeConnection(int fd)
{
- log_msg("%s: \n", __FUNCTION__);
+ GNASH_REPORT_FUNCTION;
+
if (fd > 0) {
- closeConnection(fd);
+ ::close(fd);
+// closeNet(fd);
}
return false;
@@ -743,3 +760,8 @@
} // end of gnash namespace
+
+// Local Variables:
+// mode: C++
+// indent-tabs-mode: t
+// End:
Index: libbase/network.h
===================================================================
RCS file: /sources/gnash/gnash/libbase/network.h,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- libbase/network.h 31 Oct 2006 17:59:30 -0000 1.11
+++ libbase/network.h 17 Dec 2006 20:24:57 -0000 1.12
@@ -135,3 +135,7 @@
// __NETWORK_H__
#endif
+// Local Variables:
+// mode: C++
+// indent-tabs-mode: t
+// End:
Index: server/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/server/Makefile.am,v
retrieving revision 1.96
retrieving revision 1.97
diff -u -b -r1.96 -r1.97
--- server/Makefile.am 6 Dec 2006 10:21:32 -0000 1.96
+++ server/Makefile.am 17 Dec 2006 20:24:57 -0000 1.97
@@ -18,7 +18,7 @@
#
#
-# $Id: Makefile.am,v 1.96 2006/12/06 10:21:32 strk Exp $
+# $Id: Makefile.am,v 1.97 2006/12/17 20:24:57 rsavoye Exp $
AUTOMAKE_OPTIONS =
@@ -34,6 +34,7 @@
-I$(top_srcdir)/server/swf \
-I$(top_srcdir)/server/asobj \
-I$(top_srcdir)/server/parser \
+ -I$(top_srcdir)/libltdl \
-I$(top_srcdir)/server/vm \
-I$(top_srcdir)/libbase \
-I$(top_srcdir)/libgeometry \
Index: server/impl.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/impl.cpp,v
retrieving revision 1.84
retrieving revision 1.85
diff -u -b -r1.84 -r1.85
--- server/impl.cpp 6 Dec 2006 10:21:32 -0000 1.84
+++ server/impl.cpp 17 Dec 2006 20:24:57 -0000 1.85
@@ -14,11 +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: impl.cpp,v 1.84 2006/12/06 10:21:32 strk Exp $ */
+/* $Id: impl.cpp,v 1.85 2006/12/17 20:24:57 rsavoye Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
Index: server/asobj/Global.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/Global.cpp,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -b -r1.25 -r1.26
--- server/asobj/Global.cpp 25 Nov 2006 14:56:43 -0000 1.25
+++ server/asobj/Global.cpp 17 Dec 2006 20:24:58 -0000 1.26
@@ -18,7 +18,7 @@
// Implementation of the Global ActionScript Object
-/* $Id: Global.cpp,v 1.25 2006/11/25 14:56:43 strk Exp $ */
+/* $Id: Global.cpp,v 1.26 2006/12/17 20:24:58 rsavoye Exp $ */
#include "as_object.h"
#include "as_prop_flags.h"
@@ -54,6 +54,7 @@
#include "textformat.h"
#include "TextSnapshot.h"
#include "Video.h"
+#include "extension.h"
#include <fn_call.h>
#include <sprite_instance.h>
@@ -67,6 +68,8 @@
namespace gnash {
+static Extension et;
+
static void
as_global_trace(const fn_call& fn)
{
@@ -451,6 +454,15 @@
math_class_init(*this);
key_class_init(*this);
system_class_init(*this);
+
+ // Scan the plugin directories for all plugins, and load them now.
+ // FIXME: this should actually be done dynamically, and only
+ // if a plugin defines a class that a movie actually wants to
+ // use.
+#ifdef USE_EXTENSIONS
+// et.scanDir("/usr/local/lib/gnash/plugins");
+ et.scanAndLoad(*this);
+#endif
}
} // namespace gnash
Index: server/vm/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/server/vm/Makefile.am,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- server/vm/Makefile.am 1 Dec 2006 16:35:39 -0000 1.5
+++ server/vm/Makefile.am 17 Dec 2006 20:24:58 -0000 1.6
@@ -15,14 +15,11 @@
# along with this program; if not, write to the Free Software
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-#
-#
-
-# $Id: Makefile.am,v 1.5 2006/12/01 16:35:39 strk Exp $
+# $Id: Makefile.am,v 1.6 2006/12/17 20:24:58 rsavoye Exp $
AUTOMAKE_OPTIONS =
-noinst_LTLIBRARIES = libgnashvm.la
+lib_LTLIBRARIES = libgnashvm.la
AM_CPPFLAGS = \
-I$(top_srcdir)/backend \
@@ -60,7 +57,7 @@
$(top_builddir)/libamf/libgnashamf.la \
$(top_builddir)/libbase/libgnashbase.la
-libgnashvm_la_LDFLAGS = -avoid-version
+libgnashvm_la_LDFLAGS = -avoid-version -export-dynamic
# Rebuild with GCC 4.x Mudflap support
mudflap:
Index: extensions/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/extensions/Makefile.am,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- extensions/Makefile.am 15 Dec 2006 21:19:25 -0000 1.2
+++ extensions/Makefile.am 17 Dec 2006 20:24:58 -0000 1.3
@@ -17,4 +17,9 @@
AUTOMAKE_OPTIONS =
-SUBDIRS = dejagnu mysql
+# Don't try to build the MySQL extension unless MySQL is actually installed.
+if ENABLE_MYSQL
+MYSQL_DIR = mysql
+endif
+
+SUBDIRS = dejagnu $(MYSQL_DIR)
Index: extensions/dejagnu/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/extensions/dejagnu/Makefile.am,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- extensions/dejagnu/Makefile.am 15 Dec 2006 20:51:43 -0000 1.3
+++ extensions/dejagnu/Makefile.am 17 Dec 2006 20:24:58 -0000 1.4
@@ -31,14 +31,14 @@
AM_LDFLAGS = \
$(top_builddir)/libbase/libgnashbase.la \
+ $(top_builddir)/server/vm/libgnashvm.la \
$(top_builddir)/backend/libgnashbackend.la \
$(top_builddir)/server/libgnashserver.la \
- $(top_builddir)/server/vm/libgnashvm.la \
$(PTHREAD_LIBS) \
$(NULL)
dejagnu_la_SOURCES = dejagnu.cpp dejagnu.h
-dejagnu_la_LDFLAGS = -module -avoid-version
+dejagnu_la_LDFLAGS = -module -avoid-version -no-undefined
dejagnu_la_LIBDADD = $(LIBADD_DL) $(LIBLTDL) $(AM_LDFLAGS)
check_PROGRAMS = SharedTest
Index: extensions/dejagnu/dejagnu.cpp
===================================================================
RCS file: /sources/gnash/gnash/extensions/dejagnu/dejagnu.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- extensions/dejagnu/dejagnu.cpp 15 Dec 2006 20:51:43 -0000 1.3
+++ extensions/dejagnu/dejagnu.cpp 17 Dec 2006 20:24:58 -0000 1.4
@@ -71,9 +71,9 @@
// GNASH_REPORT_FUNCTION;
dejagnu_as_object* obj = new dejagnu_as_object();
-// attachInterface(obj);
+ attachInterface(obj);
fn.result->set_as_object(obj); // will keep alive
- printf ("Hello World from %s !!!\n", __PRETTY_FUNCTION__);
+// printf ("Hello World from %s !!!\n", __PRETTY_FUNCTION__);
}
Index: extensions/dejagnu/test.as
===================================================================
RCS file: /sources/gnash/gnash/extensions/dejagnu/test.as,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- extensions/dejagnu/test.as 24 Nov 2006 04:45:05 -0000 1.1
+++ extensions/dejagnu/test.as 17 Dec 2006 20:24:58 -0000 1.2
@@ -22,26 +22,31 @@
// compile this test case with Ming makeswf, and then
// execute it like this gnash -1 -r 0 -v out.swf
-rcsid="$Id: test.as,v 1.1 2006/11/24 04:45:05 rsavoye Exp $";
+rcsid="$Id: test.as,v 1.2 2006/12/17 20:24:58 rsavoye Exp $";
var tmp = new DejaGnu();
-// test the XML constuctor
+// test the constuctor
if (tmp) {
- pass("DejaGnu() constructor");
+ tmp.pass("DejaGnu() constructor");
} else {
- fail("DejaGnu() constructor");
+ tmp.fail("DejaGnu() constructor");
}
+if (tmp) {
+
if (tmp.pass) {
- trace("DejaGnu::pass exists");
+ tmp. pass("DejaGnu::pass exists");
} else {
- trace("DejaGnu::pass doesn't exist");
+ tmp.fail("DejaGnu::pass doesn't exist");
}
if (tmp.fail) {
- trace("DejaGnu::fail exists");
+ tmp.pass("DejaGnu::fail exists");
} else {
- trace("DejaGnu::fail doesn't exist");
+ tmp.fail("DejaGnu::fail doesn't exist");
}
+} else {
+ trace("UNTESTED: extensions not built!");
+}
Index: extensions/mysql/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/extensions/mysql/Makefile.am,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- extensions/mysql/Makefile.am 15 Dec 2006 20:51:43 -0000 1.1
+++ extensions/mysql/Makefile.am 17 Dec 2006 20:24:58 -0000 1.2
@@ -27,10 +27,10 @@
-I$(top_srcdir)/server \
-I$(top_srcdir)/server/vm \
-I$(top_srcdir)/asobjs \
- $(MYSQLCLIENT_CFLAGS)
+ $(MYSQL_CFLAGS)
AM_LDFLAGS = \
- $(MYSQLCLIENT_LIBS) \
+ $(MYSQL_LIBS) \
$(top_builddir)/server/vm/libgnashvm.la \
$(top_builddir)/backend/libgnashbackend.la \
$(top_builddir)/server/libgnashserver.la \
@@ -38,7 +38,7 @@
$(NULL)
mysql_la_SOURCES = mysql_db.cpp mysql_db.h
-mysql_la_LDFLAGS = -module -avoid-version # -no-undefined
+mysql_la_LDFLAGS = -module -avoid-version -no-undefined
mysql_la_LIBDADD = $(AM_LDFLAGS)
CLEANFILES = \
Index: extensions/mysql/mysql_db.cpp
===================================================================
RCS file: /sources/gnash/gnash/extensions/mysql/mysql_db.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- extensions/mysql/mysql_db.cpp 15 Dec 2006 20:51:43 -0000 1.4
+++ extensions/mysql/mysql_db.cpp 17 Dec 2006 20:24:58 -0000 1.5
@@ -88,6 +88,7 @@
attachInterface(obj);
fn.result->set_as_object(obj); // will keep alive
+// printf ("Hello World from %s !!!\n", __PRETTY_FUNCTION__);
}
@@ -416,7 +417,7 @@
cl = new builtin_function(&mysql_ctor, getInterface());
// // replicate all interface to class, to be able to access
// // all methods as static functions
-// attachInterface(cl.get());
+ attachInterface(cl.get());
}
obj.set_member("MySQL", cl.get());
}
Index: extensions/mysql/test.as
===================================================================
RCS file: /sources/gnash/gnash/extensions/mysql/test.as,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- extensions/mysql/test.as 15 Dec 2006 20:51:43 -0000 1.1
+++ extensions/mysql/test.as 17 Dec 2006 20:24:58 -0000 1.2
@@ -19,7 +19,7 @@
// compile this test case with Ming makeswf, and then
// execute it like this gnash -1 -r 0 -v out.swf
-rcsid="$Id: test.as,v 1.1 2006/12/15 20:51:43 rsavoye Exp $";
+rcsid="$Id: test.as,v 1.2 2006/12/17 20:24:58 rsavoye Exp $";
var runtest = new DejaGnu();
var db = new MySQL();
@@ -31,6 +31,7 @@
runtest.fail("DejaGnu() constructor");
}
+if (db) {
if (db.connect) {
runtest.pass("MySQL::connect exists");
} else {
@@ -99,3 +100,6 @@
runtest.fail("MySQL::disconnect doesn't disconnect");
}
+} else {
+ trace("UNTESTED: Extensions not built!");
+}
Index: macros/mysql.m4
===================================================================
RCS file: macros/mysql.m4
diff -N macros/mysql.m4
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ macros/mysql.m4 17 Dec 2006 20:24:57 -0000 1.1
@@ -0,0 +1,118 @@
+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 $Id: mysql.m4,v 1.1 2006/12/17 20:24:57 rsavoye Exp $
+
+AC_DEFUN([GNASH_PATH_MYSQL],
+[
+ dnl Lool for the header
+ AC_ARG_WITH(mysql-incl, AC_HELP_STRING([--with-mysql-incl], [directory where
mysql headers are]), with_mysql_incl=${withval})
+ AC_CACHE_VAL(ac_cv_path_mysql_incl,[
+ if test x"${with_mysql_incl}" != x ; then
+ if test -f ${with_mysql_incl}/mysql.h ; then
+ ac_cv_path_mysql_incl="-I`(cd ${with_mysql_incl}; pwd)`"
+ else
+ AC_MSG_ERROR([${with_mysql_incl} directory doesn't contain any
headers])
+ fi
+ fi
+ ])
+
+ if test x"${ac_cv_path_mysql_incl}" = x; then
+ AC_CHECK_PROG(mconfig, mysql_config, mysql_config)
+ AC_MSG_RESULT(${ac_cv_prog_mconfig})
+ fi
+ if test x"${ac_cv_prog_mconfig}" = "x" ; then
+ AC_CHECK_PROG(mconfig, mysql-config, mysql-config)
+ fi
+
+ if test x"${ac_cv_prog_mconfig}" != "x" ; then
+ ac_cv_path_mysql_incl=`${mconfig} --cflags`
+ fi
+
+ AC_MSG_CHECKING([for MySQL headers])
+ if test x"${ac_cv_path_mysql_incl}" = x ; then
+ AC_MSG_CHECKING([for mysql header])
+ incllist="${prefix}/include /sw/include /usr/local/include
/home/latest/include /opt/include /opt/local/include /usr/include .. ../.."
+
+ for i in $incllist; do
+ if test -f $i/mysql/mysql.h; then
+ ac_cv_path_mysql_incl="-I$i/mysql"
+ break
+ fi
+ done
+ fi
+
+ if test x"${ac_cv_path_mysql_incl}" != x ; then
+ MYSQL_CFLAGS="${ac_cv_path_mysql_incl}"
+ AC_MSG_RESULT(yes)
+ else
+ MYSQL_CFLAGS=""
+ AC_MSG_RESULT(no)
+ fi
+
+ dnl Look for the library
+ AC_ARG_WITH(mysql-lib, AC_HELP_STRING([--with-mysql-lib], [directory where
mysql libraries are]), with_mysql_lib=${withval})
+ AC_CACHE_VAL(ac_cv_path_mysql_lib,[
+ if test x"${with_mysql_lib}" != x ; then
+ if test -f ${with_mysql_lib}/libmysqlclient.a -o -f
${with_mysql_lib}/libmysqlclient.so; then
+ ac_cv_path_mysql_lib="-L`(cd ${with_mysql_lib}; pwd)`"
+ else
+ AC_MSG_ERROR([${with_mysql_lib} directory doesn't contain mysql
libraries.])
+ fi
+ fi
+ ])
+
+ AC_MSG_CHECKING([for MySQL libraries])
+ if test x"${ac_cv_prog_mconfig}" != "x" ; then
+ ac_cv_path_mysql_lib=`${mconfig} --libs`
+ fi
+
+ if test x"${ac_cv_path_mysql_lib}" = x; then #{
+
+ topdir=""
+
+ AC_CHECK_LIB(mysqlclient, mysql_init,
[ac_cv_path_mysql_lib="-lmysqlclient"], [
+ libslist="${prefix}/lib64 ${prefix}/lib /usr/lib64 /usr/lib /sw/lib
/usr/local/lib /home/latest/lib /opt/lib /opt/local/lib /usr/pkg/lib .. ../.."
+ for i in $libslist; do
+ if test -f $i/libmysqlclient.a -o -f $i/libmysqlclient.so; then
+ topdir=$i
+ if test x"$i" != x"/usr/lib"; then
+ ac_cv_path_mysql_lib="-L$i -lmysqlclient"
+ break
+ else
+ ac_cv_path_mysql_lib="-lmysqlclient"
+ break
+ fi
+ fi
+ done
+ ])
+ AC_MSG_CHECKING([for MySQL client library])
+ AC_MSG_RESULT(${ac_cv_path_mysql_lib})
+ fi #}
+
+
+ if test x"${ac_cv_path_mysql_lib}" != x; then
+ MYSQL_LIBS="${ac_cv_path_mysql_lib}"
+ else
+ MYSQL_LIBS=""
+ fi
+
+ if test x"${ac_cv_path_mysql_incl}" != x -a x"${ac_cv_path_mysql_lib}" != x;
then
+ AC_DEFINE(HAVE_MYSQL, [], [Defined if you have MySQL installed])
+ fi
+ AC_SUBST(MYSQL_CFLAGS)
+ AC_SUBST(MYSQL_LIBS)
+])
- [Gnash-commit] gnash configure.ac Makefile.am ChangeLog gui/Ma...,
Rob Savoye <=