Changeset 126

Timestamp:

05/02/08 12:38:53 (8 months ago)

Author:

zork

Message:

files and build configuration for XMLArchive

Files:

• trunk/dba/config.bkl (modified) (5 diffs)
• trunk/dba/configure.in (modified) (6 diffs)
• trunk/dba/dba-config.in (modified) (3 diffs)
• trunk/dba/dba.bkl (modified) (5 diffs)
• trunk/dba/dba/xmlarchive.cpp (added)
• trunk/dba/dba/xmlarchive.h (added)
• trunk/dba/dba/xmlistream.cpp (added)
• trunk/dba/dba/xmlistream.h (added)
• trunk/dba/dba/xmlostream.cpp (added)
• trunk/dba/dba/xmlostream.h (added)
• trunk/dba/test/main.cpp (modified) (1 diff)
• trunk/dba/test/xmltestcase.cpp (added)
• trunk/dba/test/xmltestcase.h (added)

trunk/dba/config.bkl

@@ -19 +19 @@
-    <set var="SQLITE3">1</set>
-    <set var="CSV">1</set>
+    <set var="XML">1</set>
-    <set var="ODBC">1</set>
-    <set var="SQL_DEBUG">0</set>
@@ -40 +41 @@
-      <default-value>0</default-value>
-      <description>Set to 1 to build support for csv file format</description>
+    </option>
+    <option name="XML">
+      <values>0,1</values>
+      <default-value>0</default-value>
+      <description>Set to 1 to build support for xml file format</description>
-    </option>
-    <option name="ODBC">
@@ -79 +85 @@
-    <if cond="CSV==1">dbacsv_static</if>
-  </set>
+  <set var="XMLLIB_STATIC">
+    <if cond="XML==1">dbacsv_static</if>
+  </set>
-  
-  <!-- example settings -->
@@ -104 +113 @@
-    <define>$(substituteFromDict(ODBC,{'0':'','1':'TEST_ODBC'}))</define>
-    <define>$(substituteFromDict(CSV,{'0':'','1':'TEST_CSV'}))</define>
+    <define>$(substituteFromDict(CSV,{'0':'','1':'TEST_XML'}))</define>
-    <define>$(1_0_compat)</define>
-    <lib-path>$(DBA_BUILDDIR)</lib-path>
@@ -114 +124 @@
-  </template>
-  
+  <template id="xml_example" template_append="example">
+    <sys-lib>dbaxml$(LIBDEBUGSUFFIX)</sys-lib>
+  </template>
+  
-</makefile>

trunk/dba/configure.in

@@ -81 +81 @@
-
-
-
+ 
-PGSQL_CONFIG=pg_config
-AC_ARG_WITH(pg-config,
@@ -125 +125 @@
-fi
-
-
+ 
-AC_ARG_ENABLE(sqlite,[--enable-sqlite compile sqlite driver])
-if test "$enable_sqlite" == "yes"; then
@@ -143 +143 @@
-fi
-
-
+ 
-AC_ARG_ENABLE(sqlite3,[--enable-sqlite3 compile sqlite3 driver])
-if test "$enable_sqlite3" == "yes"; then
@@ -161 +161 @@
-fi
-
-
-
-
+
-ODBC_CONFIG=iodbc-config
-AC_ARG_WITH(iodbc-config,
@@ -205 +203 @@
-fi
-
-
-
-
+
-AC_ARG_ENABLE(csv,[--enable-csv compile csv archive support])
-if test "$enable_csv" == "yes"; then
@@ -214 +210 @@
-  CSV=0
-fi
+
+AC_BUILDER_CUSTOM_LIB([2.6.11],[xml2],[--cflags],[--libs],[xml2],
+  [
+    XML=1
+    AC_SUBST(XML)
+  ],
+  [
+    XML=0
+    AC_SUBST(XML)
+    AC_MSG_RESULT([libxml2 library not found. XML support disabled])
+  ]
+)
-
-AC_BAKEFILE([m4_include(autoconf_inc.m4)])

trunk/dba/dba-config.in

@@ -9 +9 @@
-Usage: dba-config [--prefix] [--version] [--debug]
-                  [--libs] [--cxxflags]
+                  [--csv-libs] [--csv-cxxflags]                  
+                  [--xml-libs] [--xml-cxxflags]
+
-
-dba-config returns configuration information about the installed
@@ -16 +19 @@
---prefix:   print dir where lib is installed
---version:  print version of library
-
-
+
+
+
+
+
+
-
-EOF
@@ -56 +63 @@
-      echo "@DBA_COMPAT_GCC_FLAGS@ -I$prefix/include"
-      ;;
+    --xml-libs)
+      echo "-L$prefix/lib -ldbaxml@DEBUG_SUFFIX@ -ldba@DEBUG_SUFFIX@"
+      ;;
+    --xml-cxxflags)
+      echo "-I$prefix/include"
+      ;;
-    --test-libs)
-      echo " -L$prefix/lib -ldbatest@DEBUG_SUFFIX@ -ldba@DEBUG_SUFFIX@ @CPPUNIT_LIBS@"

trunk/dba/dba.bkl

@@ -183 +183 @@
-  <set var="MSVC6PRJ_MERGED_TARGETS" append="1">dbacsv=dbacsv_static+dbacsv_dynamic</set>
-
+  <template id="dbaxml_base">
+    <name>dbaxml</name>
+    <include>$(LIBSRC)</include>
+    <sources>
+      dba/xmlarchive.cpp
+      dba/xmlistream.cpp
+      dba/xmlostream.cpp
+    </sources>
+        <msvc-headers>
+      dba/xmlarchive.h
+      dba/xmlistream.h
+      dba/xmlostream.h
+          </msvc-headers>
+  </template>
+  
+  <lib id="dbaxml_static" template="dbaxml_base" template_append="lib" cond="XML=='1' and SHARED=='0'">
+  </lib>
+
+  <dll id="dbaxml_dynamic" template="dbaxml_base" template_append="dll" cond="XML=='1' and SHARED=='1'">
+    <library>libdba_dynamic</library>
+    <namedll>dbaxml</namedll>
+    <so_version>0.0.0</so_version>
+  </dll>
+  
+  <set var="MSVC6PRJ_MERGED_TARGETS" append="1">dbaxml=dbaxml_static+dbaxml_dynamic</set>
+  
+  
-  <!-- modules linked with shared version of libdba -->
-  <template id="modulebase_dynamic" template="dyndll">
@@ -221 +248 @@
-    test/testobject.cpp
-    test/utils.cpp
+    test/xmltestcase.cpp
-  </set>
-
@@ -239 +267 @@
-    test/testobject.h
-    test/utils.h
+    test/xmltestcase.h
-  </set>
-
@@ -252 +281 @@
-    <define>$(define_shared)</define>
-    <define>$(substituteFromDict(CSV,{'0':'','1':'TEST_CSV'}))</define>
+    <define>$(substituteFromDict(XML,{'0':'','1':'TEST_XML'}))</define>
-  </lib>
-
@@ -261 +291 @@
-    <define>$(substituteFromDict(ODBC,{'0':'','1':'TEST_ODBC'}))</define>
-    <define>$(substituteFromDict(CSV,{'0':'','1':'TEST_CSV'}))</define>
+    <define>$(substituteFromDict(XML,{'0':'','1':'TEST_XML'}))</define>
-    <define>$(1_0_compat)</define>
-    <library>dbatestlib</library>

trunk/dba/test/main.cpp

@@ -20 +20 @@
-#include "dbplugintestsuite.h"
-#include "csvtestcase.h"
+#include "xmltestcase.h"
-#include "connectstringtestcase.h"
-