Changeset 3365

Timestamp:

06/14/08 19:27:34 (3 months ago)

Author:

dgollub

Message:

Moved (again) xmlformat in seperated module
Initial author: bricks - see r3362

Files:

• trunk/formats/plain.c (modified) (1 diff)
• trunk/formats/xmlformat-doc.c (modified) (1 diff)
• trunk/formats/xmlformat.h (modified) (1 diff)
• trunk/opensync/CMakeLists.txt (modified) (4 diffs)
• trunk/opensync/engine/opensync_engine.c (modified) (1 diff)
• trunk/opensync/engine/opensync_obj_engine.c (modified) (1 diff)
• trunk/opensync/merger/opensync-merger_internals.h (modified) (1 diff)
• trunk/opensync/merger/opensync_merger.c (modified) (2 diffs)
• trunk/opensync/opensync-merger.h (modified) (1 diff)
• trunk/opensync/xmlformat (added)
• trunk/opensync/xmlformat/opensync_xmlfield.c (moved) (moved from trunk/opensync/merger/opensync_xmlfield.c) (1 diff, 1 prop)
• trunk/opensync/xmlformat/opensync_xmlfield.h (moved) (moved from trunk/opensync/merger/opensync_xmlfield.h) (1 prop)
• trunk/opensync/xmlformat/opensync_xmlfield_internals.h (moved) (moved from trunk/opensync/merger/opensync_xmlfield_internals.h) (1 prop)
• trunk/opensync/xmlformat/opensync_xmlfieldlist.c (moved) (moved from trunk/opensync/merger/opensync_xmlfieldlist.c) (1 diff, 1 prop)
• trunk/opensync/xmlformat/opensync_xmlfieldlist.h (moved) (moved from trunk/opensync/merger/opensync_xmlfieldlist.h) (1 prop)
• trunk/opensync/xmlformat/opensync_xmlfieldlist_internals.h (moved) (moved from trunk/opensync/merger/opensync_xmlfieldlist_internals.h) (1 prop)
• trunk/opensync/xmlformat/opensync_xmlformat.c (moved) (moved from trunk/opensync/merger/opensync_xmlformat.c) (1 diff, 1 prop)
• trunk/opensync/xmlformat/opensync_xmlformat.h (moved) (moved from trunk/opensync/merger/opensync_xmlformat.h) (1 prop)
• trunk/opensync/xmlformat/opensync_xmlformat_internals.h (moved) (moved from trunk/opensync/merger/opensync_xmlformat_internals.h) (1 prop)

trunk/formats/plain.c

@@ -24 +24 @@
-#include <opensync/opensync-serializer.h>
-#include <opensync/opensync-format.h>
-merger
+xmlformat
-#include <glib.h>
-

trunk/formats/xmlformat-doc.c

@@ -24 +24 @@
-#include <opensync/opensync.h>
-#include <opensync/opensync_internals.h>
-merger
+xmlformat
-#include <opensync/opensync-format.h>
-

trunk/formats/xmlformat.h

@@ -30 +30 @@
-#include <opensync/opensync.h>
-#include <opensync/opensync_internals.h>
-merger
+xmlformat
-#include <opensync/opensync-serializer.h>
-#include <opensync/opensync-format.h>

trunk/opensync/CMakeLists.txt

@@ -44 +44 @@
-   merger/opensync_capability.c
-   merger/opensync_merger.c
-   merger/opensync_xmlfield.c
-   merger/opensync_xmlfieldlist.c
-   merger/opensync_xmlformat.c
-   module/opensync_module.c
-   plugin/opensync_plugin_authentication.c
@@ -58 +55 @@
-   plugin/opensync_sink.c
-   version/opensync_version.c
+   xmlformat/opensync_xmlfield.c
+   xmlformat/opensync_xmlfieldlist.c
+   xmlformat/opensync_xmlformat.c
-)
-
@@ -89 +89 @@
-  plugin
-  version
+  xmlforrmat
-DESTINATION ${OPENSYNC_INCLUDE_DIR}/opensync 
-PATTERN "*/*_internals.h" EXCLUDE 
@@ -116 +117 @@
-   opensync-time.h
-   opensync-version.h
+   opensync-xmlformat.h
-DESTINATION ${OPENSYNC_INCLUDE_DIR}/opensync )
-

trunk/opensync/engine/opensync_engine.c

@@ -31 +31 @@
-#include "opensync-archive.h"
-#include "opensync-merger.h"
+#include "opensync-xmlformat.h"
-
-#include "opensync_obj_engine.h"

trunk/opensync/engine/opensync_obj_engine.c

@@ -31 +31 @@
-#include "opensync-merger.h"
-#include "opensync-plugin.h"
+#include "opensync-xmlformat.h"
-
-#include "opensync_sink_engine_internals.h"

trunk/opensync/merger/opensync-merger_internals.h

@@ -28 +28 @@
-#include "opensync_capabilities_internals.h"
-#include "opensync_capability_internals.h"
-#include "opensync_xmlformat_internals.h"
-#include "opensync_xmlfield_internals.h"
-#include "opensync_xmlfieldlist_internals.h"
-#include "opensync_merger_internals.h"
-

trunk/opensync/merger/opensync_merger.c

@@ -24 +24 @@
-#include "opensync_internals.h"
-
+#include "opensync-xmlformat.h"
+/* FIXME: osync_merge_merge() requires direct xmlNode access -> dirty! */ 
+#include "../xmlformat/opensync-xmlformat_internals.h"
+
-#include "opensync-merger.h"
-#include "opensync-merger_internals.h"
+
-
-/**
@@ -126 +131 @@
-                ret = strcmp(osync_xmlfield_get_name(new_cur), osync_xmlfield_get_name(old_cur));
-                if(ret < 0) {
-new_cur->next
+osync_xmlfield_get_next(new_cur)
-                                new_cur = osync_xmlfield_get_next(new_cur);
-                                continue;

trunk/opensync/opensync-merger.h

@@ -26 +26 @@
-#include "merger/opensync_capabilities.h"
-#include "merger/opensync_capability.h"
-#include "merger/opensync_xmlformat.h"
-#include "merger/opensync_xmlfield.h"
-#include "merger/opensync_xmlfieldlist.h"
-#include "merger/opensync_merger.h"
-

trunk/opensync/xmlformat/opensync_xmlfield.c

@@ -24 +24 @@
-#include "opensync_internals.h"
-
-merger
-merger
+xmlformat
+xmlformat
-
-/**

trunk/opensync/xmlformat/opensync_xmlfieldlist.c

@@ -24 +24 @@
-#include "opensync_internals.h"
-
-merger
-merger
+xmlformat
+xmlformat
-
-/**

trunk/opensync/xmlformat/opensync_xmlformat.c

@@ -24 +24 @@
-#include "opensync_internals.h"
-
-merger
-merger
+xmlformat
+xmlformat
-
-/**