[Opensync-commits] r5921 - in plugins/mozilla-sync/trunk: . src

[<svn...@op...>]

Author: henrik
Date: Tue Nov  3 20:15:41 2009
New Revision: 5921
URL: http://www.opensync.org/changeset/5921

Log:
Following the latest OpenSync API changes, mozilla-sync is now a pure external plugin, so all that is left in the OpenSync tree is configuration files. The main plugin code is now over at http://bluezync.kaarposoft.dk/

Deleted:
   plugins/mozilla-sync/trunk/src/mozilla-sync.cpp
Modified:
   plugins/mozilla-sync/trunk/CMakeLists.txt
   plugins/mozilla-sync/trunk/src/CMakeLists.txt

Modified: plugins/mozilla-sync/trunk/CMakeLists.txt
==============================================================================
--- plugins/mozilla-sync/trunk/CMakeLists.txt	Tue Nov  3 19:20:53 2009	(r5920)
+++ plugins/mozilla-sync/trunk/CMakeLists.txt	Tue Nov  3 20:15:41 2009	(r5921)
@@ -4,7 +4,7 @@
 #  See http://www.KaarPoSoft.dk/bluezync/
 #  $Id$
 #
-#  Copyright (C) 2007  Henrik Kaare Poulsen    /KaarPoSoft
+#  Copyright (C) 2007-2009  Henrik Kaare Poulsen    /KaarPoSoft
 #
 #  This plugin is free software: you can redistribute it and/or modify
 #  it under the terms of the GNU Lesser General Public License as published by
@@ -29,20 +29,11 @@
 ENDIF(COMMAND cmake_policy)
 
 SET( PROJECT_NAME mozilla-sync )
-PROJECT( ${PROJECT_NAME} C CXX )
+PROJECT( ${PROJECT_NAME} C )
 
-SET( CPACK_PACKAGE_VERSION_MAJOR "0")
-SET( CPACK_PACKAGE_VERSION_MINOR "1")
-SET( CPACK_PACKAGE_VERSION_PATCH "7")
-SET( VERSION "${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}" )
-
-#INCLUDE( FindPkgConfig )
 SET( CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${DESTDIR}${CMAKE_INSTALL_PREFIX}/share/libopensync1/cmake/modules/" "${CMAKE_SOURCE_DIR}/cmake/modules" )
-
-FIND_PACKAGE( GLIB2 2.14 REQUIRED)
 FIND_PACKAGE( OpenSync REQUIRED )
 
-
 INCLUDE( OpenSyncInternal )
 
 # OpenSyncInternal sets RelWithDebInfo, so we need to wait until now to set anything else
@@ -50,18 +41,4 @@
 
 ADD_SUBDIRECTORY( src )
 
-# cmake is great. but four back-slashes to escape a dot? Go figure...
-SET ( CPACK_SOURCE_IGNORE_FILES "\\\\.svn/;.*~" )
-
-# now we can "make package_source"
-# but "make package" does not work
-# maybe this is why:
-# http://marc.info/?l=cmake&m=119419269837083&w=2
-# can't be bothered now to change all this in OpenSync...
-
-MESSAGE ("CMAKING ${PROJECT_NAME} ${VERSION}")
-OPENSYNC_PACKAGE( ${PROJECT_NAME} ${VERSION} )
-
-# For debugging...
-#INCLUDE ( CMakePrintSystemInformation )
 

Modified: plugins/mozilla-sync/trunk/src/CMakeLists.txt
==============================================================================
--- plugins/mozilla-sync/trunk/src/CMakeLists.txt	Tue Nov  3 19:20:53 2009	(r5920)
+++ plugins/mozilla-sync/trunk/src/CMakeLists.txt	Tue Nov  3 20:15:41 2009	(r5921)
@@ -22,26 +22,10 @@
 #  ================================================================ 
 
 
-INCLUDE_DIRECTORIES(
-	${OPENSYNC_INCLUDE_DIRS}
-	${GLIB2_INCLUDE_DIRS}  
-)
-
-LINK_DIRECTORIES( 
-	${OPENSYNC_LIBRARY_DIRS} 
-	${GLIB2_LIBRARY_DIRS} 
- ) 
-
-
-OPENSYNC_PLUGIN_ADD( mozilla-sync mozilla-sync.cpp )
-
 
 OPENSYNC_PLUGIN_DESCRIPTIONS( mozilla-sync-desc.xml )
 OPENSYNC_PLUGIN_CAPABILITIES( mozilla-sync-caps.xml )
 
 OPENSYNC_PLUGIN_CONFIG( mozilla-sync )
-OPENSYNC_PLUGIN_INSTALL( mozilla-sync ) 
-
-TARGET_LINK_LIBRARIES( mozilla-sync
-	${OPENSYNC_LIBRARIES} ${GLIB2_LIBRARIES} )
+OPENSYNC_EXTERNAL_PLUGIN_INSTALL ( mozilla-sync.xml )