[Gnash-commit] gnash ./configure.ac ./ChangeLog testsuite/libb...

[Rob Savoye]

CVSROOT:        /sources/gnash
Module name:    gnash
Branch:         
Changes by:     Rob Savoye <address@hidden>     06/05/29 14:22:05

Modified files:
        .              : configure.ac ChangeLog 
        testsuite/libbase: Makefile.am 
        libbase        : Makefile.am curl_adapter.cpp 
Added files:
        testsuite/libbase: TCXXRc.cpp gnashrc.in 
        libbase        : rc.cpp rc.h 

Log message:
        * configure.ac: Link to the test config file in
        testuites/libbase.
        * libbase/Makefile.am: Add rc.{h,cpp}.
        * libbase/rc.h, rc.cpp: Config file support.
        * testsuite/libbase/Makefile.am: Add Rc file test case.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/configure.ac.diff?tr1=1.82&tr2=1.83&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/ChangeLog.diff?tr1=1.386&tr2=1.387&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/testsuite/libbase/Makefile.am.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/testsuite/libbase/TCXXRc.cpp?rev=1.1
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/testsuite/libbase/gnashrc.in?rev=1.1
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/libbase/Makefile.am.diff?tr1=1.28&tr2=1.29&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/libbase/curl_adapter.cpp.diff?tr1=1.4&tr2=1.5&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/libbase/rc.cpp?rev=1.1
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/libbase/rc.h?rev=1.1

Patches:
Index: gnash/ChangeLog
diff -u gnash/ChangeLog:1.386 gnash/ChangeLog:1.387
--- gnash/ChangeLog:1.386       Mon May 29 12:58:49 2006
+++ gnash/ChangeLog     Mon May 29 14:22:05 2006
@@ -1,3 +1,11 @@
+2006-05-30 Rob Savoye <address@hidden>
+
+       * configure.ac: Link to the test config file in
+       testuites/libbase.
+       * libbase/Makefile.am: Add rc.{h,cpp}.
+       * libbase/rc.h, rc.cpp: Config file support.
+       * testsuite/libbase/Makefile.am: Add Rc file test case.
+
 2006-05-29 Stefan Schweizer <address@hidden>
 
        * macros/gtkglext.m4: Fix gnash building with confcache.
Index: gnash/configure.ac
diff -u gnash/configure.ac:1.82 gnash/configure.ac:1.83
--- gnash/configure.ac:1.82     Wed May 24 13:54:42 2006
+++ gnash/configure.ac  Mon May 29 14:22:05 2006
@@ -417,6 +417,7 @@
 dnl fi
 
 dnl AC_CONFIG_LINKS(doc/C/images)
+AC_CONFIG_LINKS(testsuite/libbase/gnashrc:testsuite/libbase/gnashrc.in)
 plugmk=""
 if test x"$plugin" = x"yes"; then
 plugmk="plugin/Makefile plugin/mozilla-sdk/Makefile"
Index: gnash/libbase/Makefile.am
diff -u gnash/libbase/Makefile.am:1.28 gnash/libbase/Makefile.am:1.29
--- gnash/libbase/Makefile.am:1.28      Mon May 15 22:24:24 2006
+++ gnash/libbase/Makefile.am   Mon May 29 14:22:05 2006
@@ -55,20 +55,6 @@
 AM_CXXFLAGS = $(INCLUDES)
 AM_CPPFLAGS = #-Wall
 
-# These will only be used if anyone changes the demo to actually have
-# a main() routine and do something instead of just compile.
-# AM_LDFLAGS = \
-#         $(OPENGL_LIBS) \
-#         $(SDL_LIBS) \
-#         $(SDL_MIXER_LIBS) \
-#         $(X_LIBS) \
-#         $(JPEG_LIBS) \
-#         $(PNG_LIBS) \
-#         $(LIBXML_LIBS) \
-#         $(DMALLOC_LIBS) \
-#         $(MAD_LIBS) \
-#         $(OGG_LIBS)
-
 lib_LTLIBRARIES = libgnashbase.la
 
 # These headers get installed
@@ -80,27 +66,28 @@
 endif
 
 libgnashbase_la_SOURCES = \
-       config.cpp              \
-       container.cpp           \
-       $(DMALLOC_FILE)         \
-       image.cpp               \
-       image_filters.cpp       \
-       jpeg.cpp                \
-       log.cpp                 \
-       membuf.cpp              \
-       ogl.cpp                 \
-       postscript.cpp          \
-       triangulate_float.cpp   \
-       triangulate_sint32.cpp  \
-       tu_file.cpp             \
-       tu_file_SDL.cpp         \
-       tu_random.cpp           \
-       tu_timer.cpp            \
-       tu_types.cpp            \
-       utf8.cpp                \
-       utility.cpp             \
-       curl_adapter.cpp        \
-       zlib_adapter.cpp        \
+       config.cpp \
+       container.cpp \
+       $(DMALLOC_FILE) \
+       image.cpp \
+       image_filters.cpp \
+       jpeg.cpp \
+       log.cpp \
+       membuf.cpp \
+       ogl.cpp \
+       postscript.cpp \
+       rc.cpp \
+       triangulate_float.cpp \
+       triangulate_sint32.cpp \
+       tu_file.cpp \
+       tu_file_SDL.cpp \
+       tu_random.cpp \
+       tu_timer.cpp \
+       tu_types.cpp \
+       utf8.cpp \
+       utility.cpp \
+       curl_adapter.cpp \
+       zlib_adapter.cpp \
        URL.cpp
 
 libgnashbase_la_LIBADD = \
@@ -109,32 +96,33 @@
        $(CURL_LIBS)
 
 noinst_HEADERS = \
-       container.h             \
-       demo.h                  \
-       dlmalloc.h              \
-       GnashException.h        \
-       grid_index.h            \
-       image.h                 \
-       jpeg.h                  \
-       membuf.h                \
-       ogl.h                   \
-       log.h                   \
-       postscript.h            \
-       smart_ptr.h             \
-       triangulate.h           \
-       triangulate_impl.h      \
-       tu_config.h             \
-       tu_file.h               \
-       tu_math.h               \
-       tu_opengl_includes.h    \
-       tu_random.h             \
-       tu_swap.h               \
-       tu_timer.h              \
-       tu_types.h              \
-       utf8.h                  \
-       utility.h               \
-       curl_adapter.h          \
-       zlib_adapter.h          \
+       container.h \
+       demo.h \
+       dlmalloc.h \
+       GnashException.h \
+       grid_index.h \
+       image.h \
+       jpeg.h \
+       membuf.h \
+       ogl.h \
+       log.h \
+       postscript.h \
+       rc.h \
+       smart_ptr.h \
+       triangulate.h \
+       triangulate_impl.h \
+       tu_config.h \
+       tu_file.h \
+       tu_math.h \
+       tu_opengl_includes.h \
+       tu_random.h \
+       tu_swap.h \
+       tu_timer.h \
+       tu_types.h \
+       utf8.h \
+       utility.h \
+       curl_adapter.h \
+       zlib_adapter.h \
        URL.h
 
 #libbase_la_LDFLAGS = -module -avoid-version -no-undefined
Index: gnash/libbase/curl_adapter.cpp
diff -u gnash/libbase/curl_adapter.cpp:1.4 gnash/libbase/curl_adapter.cpp:1.5
--- gnash/libbase/curl_adapter.cpp:1.4  Mon May 15 22:24:24 2006
+++ gnash/libbase/curl_adapter.cpp      Mon May 29 14:22:05 2006
@@ -506,7 +506,5 @@
 
 // Local Variables:
 // mode: C++
-// c-basic-offset: 8 
-// tab-width: 8
 // indent-tabs-mode: t
 // End:
Index: gnash/testsuite/libbase/Makefile.am
diff -u gnash/testsuite/libbase/Makefile.am:1.2 
gnash/testsuite/libbase/Makefile.am:1.3
--- gnash/testsuite/libbase/Makefile.am:1.2     Sun May 14 22:47:01 2006
+++ gnash/testsuite/libbase/Makefile.am Mon May 29 14:22:05 2006
@@ -69,13 +69,15 @@
         -I$(top_srcdir)/libbase \
         -I$(top_srcdir)/server  \
         -I$(top_srcdir)/libgeometry \
-        $(MING_CFLAGS)
+        $(MING_CFLAGS) \
+       $(LIBXML_CFLAGS)
 
 abs_builddir=$(shell cd $(top_builddir)/testsuite/libbase; pwd)
 
 noinst_PROGRAMS = \
        CurlStreamTest  \
-       URLTest
+       URLTest \
+       RcTest
 
 CurlStreamTest_SOURCES = CurlStreamTest.cpp
 CurlStreamTest_CPPFLAGS = '-DINPUT="$(srcdir)/CurlStreamTest.cpp"'
@@ -83,3 +85,9 @@
 URLTest_SOURCES = URLTest.cpp
 URLTest_CPPFLAGS = '-DBUILDDIR="$(abs_builddir)"'
 
+RcTest_SOURCES = TCXXRc.cpp
+RcTest_CPPFLAGS = -DSRCDIR="$(srcdir)"
+
+LogTest_SOURCES = TCXXLog.cpp
+LogTest_CPPFLAGS = '-DBUILDDIR="$(abs_builddir)"'
+