diff options
Diffstat (limited to 'kftpgrabber/src/misc')
17 files changed, 333 insertions, 8 deletions
diff --git a/kftpgrabber/src/misc/CMakeLists.txt b/kftpgrabber/src/misc/CMakeLists.txt new file mode 100644 index 0000000..a9b5cbf --- /dev/null +++ b/kftpgrabber/src/misc/CMakeLists.txt @@ -0,0 +1,52 @@ +add_subdirectory( interfaces ) +add_subdirectory( plugins ) +add_subdirectory( libs ) +add_subdirectory( customcommands ) + +include_directories( + ${CMAKE_BINARY_DIR} + ${CMAKE_CURRENT_BINARY_DIR} + ${CMAKE_CURRENT_SOURCE_DIR} + ${TDE_INCLUDE_DIR} + ${TQT_INCLUDE_DIRS} + ${CMAKE_SOURCE_DIR}/kftpgrabber/src + ${CMAKE_SOURCE_DIR}/kftpgrabber/src/misc/interfaces + ${OPENSSL_INCLUDE_DIR} + ${X11_INCLUDE_DIR} +) + +link_directories( + ${TQT_LIBRARY_DIRS} + ${TDE_LIB_DIR} +) + + +##### kftpgrabbercore (static) + +tde_add_library( kftpgrabbercore STATIC_PIC AUTOMOC + + SOURCES + misc.cpp + kftpotpgenerator.cpp + kftpapi.cpp + desencryptor.cpp + kftpwalletconnection.cpp + kftppluginmanager.cpp + kftpzeroconf.cpp + kftpconfig.kcfgc + configbase.cpp + filter.cpp + filterwidgethandler.cpp + LINK + kftpinterfaces-shared + customcommands-static + ${OPENSSL_LIBRARIES} +) + + +##### other data + +install( + FILES kftpgrabber.kcfg + DESTINATION ${KCFG_INSTALL_DIR} +) diff --git a/kftpgrabber/src/misc/Makefile.am b/kftpgrabber/src/misc/Makefile.am index b334505..7da83f8 100644 --- a/kftpgrabber/src/misc/Makefile.am +++ b/kftpgrabber/src/misc/Makefile.am @@ -10,7 +10,7 @@ noinst_LIBRARIES = libkftpgrabbercore.a libkftpgrabbercore_a_SOURCES = misc.cpp kftpotpgenerator.cpp \ kftpapi.cpp desencryptor.cpp kftpwalletconnection.cpp \ kftppluginmanager.cpp \ - kftpzeroconf.cpp config.kcfgc configbase.cpp filter.cpp \ + kftpzeroconf.cpp kftpconfig.kcfgc configbase.cpp filter.cpp \ filterwidgethandler.cpp libkftpgrabbercore_a_LIBADD = interfaces/libkftpinterfaces.la customcommands/libcustomcommands.a diff --git a/kftpgrabber/src/misc/configbase.cpp b/kftpgrabber/src/misc/configbase.cpp index e2a81f4..c9632e3 100644 --- a/kftpgrabber/src/misc/configbase.cpp +++ b/kftpgrabber/src/misc/configbase.cpp @@ -35,7 +35,7 @@ */ #include "configbase.h" -#include "config.h" +#include "kftpconfig.h" #include "kftpapi.h" #include "filter.h" diff --git a/kftpgrabber/src/misc/customcommands/CMakeLists.txt b/kftpgrabber/src/misc/customcommands/CMakeLists.txt new file mode 100644 index 0000000..0253b11 --- /dev/null +++ b/kftpgrabber/src/misc/customcommands/CMakeLists.txt @@ -0,0 +1,36 @@ +include_directories( + ${CMAKE_BINARY_DIR} + ${CMAKE_CURRENT_BINARY_DIR} + ${CMAKE_CURRENT_SOURCE_DIR} + ${TDE_INCLUDE_DIR} + ${TQT_INCLUDE_DIRS} + ${CMAKE_SOURCE_DIR}/kftpgrabber/src + ${CMAKE_SOURCE_DIR}/kftpgrabber/src/misc + ${CMAKE_SOURCE_DIR}/kftpgrabber/src/widgets +) + +link_directories( + ${TQT_LIBRARY_DIRS} + ${TDE_LIB_DIR} +) + + +##### customcommands (static) + +tde_add_library( customcommands STATIC_PIC AUTOMOC + + SOURCES + handlers.cpp + entry.cpp + manager.cpp + parameterentrydialog.cpp + responsedialog.cpp +) + + +##### other data + +install( + FILES commands.xml + DESTINATION ${DATA_INSTALL_DIR}/${PROJECT_NAME} +) diff --git a/kftpgrabber/src/misc/interfaces/CMakeLists.txt b/kftpgrabber/src/misc/interfaces/CMakeLists.txt new file mode 100644 index 0000000..0f2f983 --- /dev/null +++ b/kftpgrabber/src/misc/interfaces/CMakeLists.txt @@ -0,0 +1,44 @@ + +include_directories( + ${CMAKE_BINARY_DIR} + ${CMAKE_CURRENT_BINARY_DIR} + ${CMAKE_CURRENT_SOURCE_DIR} + ${TDE_INCLUDE_DIR} + ${TQT_INCLUDE_DIRS} +) + +link_directories( + ${TQT_LIBRARY_DIRS} + ${TDE_LIB_DIR} +) + + +##### kftpinterfaces (shared) + +tde_add_library( kftpinterfaces SHARED AUTOMOC + + SOURCES + kftpbookmarkimportplugin.cpp + LINK + tdecore-shared + tdeui-shared + tdeparts-shared + + VERSION 0.0.0 + + DESTINATION ${LIB_INSTALL_DIR} +) + + +##### other data + +tde_create_translated_desktop( + SOURCE kftpbookmarkimportplugin.desktop + DESTINATION ${SERVICETYPES_INSTALL_DIR} +) + + +install( + FILES kftpbookmarkimportplugin.h + DESTINATION ${INCLUDE_INSTALL_DIR}/${PROJECT_NAME} +) diff --git a/kftpgrabber/src/misc/interfaces/kftpbookmarkimportplugin.h b/kftpgrabber/src/misc/interfaces/kftpbookmarkimportplugin.h index 5f42ccf..033ce2b 100644 --- a/kftpgrabber/src/misc/interfaces/kftpbookmarkimportplugin.h +++ b/kftpgrabber/src/misc/interfaces/kftpbookmarkimportplugin.h @@ -43,7 +43,7 @@ * * @author Jernej Kos */ -class KFTPBookmarkImportPlugin : public KParts::Plugin { +class KDE_EXPORT KFTPBookmarkImportPlugin : public KParts::Plugin { Q_OBJECT public: KFTPBookmarkImportPlugin(TQObject *parent, const char *name = 0); diff --git a/kftpgrabber/src/misc/config.kcfgc b/kftpgrabber/src/misc/kftpconfig.kcfgc index d8ca269..d8ca269 100644 --- a/kftpgrabber/src/misc/config.kcfgc +++ b/kftpgrabber/src/misc/kftpconfig.kcfgc diff --git a/kftpgrabber/src/misc/libs/CMakeLists.txt b/kftpgrabber/src/misc/libs/CMakeLists.txt new file mode 100644 index 0000000..ebd49d3 --- /dev/null +++ b/kftpgrabber/src/misc/libs/CMakeLists.txt @@ -0,0 +1 @@ +add_subdirectory( ssh ) diff --git a/kftpgrabber/src/misc/libs/ssh/CMakeLists.txt b/kftpgrabber/src/misc/libs/ssh/CMakeLists.txt new file mode 100644 index 0000000..8af7109 --- /dev/null +++ b/kftpgrabber/src/misc/libs/ssh/CMakeLists.txt @@ -0,0 +1,25 @@ +include_directories( + ${CMAKE_BINARY_DIR} + ${CMAKE_CURRENT_BINARY_DIR} + ${CMAKE_CURRENT_SOURCE_DIR} + ${TDE_INCLUDE_DIR} + ${TQT_INCLUDE_DIRS} + ${OPENSSL_INCLUDE_DIR} + ${ZLIB_INCLUDE_DIRS} +) + +link_directories( + ${TQT_LIBRARY_DIRS} + ${TDE_LIB_DIR} +) + + +##### ssh (static) + +tde_add_library( ssh STATIC_PIC + + SOURCES + auth.c base64.c buffer.c channels.c client.c connect.c + crypt.c dh.c error.c gzip.c kex.c keyfiles.c keys.c misc.c + options.c packet.c sftp.c string.c wrapper.c +) diff --git a/kftpgrabber/src/misc/libs/ssh/libssh.h b/kftpgrabber/src/misc/libs/ssh/libssh.h index 7fdc939..81c586d 100644 --- a/kftpgrabber/src/misc/libs/ssh/libssh.h +++ b/kftpgrabber/src/misc/libs/ssh/libssh.h @@ -20,7 +20,11 @@ MA 02110-1301, USA. */ #ifndef _LIBSSH_H #define _LIBSSH_H + +#ifdef HAVE_CONFIG_H #include "config.h" +#endif + #include <unistd.h> #include <sys/select.h> /* for fd_set * */ #include <sys/types.h> diff --git a/kftpgrabber/src/misc/libs/ssh/priv.h b/kftpgrabber/src/misc/libs/ssh/priv.h index 2c93081..95e43bc 100644 --- a/kftpgrabber/src/misc/libs/ssh/priv.h +++ b/kftpgrabber/src/misc/libs/ssh/priv.h @@ -25,6 +25,11 @@ MA 02110-1301, USA. */ #ifndef _LIBSSH_PRIV_H #define _LIBSSH_PRIV_H + +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + #include "libssh.h" /* Debugging constants */ @@ -43,11 +48,10 @@ MA 02110-1301, USA. */ #define TYPE_RSA 2 #define TYPE_RSA1 3 -/* profiling constants. Don't touch them unless you know what you do */ +/* profiling constants. Don't touch them unless you know what you do */ #define OPENSSL_CRYPTO #define OPENSSL_BIGNUMS - #ifdef __cplusplus extern "C" { #endif @@ -88,11 +92,18 @@ typedef BN_CTX* bignum_CTX; #define bignum_num_bits(num) BN_num_bits(num) #define bignum_is_bit_set(num,bit) BN_is_bit_set(num,bit) #define bignum_bn2bin(num,ptr) BN_bn2bin(num,ptr) - #endif /* OPENSSL_BIGNUMS */ -#ifdef HAVE_SYS_TIME_H + +#if TIME_WITH_SYS_TIME +# include <sys/time.h> +# include <time.h> +#else +#if HAVE_SYS_TIME_H #include <sys/time.h> -#endif +#else +#include <time.h> +#endif // HAVE_SYS_TIME_H +#endif // TIME_WITH_SYS_TIME /* wrapper.c */ MD5CTX *md5_init(void); diff --git a/kftpgrabber/src/misc/plugins/CMakeLists.txt b/kftpgrabber/src/misc/plugins/CMakeLists.txt new file mode 100644 index 0000000..45d895c --- /dev/null +++ b/kftpgrabber/src/misc/plugins/CMakeLists.txt @@ -0,0 +1 @@ +add_subdirectory( bookmarkimport ) diff --git a/kftpgrabber/src/misc/plugins/bookmarkimport/CMakeLists.txt b/kftpgrabber/src/misc/plugins/bookmarkimport/CMakeLists.txt new file mode 100644 index 0000000..8969a38 --- /dev/null +++ b/kftpgrabber/src/misc/plugins/bookmarkimport/CMakeLists.txt @@ -0,0 +1,4 @@ +add_subdirectory( gftp ) +add_subdirectory( ncftp ) +add_subdirectory( kftp ) +add_subdirectory( filezilla3 ) diff --git a/kftpgrabber/src/misc/plugins/bookmarkimport/filezilla3/CMakeLists.txt b/kftpgrabber/src/misc/plugins/bookmarkimport/filezilla3/CMakeLists.txt new file mode 100644 index 0000000..7fd9672 --- /dev/null +++ b/kftpgrabber/src/misc/plugins/bookmarkimport/filezilla3/CMakeLists.txt @@ -0,0 +1,37 @@ + +include_directories( + ${CMAKE_BINARY_DIR} + ${CMAKE_CURRENT_BINARY_DIR} + ${CMAKE_CURRENT_SOURCE_DIR} + ${TDE_INCLUDE_DIR} + ${TQT_INCLUDE_DIRS} + ${CMAKE_SOURCE_DIR}/kftpgrabber/src/misc/interfaces +) + +link_directories( + ${TQT_LIBRARY_DIRS} + ${TDE_LIB_DIR} +) + + +##### kftpimportplugin_filezilla3 (kpart) + +tde_add_kpart( kftpimportplugin_filezilla3 AUTOMOC + + SOURCES + kftpimportfz3plugin.cpp + LINK + tdecore-shared + tdeui-shared + kftpinterfaces-shared + + DESTINATION ${PLUGIN_INSTALL_DIR} +) + + +##### other data + +tde_create_translated_desktop( + SOURCE kftpimportplugin_filezilla3.desktop + DESTINATION ${SERVICES_INSTALL_DIR} +) diff --git a/kftpgrabber/src/misc/plugins/bookmarkimport/gftp/CMakeLists.txt b/kftpgrabber/src/misc/plugins/bookmarkimport/gftp/CMakeLists.txt new file mode 100644 index 0000000..e777c1b --- /dev/null +++ b/kftpgrabber/src/misc/plugins/bookmarkimport/gftp/CMakeLists.txt @@ -0,0 +1,36 @@ +include_directories( + ${CMAKE_BINARY_DIR} + ${CMAKE_CURRENT_BINARY_DIR} + ${CMAKE_CURRENT_SOURCE_DIR} + ${TDE_INCLUDE_DIR} + ${TQT_INCLUDE_DIRS} + ${CMAKE_SOURCE_DIR}/kftpgrabber/src/misc/interfaces +) + +link_directories( + ${TQT_LIBRARY_DIRS} + ${TDE_LIB_DIR} +) + + +##### kftpimportplugin_gftp (kpart) + +tde_add_kpart( kftpimportplugin_gftp AUTOMOC + + SOURCES + kftpimportgftpplugin.cpp + LINK + tdecore-shared + tdeui-shared + kftpinterfaces-shared + + DESTINATION ${PLUGIN_INSTALL_DIR} +) + + +##### other data + +tde_create_translated_desktop( + SOURCE kftpimportplugin_gftp.desktop + DESTINATION ${SERVICES_INSTALL_DIR} +) diff --git a/kftpgrabber/src/misc/plugins/bookmarkimport/kftp/CMakeLists.txt b/kftpgrabber/src/misc/plugins/bookmarkimport/kftp/CMakeLists.txt new file mode 100644 index 0000000..8337c19 --- /dev/null +++ b/kftpgrabber/src/misc/plugins/bookmarkimport/kftp/CMakeLists.txt @@ -0,0 +1,37 @@ + +include_directories( + ${CMAKE_BINARY_DIR} + ${CMAKE_CURRENT_BINARY_DIR} + ${CMAKE_CURRENT_SOURCE_DIR} + ${TDE_INCLUDE_DIR} + ${TQT_INCLUDE_DIRS} + ${CMAKE_SOURCE_DIR}/kftpgrabber/src/misc/interfaces +) + +link_directories( + ${TQT_LIBRARY_DIRS} + ${TDE_LIB_DIR} +) + + +##### kftpimportplugin_kftp (kpart) + +tde_add_kpart( kftpimportplugin_kftp AUTOMOC + + SOURCES + kftpimportkftpplugin.cpp + LINK + tdecore-shared + tdeui-shared + kftpinterfaces-shared + + DESTINATION ${PLUGIN_INSTALL_DIR} +) + + +##### other data + +tde_create_translated_desktop( + SOURCE kftpimportplugin_kftp.desktop + DESTINATION ${SERVICES_INSTALL_DIR} +) diff --git a/kftpgrabber/src/misc/plugins/bookmarkimport/ncftp/CMakeLists.txt b/kftpgrabber/src/misc/plugins/bookmarkimport/ncftp/CMakeLists.txt new file mode 100644 index 0000000..f669049 --- /dev/null +++ b/kftpgrabber/src/misc/plugins/bookmarkimport/ncftp/CMakeLists.txt @@ -0,0 +1,37 @@ + +include_directories( + ${CMAKE_BINARY_DIR} + ${CMAKE_CURRENT_BINARY_DIR} + ${CMAKE_CURRENT_SOURCE_DIR} + ${TDE_INCLUDE_DIR} + ${TQT_INCLUDE_DIRS} + ${CMAKE_SOURCE_DIR}/kftpgrabber/src/misc/interfaces +) + +link_directories( + ${TQT_LIBRARY_DIRS} + ${TDE_LIB_DIR} +) + + +##### kftpimportplugin_ncftp (kpart) + +tde_add_kpart( kftpimportplugin_ncftp AUTOMOC + + SOURCES + kftpimportncftpplugin.cpp + LINK + tdecore-shared + tdeui-shared + kftpinterfaces-shared + + DESTINATION ${PLUGIN_INSTALL_DIR} +) + + +##### other data + +tde_create_translated_desktop( + SOURCE kftpimportplugin_ncftp.desktop + DESTINATION ${SERVICES_INSTALL_DIR} +) |