Merge remote-tracking branch 'origin/master' into libsplit

Conflicts:
	src/gui/folder.cpp

csync/src/CMakeLists.txt

@@ -88,10 +88,8 @@ configure_file(csync_version.h.in ${CMAKE_CURRENT_BINARY_DIR}/csync_version.h)
 
 set(csync_HDRS
   ${CMAKE_CURRENT_BINARY_DIR}/csync_version.h
+  ${CMAKE_CURRENT_BINARY_DIR}/../config_csync.h
   csync.h
-  vio/csync_vio.h
-  vio/csync_vio_method.h
-  vio/csync_vio_module.h
 )
 
 # Statically include sqlite
@@ -142,12 +140,18 @@ else()
   RUNTIME DESTINATION
     ${BIN_INSTALL_DIR}/${APPLICATION_EXECUTABLE}
   )
+  INSTALL(
+  FILES
+    ${csync_HDRS}
+  DESTINATION
+    ${INCLUDE_INSTALL_DIR}/${APPLICATION_NAME}
+  )
+  INSTALL(
+  FILES
+    std/c_private.h
+  DESTINATION
+    ${INCLUDE_INSTALL_DIR}/${APPLICATION_NAME}/std
+  )
 endif()
 
-# INSTALL(
-#   FILES
-#     ${csync_HDRS}
-#   DESTINATION
-#     ${INCLUDE_INSTALL_DIR}/${APPLICATION_NAME}
-# )
 

src/CMakeLists.txt

@@ -10,6 +10,7 @@ if (APPLE)
 endif()
 
 add_subdirectory(libsync)
+add_subdirectory(libclient)
 if (NOT BUILD_LIBRARIES_ONLY)
     add_subdirectory(gui)
     add_subdirectory(cmd)

src/cmd/cmd.cpp

@@ -42,6 +42,8 @@
 #include <termios.h>
 #endif
 
+#include <csync_private.h>
+
 using namespace OCC;
 
 struct CmdOptions {

src/gui/folder.cpp

@@ -32,6 +32,8 @@
 #include "filesystem.h"
 #include "excludedfiles.h"
 
+#include <csync_private.h>
+
 #include "creds/abstractcredentials.h"
 
 #include <QDebug>

src/gui/folderwatcher.h

@@ -14,8 +14,6 @@
 #ifndef MIRALL_FOLDERWATCHER_H
 #define MIRALL_FOLDERWATCHER_H
 
-#include "config.h"
-
 #include <QList>
 #include <QObject>
 #include <QString>

src/libclient/CMakeLists.txt

@@ -0,0 +1,175 @@
+project(libowncloudclient)
+set(CMAKE_AUTOMOC TRUE)
+include(GenerateExportHeader)
+
+configure_file(version.h.in "${CMAKE_CURRENT_BINARY_DIR}/version.h" )
+
+include_directories(${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR})
+# # csync is required.
+include_directories(
+                    ${CMAKE_SOURCE_DIR}/csync/src
+                    #${CMAKE_SOURCE_DIR}/csync/src/httpbf/src
+                    ${CMAKE_SOURCE_DIR}/src/gui
+                    ${CMAKE_BINARY_DIR}/src/gui # for ui_sslerrordialog.h
+                    ${CMAKE_SOURCE_DIR}/src/libsync
+                    ${CMAKE_BINARY_DIR}/src/libsync # for owncloudlib.h
+                    ${CMAKE_BINARY_DIR}/csync
+#                    ${CMAKE_BINARY_DIR}/csync/src
+                   )
+include_directories(${CMAKE_SOURCE_DIR}/src/3rdparty/qjson)
+# include_directories(${OPENSSL_INCLUDE_DIR})
+#
+if ( APPLE )
+    list(APPEND OS_SPECIFIC_LINK_LIBRARIES
+         /System/Library/Frameworks/CoreServices.framework
+         /System/Library/Frameworks/Foundation.framework
+         /System/Library/Frameworks/AppKit.framework
+    )
+endif()
+
+set(owncloudclientlib_NAME "owncloudclient")
+# IF(${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD|NetBSD|OpenBSD")
+#     list(APPEND OS_SPECIFIC_LINK_LIBRARIES
+#         inotify
+#     )
+# ENDIF(${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD|NetBSD|OpenBSD")
+#
+# if(SPARKLE_FOUND AND NOT BUILD_LIBRARIES_ONLY)
+#     list (APPEND OS_SPECIFIC_LINK_LIBRARIES ${SPARKLE_LIBRARY})
+# endif()
+
+set(libowncloudclient_SRCS
+    #account.cpp
+    ../gui/folder.cpp
+    ../gui/folderman.cpp
+    ../gui/folderwatcher.cpp
+    ../gui/folderwatcher_linux.cpp
+    ../gui/accountstate.cpp
+    ../gui/accountmanager.cpp
+    ../gui/proxyauthhandler.cpp
+    ../gui/proxyauthdialog.cpp
+    ../gui/sslerrordialog.cpp
+    ../gui/creds/httpcredentialsgui.cpp
+    ../gui/creds/credentialsfactory.cpp
+    ../gui/creds/shibbolethcredentials.cpp
+    ../gui/creds/shibboleth/shibbolethwebview.cpp
+#    ../gui/creds/shibboleth/shibbolethrefresher.cpp
+    ../gui/creds/shibboleth/shibbolethuserjob.cpp
+    ../gui/socketapi.cpp
+    ../gui/syncrunfilelog.cpp
+)
+
+# if(USE_NEON)
+#     list(APPEND libowncloudclient_SRCS
+#         propagator_legacy.cpp
+#     )
+#     add_definitions(-DUSE_NEON)
+# endif(USE_NEON)
+
+# These headers are installed for libowncloudsync to be used by 3rd party apps
+set(owncloudclient_HEADERS
+    ../gui/accountmanager.h
+    ../gui/accountstate.h
+    ../gui/folder.h
+    ../gui/folderman.h
+    ../gui/folderwatcher.h
+)
+
+IF (NOT APPLE)
+    INSTALL(
+        FILES ${owncloudclient_HEADERS}
+	DESTINATION ${INCLUDE_INSTALL_DIR}/${owncloudclientlib_NAME}
+    )
+    INSTALL(
+        FILES ${CMAKE_CURRENT_BINARY_DIR}/owncloudclientlib.h
+        DESTINATION ${INCLUDE_INSTALL_DIR}/${owncloudclientlib_NAME}
+    )
+ENDIF(NOT APPLE)
+
+list(APPEND libowncloudclient_LINK_TARGETS
+    ${QT_LIBRARIES}
+    ocsync
+    owncloudsync
+    ${OS_SPECIFIC_LINK_LIBRARIES}
+    ${OPENSSL_LIBRARIES}
+)
+
+if(QTKEYCHAIN_FOUND OR QT5KEYCHAIN_FOUND)
+    list(APPEND libowncloudclient_LINK_TARGETS ${QTKEYCHAIN_LIBRARY})
+    include_directories(${QTKEYCHAIN_INCLUDE_DIR})
+endif()
+#
+# if(INOTIFY_FOUND)
+#     include_directories(${INOTIFY_INCLUDE_DIR})
+#     link_directories(${INOTIFY_LIBRARY_DIR})
+# endif()
+#
+# if(NEON_FOUND)
+#     list(APPEND libowncloudclient_LINK_TARGETS ${NEON_LIBRARIES} httpbf)
+#     include_directories(${NEON_INCLUDE_DIRS})
+#
+#     if(NEON_WITH_LFS)
+#         add_definitions(-DNE_LFS)
+#     endif()
+# endif()
+#
+# if(ZLIB_FOUND)
+#     list(APPEND libowncloudclient_LINK_TARGETS ${ZLIB_LIBRARIES})
+#     include_directories(${ZLIB_INCLUDE_DIRS})
+# endif(ZLIB_FOUND)
+#
+add_library(${owncloudclientlib_NAME} SHARED ${libowncloudclient_SRCS} ${syncMoc})
+GENERATE_EXPORT_HEADER( ${owncloudclientlib_NAME}
+	BASE_NAME ${owncloudclientlib_NAME}
+	EXPORT_MACRO_NAME OWNCLOUDSYNC_EXPORT
+        EXPORT_FILE_NAME owncloudclientlib.h
+	STATIC_DEFINE OWNCLOUD_BUILT_AS_STATIC
+)
+
+# if(TOKEN_AUTH_ONLY)
+#     qt5_use_modules(${owncloudclientlib_NAME} Network Concurrent)
+# else()
+    qt5_use_modules(${owncloudclientlib_NAME} Widgets Network WebKitWidgets Concurrent)
+# endif()
+
+set_target_properties( ${owncloudclientlib_NAME}  PROPERTIES
+	VERSION ${MIRALL_VERSION}
+	SOVERSION ${MIRALL_SOVERSION}
+	RUNTIME_OUTPUT_DIRECTORY ${BIN_OUTPUT_DIRECTORY}
+)
+set_target_properties( ${owncloudclientlib_NAME} PROPERTIES
+	INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${LIB_INSTALL_DIR}/${APPLICATION_EXECUTABLE}" )
+
+target_link_libraries(${owncloudclientlib_NAME} ${libowncloudclient_LINK_TARGETS} )
+
+if(INOTIFY_FOUND)
+    target_link_libraries(${owncloudclientlib_NAME} ${INOTIFY_LIBRARY} )
+endif()
+
+if(BUILD_LIBRARIES_ONLY)
+    #add_library(${owncloudclientlib_NAME}_static STATIC ${libowncloudclient_SRCS} ${syncMoc})
+    #qt5_use_modules(${owncloudclientlib_NAME}_static Widgets Network Xml Sql)
+
+    #set_target_properties( ${owncloudclientlib_NAME}_static  PROPERTIES
+    #    VERSION ${MIRALL_VERSION}
+    #    SOVERSION ${MIRALL_SOVERSION}
+    #)
+
+    #target_link_libraries(${owncloudclientlib_NAME}_static ${libowncloudclient_LINK_TARGETS} )
+endif()
+
+if(NOT BUILD_OWNCLOUD_OSX_BUNDLE)
+    install(TARGETS ${owncloudclientlib_NAME}
+        RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
+        LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
+        ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
+    )
+else()
+    install(TARGETS ${owncloudclientlib_NAME} DESTINATION ${OWNCLOUD_OSX_BUNDLE}/Contents/MacOS)
+    if (SPARKLE_FOUND)
+        install(DIRECTORY "${SPARKLE_LIBRARY}"
+	        DESTINATION "${OWNCLOUD_OSX_BUNDLE}/Contents/Frameworks" USE_SOURCE_PERMISSIONS)
+    endif (SPARKLE_FOUND)
+endif()
+
+

src/libclient/version.h.in

@@ -0,0 +1,34 @@
+/*
+ * Copyright (C) by Klaas Freitag <freitag@owncloud.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * for more details.
+ */
+
+#ifndef VERSION_H
+#define VERSION_H
+
+#cmakedefine GIT_SHA1 "@GIT_SHA1@"
+
+#define MIRALL_STRINGIFY(s) MIRALL_TOSTRING(s)
+#define MIRALL_TOSTRING(s) #s
+
+/* MIRALL version */
+#define MIRALL_VERSION_MAJOR @MIRALL_VERSION_MAJOR@
+#define MIRALL_VERSION_MINOR @MIRALL_VERSION_MINOR@
+#define MIRALL_VERSION_PATCH @MIRALL_VERSION_PATCH@
+#define MIRALL_VERSION_BUILD @MIRALL_VERSION_BUILD@
+
+#define MIRALL_VERSION       @MIRALL_VERSION@
+#define MIRALL_VERSION_FULL  @MIRALL_VERSION_FULL@
+
+#define MIRALL_VERSION_STRING "@MIRALL_VERSION_STRING@"
+
+#endif // VERSION_H

src/libsync/CMakeLists.txt

@@ -82,14 +82,22 @@ endif(USE_NEON)
 
 # These headers are installed for libowncloudsync to be used by 3rd party apps
 set(owncloudsync_HEADERS
+    abstractnetworkjob.h
     account.h
     syncengine.h
     configfile.h
     networkjobs.h
     progressdispatcher.h
     syncfileitem.h
+    syncfilestatus.h
     syncjournaldb.h
     syncresult.h
+    utility.h
+    ownsql.h
+    clientproxy.h
+    accountfwd.h
+    capabilities.h
+    connectionvalidator.h
 )
 
 set(creds_HEADERS
@@ -106,6 +114,10 @@ IF (NOT APPLE)
         FILES ${creds_HEADERS}
 	DESTINATION ${INCLUDE_INSTALL_DIR}/${synclib_NAME}/creds
     )
+    INSTALL(
+        FILES ${CMAKE_CURRENT_BINARY_DIR}/owncloudlib.h
+        DESTINATION ${INCLUDE_INSTALL_DIR}/${synclib_NAME}
+    )
 ENDIF(NOT APPLE)
 
 list(APPEND libsync_LINK_TARGETS

src/libsync/discoveryphase.cpp

@@ -13,13 +13,14 @@
  */
 
 #include "discoveryphase.h"
-#include <csync_private.h>
 #include <qdebug.h>
 
 #include <QUrl>
 #include "account.h"
 #include <QFileInfo>
 
+#include <csync_private.h>
+
 namespace OCC {
 
 

src/libsync/syncengine.cpp

@@ -21,7 +21,8 @@
 #include "discoveryphase.h"
 #include "creds/abstractcredentials.h"
 #include "syncfilestatus.h"
-#include "csync_private.h"
+
+#include <csync_private.h>
 
 #ifdef Q_OS_WIN
 #include <windows.h>

src/libsync/syncengine.h

@@ -28,9 +28,6 @@
 
 #include <csync.h>
 
-// when do we go away with this private/public separation?
-#include <csync_private.h>
-
 #include "syncfileitem.h"
 #include "progressdispatcher.h"
 #include "utility.h"