Changeset 2972

Timestamp:

12/17/07 15:59:28 (10 months ago)

Author:

prahal

Message:

Create an updated version of 0.34 (which build with changes to the build system

• hopefully ) as svn is broken.
  

Plus some fixes for http-server.

Files:

• tags/plugins-0.35/syncml/CMakeLists.txt (modified) (1 diff)
• tags/plugins-0.35/syncml/config.h.cmake (deleted)
• tags/plugins-0.35/syncml/src/CMakeLists.txt (modified) (1 diff)
• tags/plugins-0.35/syncml/src/syncml-http-client (deleted)
• tags/plugins-0.35/syncml/src/syncml-http-client.xsd (deleted)
• tags/plugins-0.35/syncml/src/syncml-http-server (modified) (2 diffs)
• tags/plugins-0.35/syncml/src/syncml-obex-client (modified) (2 diffs)
• tags/plugins-0.35/syncml/src/syncml_callbacks.c (deleted)
• tags/plugins-0.35/syncml/src/syncml_callbacks.h (deleted)
• tags/plugins-0.35/syncml/src/syncml_common.c (deleted)
• tags/plugins-0.35/syncml/src/syncml_common.h (deleted)
• tags/plugins-0.35/syncml/src/syncml_devinf.c (deleted)
• tags/plugins-0.35/syncml/src/syncml_devinf.h (deleted)
• tags/plugins-0.35/syncml/src/syncml_http_client.c (deleted)
• tags/plugins-0.35/syncml/src/syncml_http_client.h (deleted)
• tags/plugins-0.35/syncml/src/syncml_http_server.c (deleted)
• tags/plugins-0.35/syncml/src/syncml_http_server.h (deleted)
• tags/plugins-0.35/syncml/src/syncml_obex_client.c (deleted)
• tags/plugins-0.35/syncml/src/syncml_obex_client.h (deleted)
• tags/plugins-0.35/syncml/src/syncml_plugin.c (modified) (1 diff)
• tags/plugins-0.35/syncml/src/syncml_plugin.h (added)

tags/plugins-0.35/syncml/CMakeLists.txt

@@ -4 +4 @@
-
-SET( CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake/modules" )
-SET( CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_INSTALL_PREFIX}/share/opensync-1.0/cmake/modules/")
-
-INCLUDE_DIRECTORIES( ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} )
-
-# find requirements
-6
+5
-
-FIND_PACKAGE( OpenSync REQUIRED )
-FIND_PACKAGE( GLIB2 REQUIRED )
-FIND_PACKAGE( LibXml2 REQUIRED )
-# TODO - check whether LibSyncml supports obex and/or http
-FIND_PACKAGE( LibSyncMl REQUIRED )
-
-INCLUDE( OpenSyncInternal )
-
-# Defaults
-SET( ENABLE_OBEX TRUE CACHE BOOL "OBEX Transport" )
-SET( ENABLE_HTTP TRUE CACHE BOOL "HTTP Transport" )
-
-CONFIGURE_FILE("config.h.cmake" "config.h")
-
-ADD_SUBDIRECTORY( src )

tags/plugins-0.35/syncml/src/CMakeLists.txt

@@ -1 +1 @@
-LINK_DIRECTORIES( ${OPENSYNC_LIBRARY_DIRS} ${GLIB2_LIBRARY_DIRS} ${LIBXML2_LIBRARY_DIRS} ${LIBSYNCML_LIBRARY_DIRS})
-${OPENSYNC_INCLUDE_DIRS} ${GLIB2_INCLUDE_DIRS} ${LIBXML2_INCLUDE_DIRS} ${LIBSYNCML_INCLUDE_DIRS}
+ ${OPENSYNC_INCLUDE_DIRS} ${GLIB2_INCLUDE_DIRS} ${LIBXML2_INCLUDE_DIRS} ${LIBSYNCML_INCLUDE_DIRS} 
-
-SET(SOURCE_FILES syncml_plugin.c syncml_common.c syncml_devinf.c syncml_callbacks.c
+OPENSYNC_PLUGIN_ADD( syncml-plugin syncml_plugin.c 
-
-
-
-
+
-
-
-
-
+
+
-
-
+
+
-
-TARGET_LINK_LIBRARIES(syncml-plugin ${OPENSYNC_LIBRARIES} ${LIBSYNCML_LIBRARIES} ${GLIB2_LIBRARIES} ${LIBXML2_LIBRARIES})
-
-###### INSTALL ###################
-OPENSYNC_PLUGIN_INSTALL(syncml-plugin)
-
-IF (ENABLE_OBEX)
-        OPENSYNC_PLUGIN_CONFIG(syncml-obex-client)
-ENDIF (ENABLE_OBEX)
-
-IF (ENABLE_HTTP)
-        OPENSYNC_PLUGIN_CONFIG(syncml-http-server)
-        OPENSYNC_PLUGIN_CONFIG(syncml-http-client)
-ENDIF (ENABLE_HTTP)

tags/plugins-0.35/syncml/src/syncml-http-server

@@ -31 +31 @@
-     <name>Contacts</name>
-     <objtype>contact</objtype>
-     <objformat>vcard21</objformat>
-  </database>
-  
@@ -38 +37 @@
-     <name>Calendar</name>
-     <objtype>event</objtype>
-     <objformat>vevent20</objformat>
-  </database>
-
+  
-  <!-- Note database -->
-  <database>
-     <name>Notes</name>
-     <objtype>note</objtype>
-     <objformat>vnote10</objformat>
-  </database>
-

tags/plugins-0.35/syncml/src/syncml-obex-client

@@ -1 +1 @@
-<?xml version="1.0"?>
-<config>
-
-
-
-
-
-
-
-
-
-
-
+
-  <bluetooth_address></bluetooth_address>
-  
-
-
+
-  <bluetooth_channel></bluetooth_channel>
-  
@@ -35 +24 @@
-  <!-- the password for the username -->
-  <password></password>
-
+
+
+
+
-  <!-- If wbxml is enabled, defines wether the wbxml should use string tables -->
-  <usestringtable>0</usestringtable>

tags/plugins-0.35/syncml/src/syncml_plugin.c

@@ -19 +19 @@
- */
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+