Menu
▾
▴
eas-dev-commit — Commit Log
You can subscribe to this list here.
| 2003 |
Jan
(69) |
Feb
(122) |
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2004 |
Jan
|
Feb
|
Mar
(56) |
Apr
|
May
(1) |
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2006 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
(237) |
Jul
|
Aug
|
Sep
(1) |
Oct
(14) |
Nov
(72) |
Dec
|
| 2007 |
Jan
(2) |
Feb
(37) |
Mar
(5) |
Apr
|
May
(2) |
Jun
|
Jul
(1) |
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: Egor C. <eg...@us...> - 2003-01-28 22:39:17
|
Update of /cvsroot/eas-dev/eas-dev/libs/libsxmlstream/src In directory sc8-pr-cvs1:/tmp/cvs-serv8117/libs/libsxmlstream/src Modified Files: Makefile.am Log Message: @GLIB_CFLAGS@ moved from CFLAGS to CXXFLAGS Index: Makefile.am =================================================================== RCS file: /cvsroot/eas-dev/eas-dev/libs/libsxmlstream/src/Makefile.am,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- Makefile.am 28 Jan 2003 06:44:32 -0000 1.2 +++ Makefile.am 28 Jan 2003 22:39:11 -0000 1.3 @@ -1,5 +1,5 @@ lib_LTLIBRARIES = libsxmlstream.la libsxmlstream_la_SOURCES = sxml.cxx sxmlstream.cxx INCLUDES = -I../include -I$(top_srcdir) -CFLAGS = @GLIB_CFLAGS@ -libsxmlstream_la_LIBADD = -lglib \ No newline at end of file +CXXFLAGS = @GLIB_CFLAGS@ +libsxmlstream_la_LIBADD = -lglib |
|
From: Egor C. <eg...@us...> - 2003-01-28 22:37:03
|
Update of /cvsroot/eas-dev/eas-dev/libs/libsxmlstream/include
In directory sc8-pr-cvs1:/tmp/cvs-serv6701/libs/libsxmlstream/include
Modified Files:
sxml.hxx sxmlstream.hxx
Log Message:
Major code refactoring. _SXml struct --> SXmlNode class. Small performance optimization.
*Warning* Code compiled but not tested!
Index: sxml.hxx
===================================================================
RCS file: /cvsroot/eas-dev/eas-dev/libs/libsxmlstream/include/sxml.hxx,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- sxml.hxx 25 Jan 2003 21:51:28 -0000 1.2
+++ sxml.hxx 28 Jan 2003 22:36:24 -0000 1.3
@@ -7,6 +7,7 @@
/* */
/* Author(s): */
/* Yurii A. Rashkovskii <yr...@op...> */
+/* Egor Cheshkov <eg...@ip...> */
/* */
/* */
/* This program is free software; you can redistribute */
@@ -22,58 +23,55 @@
#define _LIBSXMLSTREAM_SXML_HXX_
#include <string>
-#include <vector>
+#include <list>
using namespace std;
-typedef enum
-{
- SXml_Element_t,
- SXml_Attribute_t,
- SXml_Char_t,
- SXml_Namespace_t
-} SXml_t;
-
-
-struct _SXml {
- SXml_t type;
- string data;
- vector<_SXml> * childs;
+enum SXmlNode_t {
+ SXmlNode_Element_t,
+ SXmlNode_Attribute_t,
+ SXmlNode_Char_t,
+ SXmlNode_Namespace_t
};
-typedef _SXml SXml;
-
-
-
-/* Type checks */
-#define Is_SXml_t(x,y) ( x.type == y )
-
-#define Is_SXml_Element(x) Is_SXml_t(x,SXml_Element_t)
-#define Is_SXml_Attribute(x) Is_SXml_t(x,SXml_Attribute_t)
-#define Is_SXml_Char(x) Is_SXml_t(x,SXml_Char_t)
-#define Is_SXml_Namespace(x) Is_SXml_t(x,SXml_Namespace_t)
-
-/* Tests */
-
-#define SXml_has_property(x) ( ((x.childs)->size() == 1) && \
- (x.type == ((SXml)((x.childs)->at(0))).type) )
-
-
-/* SXml creation */
+struct SXmlNode {
+ SXmlNode_t type;
+ string data;
+ list<SXmlNode> *descendants;
-SXml SXml_create(SXml_t aType, string aData);
-SXml SXml_Element_create(string aName);
-SXml SXml_Attribute_create(string aName, string aValue);
-SXml SXml_Char_create(string aData);
-SXml SXml_Namespace_create(string aPrefix, string aURI);
+ SXmlNode() {descendants = new list<SXmlNode>; type = SXmlNode_Element_t;}
+ SXmlNode(const SXmlNode& v);
+ SXmlNode& operator=(const SXmlNode& v);
+ ~SXmlNode() { delete descendants; }
+
+ SXmlNode(const SXmlNode_t aType, const string aData) {data = aData;
+ type = aType;}
-/* SXml destruction */
+ bool isElement() const { return type == SXmlNode_Element_t; }
+ bool isAttribute() const { return type == SXmlNode_Attribute_t; }
+ bool isChar() const { return type == SXmlNode_Char_t; }
+ bool isNamespace() const { return type == SXmlNode_Namespace_t; }
+
+ // FIXME: is this correct? copied from previous realization
+ bool hasProperty() const { return descendants->size() == 1 &&
+ type == descendants->front().type; }
+
+ // We do not copy the child element for better performance
+ void addChild(const SXmlNode& e) { descendants->push_back(e); }
+ string getProperty() const { return hasProperty() ?
+ descendants->front().data : 0; }
-void SXml_delete(SXml e);
-/* Childs operations */
-void SXml_create_child(SXml e, SXml c);
+ // FIXME: Should I create subclasses for Element, Attributr, etc?
+
+ /* Factory functions */
+ static SXmlNode Element(const string aName) { return
+ SXmlNode(SXmlNode_Element_t, aName); }
+ static SXmlNode Attribute(const string aName, const string aValue);
+ static SXmlNode Char(const string aData) { return SXmlNode(SXmlNode_Char_t,
+ aData); }
+ static SXmlNode Namespace(const string aPrefix, const string aURI);
-string SXml_get_property(SXml e);
+};
#endif /* _LIBSXMLSTREAM_SXML_HXX_ */
Index: sxmlstream.hxx
===================================================================
RCS file: /cvsroot/eas-dev/eas-dev/libs/libsxmlstream/include/sxmlstream.hxx,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- sxmlstream.hxx 28 Jan 2003 06:44:32 -0000 1.6
+++ sxmlstream.hxx 28 Jan 2003 22:36:25 -0000 1.7
@@ -30,15 +30,22 @@
{
protected:
- queue<SXml> * m_queue;
+ queue<SXmlNode> * m_queue;
public:
SXmlStream();
~SXmlStream();
bool queueIsEmpty();
- SXml pop();
- void push(SXml e);
+
+ // Do not copy an element, instead return by reference.
+ // Copying it might be expensive if we have a lot of
+ // descendants.
+ // FIXME: Is it ok?
+ SXmlNode& pop();
+
+ // FIXME: Pass by reference, is it ok?
+ void push(const SXmlNode& e) {m_queue->push(e);}
};
|
|
From: Egor C. <eg...@us...> - 2003-01-28 22:36:33
|
Update of /cvsroot/eas-dev/eas-dev/libs/libsxmlstream/src
In directory sc8-pr-cvs1:/tmp/cvs-serv6701/libs/libsxmlstream/src
Modified Files:
sxml.cxx sxmlstream.cxx
Log Message:
Major code refactoring. _SXml struct --> SXmlNode class. Small performance optimization.
*Warning* Code compiled but not tested!
Index: sxml.cxx
===================================================================
RCS file: /cvsroot/eas-dev/eas-dev/libs/libsxmlstream/src/sxml.cxx,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- sxml.cxx 25 Jan 2003 21:51:28 -0000 1.2
+++ sxml.cxx 28 Jan 2003 22:36:26 -0000 1.3
@@ -7,6 +7,7 @@
/* */
/* Author(s): */
/* Yurii A. Rashkovskii <yr...@op...> */
+/* Egor Cheshkov <eg...@ip...> */
/* */
/* */
/* This program is free software; you can redistribute */
@@ -22,66 +23,41 @@
using namespace std;
-/* SXml creation */
-
-SXml SXml_create(SXml_t aType, string aData)
+SXmlNode::SXmlNode(const SXmlNode& v)
{
- SXml e;
- e.type = aType; e.data = aData;
- e.childs = new vector<SXml>(0);
- return e;
+ type=v.type;
+ *descendants = *(v.descendants);
+ data = v.data;
}
-SXml SXml_Element_create(string aName)
+SXmlNode& SXmlNode::operator=(const SXmlNode& v)
{
- return SXml_create(SXml_Element_t, aName);
-}
+ type=v.type;
+ *descendants = *(v.descendants);
+ data = v.data;
-SXml SXml_Attribute_create(string aName, string aValue)
-{
- SXml e = SXml_create(SXml_Attribute_t, aName);
- SXml c = SXml_create(SXml_Attribute_t, aValue);
- SXml_create_child(e, c);
-
- return e;
+ return *this;
}
-SXml SXml_Char_create(string aData)
-{
- return SXml_create(SXml_Char_t, aData);
-}
+/* Factory functions */
-SXml SXml_Namespace_create(string aPrefix, string aURI)
+SXmlNode SXmlNode::Attribute(string aName, string aValue)
{
- SXml e = SXml_create(SXml_Namespace_t, aPrefix);
- SXml c = SXml_create(SXml_Namespace_t, aURI);
- SXml_create_child(e, c);
-
- return e;
-}
+ SXmlNode e(SXmlNode_Attribute_t, aName);
+ SXmlNode c(SXmlNode_Attribute_t, aValue);
+ e.addChild(c);
-/* SXml destruction */
-
-void SXml_delete(SXml e)
-{
- delete e.childs;
+ return e;
}
-/* Childs operations */
-
-void SXml_create_child(SXml e, SXml c)
+SXmlNode SXmlNode::Namespace(string aPrefix, string aURI)
{
- (e.childs)->push_back(c);
-}
+ SXmlNode e(SXmlNode_Namespace_t, aPrefix);
+ SXmlNode c(SXmlNode_Namespace_t, aURI);
+ e.addChild(c);
-string SXml_get_property(SXml e)
-{
- if (SXml_has_property(e))
- {
- return ((SXml)(e.childs)->at(0)).data;
- } else
- {
- return 0;
- }
+ return e;
}
+
+
Index: sxmlstream.cxx
===================================================================
RCS file: /cvsroot/eas-dev/eas-dev/libs/libsxmlstream/src/sxmlstream.cxx,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- sxmlstream.cxx 28 Jan 2003 06:44:32 -0000 1.6
+++ sxmlstream.cxx 28 Jan 2003 22:36:27 -0000 1.7
@@ -28,13 +28,13 @@
using namespace std;
-typedef vector<SXml>::iterator sxml_iterator;
+typedef list<SXmlNode>::iterator SXmlNode_iterator;
/* SXmlStream */
SXmlStream::SXmlStream()
{
- m_queue = new queue<SXml>();
+ m_queue = new queue<SXmlNode>();
}
SXmlStream::~SXmlStream()
@@ -47,24 +47,20 @@
return m_queue->empty();
}
-SXml SXmlStream::pop()
+SXmlNode& SXmlStream::pop()
{
- SXml e = m_queue->front();
+ SXmlNode *e = &(m_queue->front());
m_queue->pop();
- return e;
+ return *e;
}
-void SXmlStream::push(SXml e)
-{
- m_queue->push(e);
-}
/* SXmlBinaryStream */
SXmlBinaryStream::SXmlBinaryStream()
{
- m_queue = new queue<SXml>();
+ m_queue = new queue<SXmlNode>();
}
SXmlBinaryStream::~SXmlBinaryStream()
@@ -89,20 +85,20 @@
#endif
-ostream& SXml_BinaryOutput(ostream& os, SXml e)
+ostream& SXml_BinaryOutput(ostream& os, SXmlNode e)
{
- sxml_iterator iter;
+ SXmlNode_iterator iter;
switch (e.type)
{
- case SXml_Element_t:
+ case SXmlNode_Element_t:
os << BIN_LBRACKET;
os << BIN_SIGN << BIN_PORTABLE_SIZE(e.data.length()) <<
e.data;
// Output attributes
- iter = (e.childs)->begin();
- while (iter!=(e.childs)->end())
+ iter = (e.descendants)->begin();
+ while (iter!=(e.descendants)->end())
{
- if (Is_SXml_Attribute((*iter)))
+ if (iter->isAttribute())
{
os << BIN_LBRACKET << BIN_SIGN_ATTR;
SXml_BinaryOutput(os,(*iter));
@@ -110,11 +106,11 @@
}
iter++;
}
- // Output childs
- iter = (e.childs)->begin();
- while (iter!=(e.childs)->end())
+ // Output descendants
+ iter = (e.descendants)->begin();
+ while (iter!=(e.descendants)->end())
{
- if (!Is_SXml_Attribute((*iter)))
+ if (!iter->isAttribute())
{
SXml_BinaryOutput(os,(*iter));
}
@@ -123,14 +119,14 @@
os << BIN_RBRACKET;
break;
- case SXml_Attribute_t:
- if (SXml_has_property(e))
+ case SXmlNode_Attribute_t:
+ if (e.hasProperty())
{
os << BIN_LBRACKET <<
BIN_PORTABLE_SIZE(e.data.length()) <<
e.data <<
- BIN_PORTABLE_SIZE(SXml_get_property(e).length()) <<
- SXml_get_property(e) << BIN_LBRACKET;
+ BIN_PORTABLE_SIZE((e.getProperty()).length()) <<
+ e.getProperty() << BIN_LBRACKET;
} else
{
os << BIN_LBRACKET <<
@@ -139,16 +135,17 @@
}
break;
- case SXml_Char_t:
+ case SXmlNode_Char_t:
os << BIN_SIGN_CHAR <<
BIN_PORTABLE_SIZE(e.data.length()) <<
e.data;
break;
- case SXml_Namespace_t:
+ case SXmlNode_Namespace_t:
os << BIN_LBRACKET << BIN_SIGN_NS;
os << BIN_PORTABLE_SIZE(e.data.length());
- if (SXml_has_property(e))
- os << BIN_PORTABLE_SIZE(SXml_get_property(e).length()) << SXml_get_property(e);
+ if (e.hasProperty())
+ os << BIN_PORTABLE_SIZE(e.getProperty().length())
+ << e.getProperty();
os << BIN_RBRACKET;
break;
default:
@@ -159,7 +156,7 @@
ostream& operator<<(ostream& os, SXmlBinaryStream& s)
{
- SXml e;
+ SXmlNode e;
while (!s.queueIsEmpty())
{
e = s.pop();
@@ -178,7 +175,7 @@
SXmlTextStream::SXmlTextStream()
{
- m_queue = new queue<SXml>();
+ m_queue = new queue<SXmlNode>();
}
SXmlTextStream::~SXmlTextStream()
@@ -187,18 +184,18 @@
}
-ostream& SXml_TextOutput(ostream& os, SXml e)
+ostream& SXml_TextOutput(ostream& os, SXmlNode e)
{
- sxml_iterator iter;
+ SXmlNode_iterator iter;
switch (e.type)
{
- case SXml_Element_t:
+ case SXmlNode_Element_t:
os << "(" << e.data << " ";
// Output attributes
- iter = (e.childs)->begin();
- while (iter!=(e.childs)->end())
+ iter = (e.descendants)->begin();
+ while (iter!=(e.descendants)->end())
{
- if (Is_SXml_Attribute((*iter)))
+ if (iter->isAttribute())
{
os << "(@ ";
SXml_TextOutput(os,(*iter));
@@ -206,11 +203,11 @@
}
iter++;
}
- // Output childs
- iter = (e.childs)->begin();
- while (iter!=(e.childs)->end())
+ // Output descendants
+ iter = (e.descendants)->begin();
+ while (iter!=(e.descendants)->end())
{
- if (!Is_SXml_Attribute((*iter)))
+ if (!iter->isAttribute())
{
SXml_TextOutput(os,(*iter));
}
@@ -219,25 +216,25 @@
os << ")";
break;
- case SXml_Attribute_t:
- if (SXml_has_property(e))
+ case SXmlNode_Attribute_t:
+ if (e.hasProperty())
{
os << "(" << e.data << " \"" <<
- SXml_get_property(e) << "\")";
+ e.getProperty() << "\")";
} else
{
os << "(" << e.data << " )";
}
break;
- case SXml_Char_t:
+ case SXmlNode_Char_t:
os << " \"" << e.data << "\" ";
break;
- case SXml_Namespace_t:
+ case SXmlNode_Namespace_t:
os << "(@@ ";
os << e.data << " ";
- if (SXml_has_property(e))
- os << "\"" << SXml_get_property(e) << "\"";
+ if (e.hasProperty())
+ os << "\"" << e.getProperty() << "\"";
os << " )";
break;
default:
@@ -248,7 +245,7 @@
ostream& operator<<(ostream& os, SXmlTextStream& s)
{
- SXml e;
+ SXmlNode e;
while (!s.queueIsEmpty())
{
e = s.pop();
|
|
From: Egor C. <eg...@us...> - 2003-01-28 22:36:33
|
Update of /cvsroot/eas-dev/eas-dev/libs/libsxmlstream/tests
In directory sc8-pr-cvs1:/tmp/cvs-serv6701/libs/libsxmlstream/tests
Modified Files:
TextStreamTest.h
Log Message:
Major code refactoring. _SXml struct --> SXmlNode class. Small performance optimization.
*Warning* Code compiled but not tested!
Index: TextStreamTest.h
===================================================================
RCS file: /cvsroot/eas-dev/eas-dev/libs/libsxmlstream/tests/TextStreamTest.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- TextStreamTest.h 28 Jan 2003 05:04:08 -0000 1.2
+++ TextStreamTest.h 28 Jan 2003 22:36:28 -0000 1.3
@@ -31,16 +31,13 @@
stringstream _output("");
// Prepare structures
- SXml top = SXml_Element_create("test");
- SXml top_attr = SXml_Attribute_create("attr","value");
- SXml_create_child(top,top_attr);
+ SXmlNode top = SXmlNode::Element("test");
+ SXmlNode top_attr = SXmlNode::Attribute("attr","value");
+ top.addChild(top_attr);
_stream->push(top);
_output << (*_stream);
-
- SXml_delete(top);
- SXml_delete(top_attr);
TS_ASSERT_EQUALS(_output.str(), "(test (@ (attr \"value\")))");
}
|
|
From: Yurii R. <yr...@us...> - 2003-01-28 06:44:35
|
Update of /cvsroot/eas-dev/eas-dev/libs/libsxmlstream/src
In directory sc8-pr-cvs1:/tmp/cvs-serv8015/libs/libsxmlstream/src
Modified Files:
Makefile.am sxmlstream.cxx
Log Message:
SAL_UNX moved to config.h.top;
GLIB 1.2.0 is now required;
libsxmlstream got output for binary stream
Index: Makefile.am
===================================================================
RCS file: /cvsroot/eas-dev/eas-dev/libs/libsxmlstream/src/Makefile.am,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- Makefile.am 25 Jan 2003 21:51:28 -0000 1.1
+++ Makefile.am 28 Jan 2003 06:44:32 -0000 1.2
@@ -1,3 +1,5 @@
lib_LTLIBRARIES = libsxmlstream.la
libsxmlstream_la_SOURCES = sxml.cxx sxmlstream.cxx
-INCLUDES = -I../include
\ No newline at end of file
+INCLUDES = -I../include -I$(top_srcdir)
+CFLAGS = @GLIB_CFLAGS@
+libsxmlstream_la_LIBADD = -lglib
\ No newline at end of file
Index: sxmlstream.cxx
===================================================================
RCS file: /cvsroot/eas-dev/eas-dev/libs/libsxmlstream/src/sxmlstream.cxx,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- sxmlstream.cxx 28 Jan 2003 05:04:08 -0000 1.5
+++ sxmlstream.cxx 28 Jan 2003 06:44:32 -0000 1.6
@@ -23,6 +23,9 @@
#include <vector>
#include <sxmlstream.hxx>
+#include <glib.h>
+#include <config.h>
+
using namespace std;
typedef vector<SXml>::iterator sxml_iterator;
@@ -57,7 +60,120 @@
}
+/* SXmlBinaryStream */
+
+SXmlBinaryStream::SXmlBinaryStream()
+{
+ m_queue = new queue<SXml>();
+}
+
+SXmlBinaryStream::~SXmlBinaryStream()
+{
+ delete m_queue;
+}
+#define BIN_LBRACKET "("
+#define BIN_RBRACKET ")"
+
+#define BIN_SIGN_ATTR "@"
+#define BIN_SIGN_NS "!"
+#define BIN_SIGN_CHAR "C"
+#define BIN_SIGN "*"
+
+#if (SIZEOF_SIZE_T == 4) && (G_BYTE_ORDER == G_LITTLE_ENDIAN)
+#define BIN_PORTABLE_SIZE(x) x
+#elif (SIZEOF_SIZE_T == 4) && (G_BYTE_ORDER == G_LITTLE_ENDIAN)
+#define BIN_PORTABLE_SIZE(x) GINT32_TO_LE(x)
+#elif (SIZEOF_SIZE_T == 8)
+#error "64 bit architecture is currently unsupported by libsxmlstream. To be fixed."
+#endif
+
+
+ostream& SXml_BinaryOutput(ostream& os, SXml e)
+{
+ sxml_iterator iter;
+ switch (e.type)
+ {
+ case SXml_Element_t:
+ os << BIN_LBRACKET;
+ os << BIN_SIGN << BIN_PORTABLE_SIZE(e.data.length()) <<
+ e.data;
+ // Output attributes
+ iter = (e.childs)->begin();
+ while (iter!=(e.childs)->end())
+ {
+ if (Is_SXml_Attribute((*iter)))
+ {
+ os << BIN_LBRACKET << BIN_SIGN_ATTR;
+ SXml_BinaryOutput(os,(*iter));
+ os << BIN_RBRACKET;
+ }
+ iter++;
+ }
+ // Output childs
+ iter = (e.childs)->begin();
+ while (iter!=(e.childs)->end())
+ {
+ if (!Is_SXml_Attribute((*iter)))
+ {
+ SXml_BinaryOutput(os,(*iter));
+ }
+ iter++;
+ }
+
+ os << BIN_RBRACKET;
+ break;
+ case SXml_Attribute_t:
+ if (SXml_has_property(e))
+ {
+ os << BIN_LBRACKET <<
+ BIN_PORTABLE_SIZE(e.data.length()) <<
+ e.data <<
+ BIN_PORTABLE_SIZE(SXml_get_property(e).length()) <<
+ SXml_get_property(e) << BIN_LBRACKET;
+ } else
+ {
+ os << BIN_LBRACKET <<
+ BIN_PORTABLE_SIZE(e.data.length()) <<
+ e.data << BIN_RBRACKET;
+
+ }
+ break;
+ case SXml_Char_t:
+ os << BIN_SIGN_CHAR <<
+ BIN_PORTABLE_SIZE(e.data.length()) <<
+ e.data;
+ break;
+ case SXml_Namespace_t:
+ os << BIN_LBRACKET << BIN_SIGN_NS;
+ os << BIN_PORTABLE_SIZE(e.data.length());
+ if (SXml_has_property(e))
+ os << BIN_PORTABLE_SIZE(SXml_get_property(e).length()) << SXml_get_property(e);
+ os << BIN_RBRACKET;
+ break;
+ default:
+ break;
+ }
+ return os;
+}
+
+ostream& operator<<(ostream& os, SXmlBinaryStream& s)
+{
+ SXml e;
+ while (!s.queueIsEmpty())
+ {
+ e = s.pop();
+ SXml_BinaryOutput(os,e);
+ }
+ return os;
+};
+
+SXmlBinaryStream& operator<<(SXmlBinaryStream& s, const ostream& os)
+{
+ SXmlBinaryStream bs();
+ // TODO
+}
+
/* SXmlTextStream */
SXmlTextStream::SXmlTextStream()
@@ -140,3 +256,10 @@
}
return os;
};
+
+SXmlTextStream& operator<<(SXmlTextStream& s, const ostream& os)
+{
+ SXmlTextStream ts();
+ // TODO
+}
+
|
|
From: Yurii R. <yr...@us...> - 2003-01-28 06:44:35
|
Update of /cvsroot/eas-dev/eas-dev/libs/libsxmlstream/include In directory sc8-pr-cvs1:/tmp/cvs-serv8015/libs/libsxmlstream/include Modified Files: sxmlstream.hxx Log Message: SAL_UNX moved to config.h.top; GLIB 1.2.0 is now required; libsxmlstream got output for binary stream Index: sxmlstream.hxx =================================================================== RCS file: /cvsroot/eas-dev/eas-dev/libs/libsxmlstream/include/sxmlstream.hxx,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- sxmlstream.hxx 28 Jan 2003 04:16:24 -0000 1.5 +++ sxmlstream.hxx 28 Jan 2003 06:44:32 -0000 1.6 @@ -50,9 +50,9 @@ friend ostream& operator<<(ostream&, SXmlBinaryStream&); -/* friend SXmlBinaryStream& operator>>( - SXmlBinaryStream&, - const ostream&);*/ + friend SXmlBinaryStream& operator<<(SXmlBinaryStream&, + const ostream&); + }; class SXmlTextStream: public SXmlStream @@ -63,6 +63,9 @@ friend ostream& operator<<(ostream&, SXmlTextStream&); + + friend SXmlTextStream& operator<<(SXmlTextStream&, + const ostream&); }; |
|
From: Yurii R. <yr...@us...> - 2003-01-28 06:44:35
|
Update of /cvsroot/eas-dev/eas-dev/build/unix In directory sc8-pr-cvs1:/tmp/cvs-serv8015/build/unix Modified Files: config.h.in configure.in Added Files: config.h.top Log Message: SAL_UNX moved to config.h.top; GLIB 1.2.0 is now required; libsxmlstream got output for binary stream --- NEW FILE: config.h.top --- /* Define if you have UN*X-like operating system (for ODK) */ #undef SAL_UNX Index: config.h.in =================================================================== RCS file: /cvsroot/eas-dev/eas-dev/build/unix/config.h.in,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- config.h.in 23 Jan 2003 03:42:05 -0000 1.3 +++ config.h.in 28 Jan 2003 06:44:32 -0000 1.4 @@ -1,12 +1,16 @@ /* config.h.in. Generated automatically from configure.in by autoheader. */ +/* Define if you have UN*X-like operating system (for ODK) */ +#undef SAL_UNX + /* Define if you have the ANSI C header files. */ #undef STDC_HEADERS -#undef SAL_UNX - /* The number of bytes in a long. */ #undef SIZEOF_LONG + +/* The number of bytes in a size_t. */ +#undef SIZEOF_SIZE_T /* Define if you have the <dlfcn.h> header file. */ #undef HAVE_DLFCN_H Index: configure.in =================================================================== RCS file: /cvsroot/eas-dev/eas-dev/build/unix/configure.in,v retrieving revision 1.9 retrieving revision 1.10 diff -u -d -r1.9 -r1.10 --- configure.in 28 Jan 2003 03:18:22 -0000 1.9 +++ configure.in 28 Jan 2003 06:44:32 -0000 1.10 @@ -4,11 +4,12 @@ AC_INIT(mk/component.mk.in) AC_CONFIG_AUX_DIR(scripts) - +AC_REVISION($Id$)dnl dnl dnl Some settings dnl +AC_PREFIX_DEFAULT(/opt/eas) GLIB_VERSION_REQUIRED=1.2.0 @@ -22,7 +23,7 @@ # As I think, since we're build `unix' version, platform for SAL # should be SAL_UNX. However, check this! -AC_DEFINE(SAL_UNX) +dnl AC_DEFINE(SAL_UNX) dnl dnl Check for compilers @@ -40,6 +41,7 @@ AC_PROG_MAKE_SET AC_PROG_INSTALL AC_CHECK_SIZEOF(long,4) +AC_CHECK_SIZEOF(size_t,4) AC_PROG_LN_S AC_SUBST(LN_S) |
|
From: Yurii R. <yr...@us...> - 2003-01-28 05:04:12
|
Update of /cvsroot/eas-dev/eas-dev/libs/libsxmlstream/src
In directory sc8-pr-cvs1:/tmp/cvs-serv22080/src
Modified Files:
sxmlstream.cxx
Log Message:
small bugfixes
Index: sxmlstream.cxx
===================================================================
RCS file: /cvsroot/eas-dev/eas-dev/libs/libsxmlstream/src/sxmlstream.cxx,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- sxmlstream.cxx 28 Jan 2003 04:16:25 -0000 1.4
+++ sxmlstream.cxx 28 Jan 2003 05:04:08 -0000 1.5
@@ -107,7 +107,7 @@
if (SXml_has_property(e))
{
os << "(" << e.data << " \"" <<
- SXml_get_property(e) << "\") ";
+ SXml_get_property(e) << "\")";
} else
{
os << "(" << e.data << " )";
@@ -136,7 +136,7 @@
while (!s.queueIsEmpty())
{
e = s.pop();
- os << SXml_TextOutput(os,e);
+ SXml_TextOutput(os,e);
}
return os;
};
|
|
From: Yurii R. <yr...@us...> - 2003-01-28 05:04:12
|
Update of /cvsroot/eas-dev/eas-dev/libs/libsxmlstream/tests
In directory sc8-pr-cvs1:/tmp/cvs-serv22080/tests
Modified Files:
TextStreamTest.h
Log Message:
small bugfixes
Index: TextStreamTest.h
===================================================================
RCS file: /cvsroot/eas-dev/eas-dev/libs/libsxmlstream/tests/TextStreamTest.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- TextStreamTest.h 28 Jan 2003 04:16:26 -0000 1.1
+++ TextStreamTest.h 28 Jan 2003 05:04:08 -0000 1.2
@@ -1,7 +1,10 @@
#ifndef _TEXTSTREAMTEST_H_
#define _TEXTSTREAMTEST_H_
+#include <iostream>
+#include <sstream>
#include <string>
+#include <cstring>
#include <cxxtest/TestSuite.h>
#include <sxmlstream.hxx>
@@ -21,12 +24,11 @@
void tearDown()
{
- delete _stream;
}
void test_output()
{
- string _output;
+ stringstream _output("");
// Prepare structures
SXml top = SXml_Element_create("test");
@@ -36,13 +38,11 @@
_stream->push(top);
_output << (*_stream);
- cout << "[[" << (*_stream) << "]]" ;
- cout.flush();
SXml_delete(top);
SXml_delete(top_attr);
- TS_ASSERT_EQUALS(_output, "(test (@ (attr \"value\")))");
+ TS_ASSERT_EQUALS(_output.str(), "(test (@ (attr \"value\")))");
}
};
|
|
From: Yurii R. <yr...@us...> - 2003-01-28 04:16:56
|
Update of /cvsroot/eas-dev/eas-dev/doc/core-architecture/ru In directory sc8-pr-cvs1:/tmp/cvs-serv18937/doc/core-architecture/ru Modified Files: communication.xml Log Message: a bit updated libsxmlstream, added first test skeleton Index: communication.xml =================================================================== RCS file: /cvsroot/eas-dev/eas-dev/doc/core-architecture/ru/communication.xml,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- communication.xml 25 Jan 2003 21:51:28 -0000 1.2 +++ communication.xml 28 Jan 2003 04:16:23 -0000 1.3 @@ -1,6 +1,6 @@ <chapter id="communication"><title>óÉÓÔÅÍÁ ÐÅÒÅÄÁÞÉ ÄÁÎÎÙÈ</title> <sect1><title>íÅÔÁ-ÐÒÏÔÏËÏÌ GMP</title> - <para>íÅÔÁ-ÐÒÏÔÏËÏÌ <firstterm>GMP</firstterm> (Grauss Meta Protocol) -- + <para>íÅÔÁ-ÐÒÏÔÏËÏÌ <firstterm>GMP</firstterm> (Generic Meta Protocol) -- ÅÄÉÎÙÊ ÐÒÏÔÏËÏÌ ÐÅÒÅÄÁÞÉ ÄÁÎÎÙÈ, ÐÏÄÍÏÖÅÓÔ×Á ËÏÔÏÒÏÇÏ ÒÅÁÌÉÚÕÀÔÓÑ ËÏÎËÒÅÔÎÙÍÉ ÐÒÏÔÏËÏÌÁÍÉ (ÆÏÒÍÁÔ ÐÅÒÅÄÁ×ÁÅÍÙÈ ÄÁÎÎÙÈ ÏÓÔÁÅÔÓÑ ÎÅÉÚÍÅÎÎÙÍ). </para> |
|
From: Yurii R. <yr...@us...> - 2003-01-28 04:16:30
|
Update of /cvsroot/eas-dev/eas-dev/libs/libsxmlstream/tests
In directory sc8-pr-cvs1:/tmp/cvs-serv18937/libs/libsxmlstream/tests
Added Files:
.cvsignore TextStreamTest.h
Log Message:
a bit updated libsxmlstream, added first test skeleton
--- NEW FILE: .cvsignore ---
Makefile
Makefile.in
runTests.cxx
--- NEW FILE: TextStreamTest.h ---
#ifndef _TEXTSTREAMTEST_H_
#define _TEXTSTREAMTEST_H_
#include <string>
#include <cxxtest/TestSuite.h>
#include <sxmlstream.hxx>
using namespace std;
class TextStreamTest: public CxxTest::TestSuite
{
SXmlTextStream * _stream;
public:
void setUp()
{
_stream = new SXmlTextStream();
}
void tearDown()
{
delete _stream;
}
void test_output()
{
string _output;
// Prepare structures
SXml top = SXml_Element_create("test");
SXml top_attr = SXml_Attribute_create("attr","value");
SXml_create_child(top,top_attr);
_stream->push(top);
_output << (*_stream);
cout << "[[" << (*_stream) << "]]" ;
cout.flush();
SXml_delete(top);
SXml_delete(top_attr);
TS_ASSERT_EQUALS(_output, "(test (@ (attr \"value\")))");
}
};
#endif /* _TEXTSTREAMTEST_H_ */
|
|
From: Yurii R. <yr...@us...> - 2003-01-28 04:16:28
|
Update of /cvsroot/eas-dev/eas-dev/libs/libsxmlstream/src
In directory sc8-pr-cvs1:/tmp/cvs-serv18937/libs/libsxmlstream/src
Modified Files:
sxmlstream.cxx
Log Message:
a bit updated libsxmlstream, added first test skeleton
Index: sxmlstream.cxx
===================================================================
RCS file: /cvsroot/eas-dev/eas-dev/libs/libsxmlstream/src/sxmlstream.cxx,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- sxmlstream.cxx 28 Jan 2003 03:18:23 -0000 1.3
+++ sxmlstream.cxx 28 Jan 2003 04:16:25 -0000 1.4
@@ -58,7 +58,19 @@
-/* SXmlTextStream operators */
+/* SXmlTextStream */
+
+SXmlTextStream::SXmlTextStream()
+{
+ m_queue = new queue<SXml>();
+}
+
+SXmlTextStream::~SXmlTextStream()
+{
+ delete m_queue;
+}
+
+
ostream& SXml_TextOutput(ostream& os, SXml e)
{
sxml_iterator iter;
@@ -66,7 +78,6 @@
{
case SXml_Element_t:
os << "(" << e.data << " ";
-
// Output attributes
iter = (e.childs)->begin();
while (iter!=(e.childs)->end())
@@ -95,11 +106,11 @@
case SXml_Attribute_t:
if (SXml_has_property(e))
{
- os << "( " << e.data << " \"" <<
+ os << "(" << e.data << " \"" <<
SXml_get_property(e) << "\") ";
} else
{
- os << "( " << e.data << " )";
+ os << "(" << e.data << " )";
}
break;
|
|
From: Yurii R. <yr...@us...> - 2003-01-28 04:16:27
|
Update of /cvsroot/eas-dev/eas-dev/libs/libsxmlstream/include
In directory sc8-pr-cvs1:/tmp/cvs-serv18937/libs/libsxmlstream/include
Modified Files:
sxmlstream.hxx
Log Message:
a bit updated libsxmlstream, added first test skeleton
Index: sxmlstream.hxx
===================================================================
RCS file: /cvsroot/eas-dev/eas-dev/libs/libsxmlstream/include/sxmlstream.hxx,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- sxmlstream.hxx 28 Jan 2003 03:18:23 -0000 1.4
+++ sxmlstream.hxx 28 Jan 2003 04:16:24 -0000 1.5
@@ -28,6 +28,8 @@
class SXmlStream
{
+ protected:
+
queue<SXml> * m_queue;
public:
@@ -61,6 +63,7 @@
friend ostream& operator<<(ostream&,
SXmlTextStream&);
+
};
|
|
From: Yurii R. <yr...@us...> - 2003-01-28 03:18:26
|
Update of /cvsroot/eas-dev/eas-dev/libs/libsxmlstream/src
In directory sc8-pr-cvs1:/tmp/cvs-serv4466/libs/libsxmlstream/src
Modified Files:
sxmlstream.cxx
Log Message:
Changes in build process;
libsxmlstream major bugs fixed (it still not have most of functionality yet,
however)
Index: sxmlstream.cxx
===================================================================
RCS file: /cvsroot/eas-dev/eas-dev/libs/libsxmlstream/src/sxmlstream.cxx,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- sxmlstream.cxx 27 Jan 2003 06:07:41 -0000 1.2
+++ sxmlstream.cxx 28 Jan 2003 03:18:23 -0000 1.3
@@ -25,6 +25,8 @@
using namespace std;
+typedef vector<SXml>::iterator sxml_iterator;
+
/* SXmlStream */
SXmlStream::SXmlStream()
@@ -59,7 +61,7 @@
/* SXmlTextStream operators */
ostream& SXml_TextOutput(ostream& os, SXml e)
{
- iterator iter;
+ sxml_iterator iter;
switch (e.type)
{
case SXml_Element_t:
@@ -69,21 +71,21 @@
iter = (e.childs)->begin();
while (iter!=(e.childs)->end())
{
- if (Is_SXml_Attribute(iter))
+ if (Is_SXml_Attribute((*iter)))
{
os << "(@ ";
- SXml_TextOutput(os,iter);
- os >> ")";
+ SXml_TextOutput(os,(*iter));
+ os << ")";
}
- it++;
+ iter++;
}
// Output childs
iter = (e.childs)->begin();
while (iter!=(e.childs)->end())
{
- if (!Is_SXml_Attribute(iter))
+ if (!Is_SXml_Attribute((*iter)))
{
- SXml_TextOutput(os,iter);
+ SXml_TextOutput(os,(*iter));
}
iter++;
}
@@ -114,7 +116,6 @@
default:
break;
}
- delete iter;
return os;
}
@@ -124,7 +125,7 @@
while (!s.queueIsEmpty())
{
e = s.pop();
- os << SXml_OutputText(os,e);
+ os << SXml_TextOutput(os,e);
}
return os;
};
|
|
From: Yurii R. <yr...@us...> - 2003-01-28 03:18:25
|
Update of /cvsroot/eas-dev/eas-dev/build/unix
In directory sc8-pr-cvs1:/tmp/cvs-serv4466/build/unix
Modified Files:
.cvsignore configure.in
Added Files:
local.m4
Removed Files:
aclocal.m4
Log Message:
Changes in build process;
libsxmlstream major bugs fixed (it still not have most of functionality yet,
however)
--- NEW FILE: local.m4 ---
# Configure paths for GLIB
# Owen Taylor 97-11-3
dnl AM_PATH_GLIB([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND [, MODULES]]]])
dnl Test for GLIB, and define GLIB_CFLAGS and GLIB_LIBS, if "gmodule" is specified
dnl in MODULES, feature the glib-config gmodule option.
dnl
AC_DEFUN(AM_PATH_GLIB,
[dnl
dnl Get the cflags and libraries from the glib-config script
dnl
AC_ARG_WITH(glib-prefix,[ --with-glib-prefix=PFX Prefix where GLIB is installed (optional)],
glib_config_prefix="$withval", glib_config_prefix="")
AC_ARG_WITH(glib-exec-prefix,[ --with-glib-exec-prefix=PFX Exec prefix where GLIB is installed (optional)],
glib_config_exec_prefix="$withval", glib_config_exec_prefix="")
AC_ARG_ENABLE(glibtest, [ --disable-glibtest Do not try to compile and run a test GLIB program],
, enable_glibtest=yes)
if test x$glib_config_exec_prefix != x ; then
glib_config_args="$glib_config_args --exec-prefix=$glib_config_exec_prefix"
if test x${GLIB_CONFIG+set} != xset ; then
GLIB_CONFIG=$glib_config_exec_prefix/bin/glib-config
fi
fi
if test x$glib_config_prefix != x ; then
glib_config_args="$glib_config_args --prefix=$glib_config_prefix"
if test x${GLIB_CONFIG+set} != xset ; then
GLIB_CONFIG=$glib_config_prefix/bin/glib-config
fi
fi
case "$4" in
*gmodule*) glib_config_args="$glib_config_args gmodule";;
esac
AC_PATH_PROG(GLIB_CONFIG, glib-config, no)
min_glib_version=ifelse([$1], ,0.99.7,$1)
AC_MSG_CHECKING(for GLIB - version >= $min_glib_version)
no_glib=""
if test "$GLIB_CONFIG" = "no" ; then
no_glib=yes
else
GLIB_CFLAGS=`$GLIB_CONFIG $glib_config_args --cflags`
GLIB_LIBS=`$GLIB_CONFIG $glib_config_args --libs`
glib_config_major_version=`$GLIB_CONFIG $glib_config_args --version | \
sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
glib_config_minor_version=`$GLIB_CONFIG $glib_config_args --version | \
sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
glib_config_micro_version=`$GLIB_CONFIG $glib_config_args --version | \
sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
if test "x$enable_glibtest" = "xyes" ; then
ac_save_CFLAGS="$CFLAGS"
ac_save_LIBS="$LIBS"
CFLAGS="$CFLAGS $GLIB_CFLAGS"
LIBS="$LIBS $GLIB_LIBS"
dnl
dnl Now check if the installed GLIB is sufficiently new. (Also sanity
dnl checks the results of glib-config to some extent
dnl
rm -f conf.glibtest
AC_TRY_RUN([
#include <glib.h>
#include <stdio.h>
#include <stdlib.h>
int
main ()
{
int major, minor, micro;
char *tmp_version;
system ("touch conf.glibtest");
/* HP/UX 9 (%@#!) writes to sscanf strings */
tmp_version = g_strdup("$min_glib_version");
if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, µ) != 3) {
printf("%s, bad version string\n", "$min_glib_version");
exit(1);
}
if ((glib_major_version != $glib_config_major_version) ||
(glib_minor_version != $glib_config_minor_version) ||
(glib_micro_version != $glib_config_micro_version))
{
printf("\n*** 'glib-config --version' returned %d.%d.%d, but GLIB (%d.%d.%d)\n",
$glib_config_major_version, $glib_config_minor_version, $glib_config_micro_version,
glib_major_version, glib_minor_version, glib_micro_version);
printf ("*** was found! If glib-config was correct, then it is best\n");
printf ("*** to remove the old version of GLIB. You may also be able to fix the error\n");
printf("*** by modifying your LD_LIBRARY_PATH enviroment variable, or by editing\n");
printf("*** /etc/ld.so.conf. Make sure you have run ldconfig if that is\n");
printf("*** required on your system.\n");
printf("*** If glib-config was wrong, set the environment variable GLIB_CONFIG\n");
printf("*** to point to the correct copy of glib-config, and remove the file config.cache\n");
printf("*** before re-running configure\n");
}
else if ((glib_major_version != GLIB_MAJOR_VERSION) ||
(glib_minor_version != GLIB_MINOR_VERSION) ||
(glib_micro_version != GLIB_MICRO_VERSION))
{
printf("*** GLIB header files (version %d.%d.%d) do not match\n",
GLIB_MAJOR_VERSION, GLIB_MINOR_VERSION, GLIB_MICRO_VERSION);
printf("*** library (version %d.%d.%d)\n",
glib_major_version, glib_minor_version, glib_micro_version);
}
else
{
if ((glib_major_version > major) ||
((glib_major_version == major) && (glib_minor_version > minor)) ||
((glib_major_version == major) && (glib_minor_version == minor) && (glib_micro_version >= micro)))
{
return 0;
}
else
{
printf("\n*** An old version of GLIB (%d.%d.%d) was found.\n",
glib_major_version, glib_minor_version, glib_micro_version);
printf("*** You need a version of GLIB newer than %d.%d.%d. The latest version of\n",
major, minor, micro);
printf("*** GLIB is always available from ftp://ftp.gtk.org.\n");
printf("***\n");
printf("*** If you have already installed a sufficiently new version, this error\n");
printf("*** probably means that the wrong copy of the glib-config shell script is\n");
printf("*** being found. The easiest way to fix this is to remove the old version\n");
printf("*** of GLIB, but you can also set the GLIB_CONFIG environment to point to the\n");
printf("*** correct copy of glib-config. (In this case, you will have to\n");
printf("*** modify your LD_LIBRARY_PATH enviroment variable, or edit /etc/ld.so.conf\n");
printf("*** so that the correct libraries are found at run-time))\n");
}
}
return 1;
}
],, no_glib=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"])
CFLAGS="$ac_save_CFLAGS"
LIBS="$ac_save_LIBS"
fi
fi
if test "x$no_glib" = x ; then
AC_MSG_RESULT(yes)
ifelse([$2], , :, [$2])
else
AC_MSG_RESULT(no)
if test "$GLIB_CONFIG" = "no" ; then
echo "*** The glib-config script installed by GLIB could not be found"
echo "*** If GLIB was installed in PREFIX, make sure PREFIX/bin is in"
echo "*** your path, or set the GLIB_CONFIG environment variable to the"
echo "*** full path to glib-config."
else
if test -f conf.glibtest ; then
:
else
echo "*** Could not run GLIB test program, checking why..."
CFLAGS="$CFLAGS $GLIB_CFLAGS"
LIBS="$LIBS $GLIB_LIBS"
AC_TRY_LINK([
#include <glib.h>
#include <stdio.h>
], [ return ((glib_major_version) || (glib_minor_version) || (glib_micro_version)); ],
[ echo "*** The test program compiled, but did not run. This usually means"
echo "*** that the run-time linker is not finding GLIB or finding the wrong"
echo "*** version of GLIB. If it is not finding GLIB, you'll need to set your"
echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point"
echo "*** to the installed location Also, make sure you have run ldconfig if that"
echo "*** is required on your system"
echo "***"
echo "*** If you have an old version installed, it is best to remove it, although"
echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH"
echo "***"
echo "*** If you have a RedHat 5.0 system, you should remove the GTK package that"
echo "*** came with the system with the command"
echo "***"
echo "*** rpm --erase --nodeps gtk gtk-devel" ],
[ echo "*** The test program failed to compile or link. See the file config.log for the"
echo "*** exact error that occured. This usually means GLIB was incorrectly installed"
echo "*** or that you have moved GLIB since it was installed. In the latter case, you"
echo "*** may want to edit the glib-config script: $GLIB_CONFIG" ])
CFLAGS="$ac_save_CFLAGS"
LIBS="$ac_save_LIBS"
fi
fi
GLIB_CFLAGS=""
GLIB_LIBS=""
ifelse([$3], , :, [$3])
fi
AC_SUBST(GLIB_CFLAGS)
AC_SUBST(GLIB_LIBS)
rm -f conf.glibtest
])
Index: .cvsignore
===================================================================
RCS file: /cvsroot/eas-dev/eas-dev/build/unix/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- .cvsignore 25 Jan 2003 20:00:35 -0000 1.5
+++ .cvsignore 28 Jan 2003 03:18:22 -0000 1.6
@@ -5,3 +5,4 @@
configure
stamp-h
libtool
+aclocal.m4
\ No newline at end of file
Index: configure.in
===================================================================
RCS file: /cvsroot/eas-dev/eas-dev/build/unix/configure.in,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- configure.in 27 Jan 2003 07:11:40 -0000 1.8
+++ configure.in 28 Jan 2003 03:18:22 -0000 1.9
@@ -5,6 +5,14 @@
AC_INIT(mk/component.mk.in)
AC_CONFIG_AUX_DIR(scripts)
+
+dnl
+dnl Some settings
+dnl
+
+GLIB_VERSION_REQUIRED=1.2.0
+
+AC_ISC_POSIX
dnl
dnl Check host, target, build
dnl
@@ -23,6 +31,8 @@
AC_REQUIRE([AC_PROG_CC])
AC_REQUIRE([AC_PROG_CXX])
+
+
AC_STDC_HEADERS
AC_CHECK_HEADERS(wchar.h wcstr.h getopt.h)
@@ -69,6 +79,17 @@
AC_SUBST(XML2CMP)
AC_SUBST(IDLC)
AC_SUBST(REGMERGE)
+
+dnl
+dnl Libs
+dnl
+
+dnl Checks for libraries.
+AC_CHECK_PROG(HAVE_GLIB_CONFIG, glib-config, yes, no)
+
+AC_SUBST(GLIB_VERSION_REQUIRED)
+AM_PATH_GLIB($GLIB_VERSION_REQUIRED)
+
dnl
dnl Tools
--- aclocal.m4 DELETED ---
|
|
From: Yurii R. <yr...@us...> - 2003-01-28 03:18:25
|
Update of /cvsroot/eas-dev/eas-dev/libs/libsxmlstream/include In directory sc8-pr-cvs1:/tmp/cvs-serv4466/libs/libsxmlstream/include Modified Files: sxmlstream.hxx Log Message: Changes in build process; libsxmlstream major bugs fixed (it still not have most of functionality yet, however) Index: sxmlstream.hxx =================================================================== RCS file: /cvsroot/eas-dev/eas-dev/libs/libsxmlstream/include/sxmlstream.hxx,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- sxmlstream.hxx 27 Jan 2003 06:07:41 -0000 1.3 +++ sxmlstream.hxx 28 Jan 2003 03:18:23 -0000 1.4 @@ -46,9 +46,9 @@ SXmlBinaryStream(); ~SXmlBinaryStream(); -/* friend ostream& operator<<(ostream&, - const SXmlBinaryStream&); - friend SXmlBinaryStream& operator>>( + friend ostream& operator<<(ostream&, + SXmlBinaryStream&); +/* friend SXmlBinaryStream& operator>>( SXmlBinaryStream&, const ostream&);*/ }; |
|
From: Yurii R. <yr...@us...> - 2003-01-28 02:15:23
|
Update of /cvsroot/eas-dev/eas-dev/libs/libsxmlstream/tests In directory sc8-pr-cvs1:/tmp/cvs-serv32597/tests Log Message: Directory /cvsroot/eas-dev/eas-dev/libs/libsxmlstream/tests added to the repository |
|
From: Egor C. <eg...@us...> - 2003-01-27 19:59:26
|
Update of /cvsroot/eas-dev/eas-dev/tools/doc
In directory sc8-pr-cvs1:/tmp/cvs-serv14691
Added Files:
docassistant.py
Log Message:
Initial commit. Work in progress.
--- NEW FILE: docassistant.py ---
#!/usr/bin/python
# /*******************************************************/
# /* */
# /* Copyright (c) 2003. */
# /* E/AS Software Foundation */
# /* */
# /* Author(s): */
# /* Egor Cheshkov <eg...@ip...> */
# /* */
# /* */
# /* This program is free software; you can redistribute */
# /* it and/or modify it under the terms of the GNU */
# /* Lesser General Public License as published by the */
# /* Free Software Foundation; version 2 of the License. */
# /* */
# /*******************************************************/
# $Id: docassistant.py,v 1.1 2003/01/27 19:59:23 egor Exp $
"""Usage:
%s <arguments> <ducument descriptor>
Arguments:
--check Check all modules for all languages are present,
main files for all languages are present
--fix Fix missing modules and files
--html Regenerate html document presentation
--pdf Regenerate pdf document presentation
--stylesheet=file Use alternative stylesheet
--help Print this message and exit
"""
import getopt
import sys
from xml.dom.minidom import parse
import os.path
def usage():
print __doc__ % sys.argv[0]
sys.exit(2)
def die(msg):
print "%s: %s" % (sys.argv[0], msg)
print
print "Try %s --help to get clue how to use it." % sys.argv[0]
type,value,traceback = sys.exc_info()
if type != None:
import traceback
print
traceback.print_exc()
sys.exit(1)
class DocumentDescriptor:
def __init__(self, file):
self._doc = parse(file)
def getLangs(self):
return map(lambda x: x.firstChild.data,
self._doc.getElementsByTagName('lang'))
def getModules(self):
modulesElem = self._doc.getElementsByTagName('modules')[0]
modules = []
for child in modulesElem.childNodes:
if child.nodeType == child.ELEMENT_NODE and \
child.nodeName == "module":
modules.append(child.getAttribute("id"))
return modules
def getId(self):
return self._doc.documentElement.getAttribute("id")
def main():
try:
optlist, args = getopt.getopt(sys.argv[1:], "",
["help", "check", "fix"])
except getopt.GetoptError:
usage()
if len(args) != 1:
usage()
else:
docDescrName = args[0]
try:
docDescrFile = open(docDescrName)
except:
die("Can't open document descriptor")
docPath = os.path.dirname(os.path.realpath('docDescrName'))
try:
docDescr = DocumentDescriptor(docDescrFile)
except:
die("Can't parse document descriptor. Check syntax")
altStylesheet = None
for o,a in optlist:
if o == "stylesheet":
altStylesheet = a
for o,a in optlist:
if o == "--help":
usage()
if o == "--check":
pass
if o == "--fix":
pass
if o == "--html":
pass
if o == "--pdf":
pass
if __name__ == "__main__":
main()
|
|
From: Egor C. <eg...@us...> - 2003-01-27 11:25:36
|
Update of /cvsroot/eas-dev/eas-dev/doc/template In directory sc8-pr-cvs1:/tmp/cvs-serv4508/doc/template Added Files: .cvsignore Log Message: Initial commit. --- NEW FILE: .cvsignore --- Makefile Makefile.in |
|
From: Yurii R. <yr...@us...> - 2003-01-27 07:11:43
|
Update of /cvsroot/eas-dev/eas-dev/libs/libsxmlstream In directory sc8-pr-cvs1:/tmp/cvs-serv24663/libs/libsxmlstream Modified Files: .cvsignore Log Message: initial directory structure for libsmstorage (Structured META Storage), documentation for it. Index: .cvsignore =================================================================== RCS file: /cvsroot/eas-dev/eas-dev/libs/libsxmlstream/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- .cvsignore 25 Jan 2003 20:00:36 -0000 1.2 +++ .cvsignore 27 Jan 2003 07:11:40 -0000 1.3 @@ -1,4 +1,2 @@ Makefile Makefile.in -.deps -.libs \ No newline at end of file |
|
From: Yurii R. <yr...@us...> - 2003-01-27 07:11:43
|
Update of /cvsroot/eas-dev/eas-dev/libs/libsmstorage/src In directory sc8-pr-cvs1:/tmp/cvs-serv24663/libs/libsmstorage/src Added Files: .cvsignore Makefile.am Log Message: initial directory structure for libsmstorage (Structured META Storage), documentation for it. --- NEW FILE: .cvsignore --- Makefile Makefile.in *.o *.lo *.la .deps .libs --- NEW FILE: Makefile.am --- |
|
From: Yurii R. <yr...@us...> - 2003-01-27 07:11:43
|
Update of /cvsroot/eas-dev/eas-dev/libs/libsmstorage In directory sc8-pr-cvs1:/tmp/cvs-serv24663/libs/libsmstorage Added Files: .cvsignore Makefile.am Log Message: initial directory structure for libsmstorage (Structured META Storage), documentation for it. --- NEW FILE: .cvsignore --- Makefile Makefile.in --- NEW FILE: Makefile.am --- SUBDIRS = src |
|
From: Yurii R. <yr...@us...> - 2003-01-27 07:11:43
|
Update of /cvsroot/eas-dev/eas-dev/libs In directory sc8-pr-cvs1:/tmp/cvs-serv24663/libs Modified Files: Makefile.am Log Message: initial directory structure for libsmstorage (Structured META Storage), documentation for it. Index: Makefile.am =================================================================== RCS file: /cvsroot/eas-dev/eas-dev/libs/Makefile.am,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- Makefile.am 23 Jan 2003 00:53:01 -0000 1.1 +++ Makefile.am 27 Jan 2003 07:11:40 -0000 1.2 @@ -1 +1 @@ -SUBDIRS = libsxmlstream \ No newline at end of file +SUBDIRS = libsxmlstream libsmstorage \ No newline at end of file |
|
From: Yurii R. <yr...@us...> - 2003-01-27 07:11:42
|
Update of /cvsroot/eas-dev/eas-dev/doc/smstorage
In directory sc8-pr-cvs1:/tmp/cvs-serv24663/doc/smstorage
Added Files:
document.xml
Log Message:
initial directory structure for libsmstorage (Structured META Storage),
documentation for it.
--- NEW FILE: document.xml ---
<?xml version="1.0"?>
<document id="smstorage">
<lang master="yes">ru</lang>
<lang>en</lang>
<target name="pdf">
<stylesheet>../stylesheets/pdf.xsl</stylesheet>
</target>
<target name="xhtml">
<stylesheet>../stylesheets/xhtml.xsl</stylesheet>
</target>
<main>book.xml</main>
<modules>
</modules>
</document>
|
|
From: Yurii R. <yr...@us...> - 2003-01-27 07:11:42
|
Update of /cvsroot/eas-dev/eas-dev/doc In directory sc8-pr-cvs1:/tmp/cvs-serv24663/doc Modified Files: Makefile.am Log Message: initial directory structure for libsmstorage (Structured META Storage), documentation for it. Index: Makefile.am =================================================================== RCS file: /cvsroot/eas-dev/eas-dev/doc/Makefile.am,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- Makefile.am 23 Jan 2003 07:14:04 -0000 1.3 +++ Makefile.am 27 Jan 2003 07:11:40 -0000 1.4 @@ -1 +1 @@ -SUBDIRS = core-architecture +SUBDIRS = core-architecture smstorage |
