carnold 2005/01/12 12:13:56
Modified: . build.xml configure.in
include/log4cxx/helpers gnomexml.h
Added: include/log4cxx/rolling .cvsignore
include/log4cxx/spi/location .cvsignore
tests/src/db .cvsignore
tests/src/nt .cvsignore
tests/src/rolling .cvsignore
Log:
DOMConfiguration (linux pass), build and gump fixes
Revision Changes Path
1.19 +3 -4 logging-log4cxx/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/logging-log4cxx/build.xml,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- build.xml 12 Jan 2005 04:37:11 -0000 1.18
+++ build.xml 12 Jan 2005 20:13:56 -0000 1.19
@@ -255,10 +255,7 @@
outtype="shared"
objdir="${obj.dir}"
debug="${debug}">
- <fileset dir="${src.dir}" includes="*.cpp">
- <!-- exclusions while jump starting with APR -->
- <exclude name="**/gnomexml.cpp"/>
- </fileset>
+ <fileset dir="${src.dir}" includes="*.cpp"/>
<includepath path="${include.dir}"/>
<includepath path="/usr/include/libxml2" if="is-unix"/>
<includepath path="${apr.include.dir}"/>
@@ -687,5 +684,7 @@
</target>
<target name="test-all" depends="build-log4cxx, run-unittest"/>
+
+<target name="gump" depends="build-log4cxx, header-check"/>
</project>
1.48 +2 -2 logging-log4cxx/configure.in
Index: configure.in
===================================================================
RCS file: /home/cvs/logging-log4cxx/configure.in,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- configure.in 7 Jan 2005 18:38:38 -0000 1.47
+++ configure.in 12 Jan 2005 20:13:56 -0000 1.48
@@ -24,7 +24,7 @@
[/* no explicit exports */
#define LOG4CXX_EXPORT])
-AM_INIT_AUTOMAKE(log4cxx, 0.9.7)
+AM_INIT_AUTOMAKE(log4cxx, 0.9.8)
# Checks for programs
#
----------------------------------------------------------------------------
@@ -394,11 +394,11 @@
tests/src/net/Makefile
tests/src/nt/Makefile
tests/src/pattern/Makefile
+tests/src/rolling/Makefile
tests/src/util/Makefile
tests/src/xml/Makefile
tests/src/varia/Makefile
tests/witness/Makefile
-tests/rolling/Makefile
performance/Makefile
performance/xml/Makefile
examples/Makefile
1.13 +3 -4 logging-log4cxx/include/log4cxx/helpers/gnomexml.h
Index: gnomexml.h
===================================================================
RCS file: /home/cvs/logging-log4cxx/include/log4cxx/helpers/gnomexml.h,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- gnomexml.h 12 Jan 2005 04:37:11 -0000 1.12
+++ gnomexml.h 12 Jan 2005 20:13:56 -0000 1.13
@@ -17,11 +17,9 @@
#ifndef _LOG4CXX_HELPERS_GNOMEXML_H
#define _LOG4CXX_HELPERS_GNOMEXML_H
-#error this file isn't obsolete but soon will be
-
#include <log4cxx/portability.h>
-#ifndef _WIN32
+#if !defined(_WIN32)
#include <log4cxx/helpers/xml.h>
#include <log4cxx/helpers/objectimpl.h>
@@ -43,6 +41,7 @@
namespace log4cxx
{
+ class File;
namespace helpers
{
class GnomeXMLDOMNode :
@@ -91,7 +90,7 @@
virtual XMLDOMNodeType getNodeType()
{ return XMLDOMNode::DOCUMENT_NODE; }
virtual XMLDOMDocumentPtr getOwnerDocument();
- virtual void load(const LogString& fileName);
+ virtual void load(const File& fileName);
virtual XMLDOMElementPtr getDocumentElement();
virtual XMLDOMElementPtr getElementById(
const LogString& tagName, const LogString&
elementId);
1.1 logging-log4cxx/include/log4cxx/rolling/.cvsignore
Index: .cvsignore
===================================================================
Makefile
Makefile.in
1.1 logging-log4cxx/include/log4cxx/spi/location/.cvsignore
Index: .cvsignore
===================================================================
Makefile
Makefile.in
1.1 logging-log4cxx/tests/src/db/.cvsignore
Index: .cvsignore
===================================================================
Makefile
Makefile.in
.deps
.libs
1.1 logging-log4cxx/tests/src/nt/.cvsignore
Index: .cvsignore
===================================================================
Makefile
Makefile.in
.deps
.libs
1.1 logging-log4cxx/tests/src/rolling/.cvsignore
Index: .cvsignore
===================================================================
Makefile
Makefile.in
.deps
.libs
