Branch: master

f92c11df 2019-04-12 07:22:06 gregory guy 
conversion to the cmake building system

Removed cpp files generated from ui files.
This resolves issue #1.

Signed-off-by: gregory guy <g-gregory@...>
Signed-off-by: Slávek Banko <slavek.banko@...>
A CMakeLists.txt
A ConfigureChecks.cmake
A config.h.cmake
A doc/CMakeLists.txt
A doc/en/CMakeLists.txt
A doc/man/CMakeLists.txt
A doc/man/kasablanca.1
A po/CMakeLists.txt
A src/CMakeLists.txt
M src/bookmarkdialog.cpp
M src/customconnectdialog.cpp
M src/eventhandler.cpp
M src/eventhandler.h
M src/fileexistsdialog.h
M src/ftpsession.cpp
M src/ftpsession.h
M src/ftpthread.cpp
M src/ftpthread.h
M src/importdialog.cpp
M src/kasablanca.cpp
M src/kasablanca.h
M src/kbbookmarkitem.h
M src/kbdir.h
M src/kbdirinfo.cpp
M src/kbfile.h
M src/kbfileinfo.cpp
M src/kbfileinfo.h
M src/kbitem.cpp
M src/kbitem.h
M src/kbsiteinfo.cpp
M src/kbsiteinfo.h
M src/kbstatustip.cpp
M src/kbstatustip.h
M src/kbtaskview.cpp
M src/kbtransferfile.cpp
M src/kbtransferitem.h
R src/Q_bookmarkdialog.cpp
R src/Q_colorspreferencesdialog.cpp
R src/Q_customconnectdialog.cpp
R src/Q_fileexistsdialog.cpp
R src/Q_generalpreferencesdialog.cpp
R src/Q_importdialog.cpp
R src/Q_mainwindow.cpp
R src/Q_userinterfacepreferencesdialog.cpp

CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
new file mode 100644
index 0000000..bcbe256
--- /dev/null
+++ b/CMakeLists.txt
@@ -0,0 +1,78 @@
+############################################
+#                                          #
+#  Improvements and feedbacks are welcome  #
+#                                          #
+#  This file is released under GPL >= 3    #
+#                                          #
+############################################
+
+
+cmake_minimum_required( VERSION 2.8 )
+
+
+#### general package setup
+
+project( kasablanca )
+set( VERSION R14.1.0 )
+
+
+#### include essential cmake modules
+
+include( FindPkgConfig          )
+include( CheckFunctionExists    )
+include( CheckSymbolExists      )
+include( CheckIncludeFile       )
+include( CheckLibraryExists     )
+include( CheckCSourceCompiles   )
+include( CheckCXXSourceCompiles )
+
+
+#### include our cmake modules
+
+set( CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake/modules" )
+include( TDEMacros )
+
+
+##### setup install paths
+
+include( TDESetupPaths )
+tde_setup_paths( )
+
+
+##### optional stuff
+
+option( WITH_ALL_OPTIONS "Enable all optional support" OFF                                          )
+option( WITH_GCC_VISIBILITY "Enable fvisibility and fvisibility-inlines-hidden" ${WITH_ALL_OPTIONS} )
+
+
+##### user requested modules
+
+option( BUILD_ALL "Build all" ON                             )
+option( BUILD_DOC "Build documentation" ${BUILD_ALL}         )
+option( BUILD_TRANSLATIONS "Build translations" ${BUILD_ALL} )
+
+
+##### configure checks
+
+include( ConfigureChecks.cmake )
+
+
+###### global compiler settings
+
+add_definitions( -DHAVE_CONFIG_H -UTQT_NO_ASCII_CAST )
+
+set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${TQT_CXX_FLAGS}" )
+set( CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,--no-undefined" )
+set( CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} -Wl,--no-undefined" )
+
+
+##### directories
+
+add_subdirectory( src )
+tde_conditional_add_subdirectory( BUILD_DOC doc         )
+tde_conditional_add_subdirectory( BUILD_TRANSLATIONS po ) 
+
+
+##### write configure files
+
+configure_file( config.h.cmake config.h @ONLY )

ConfigureChecks.cmake

diff --git a/ConfigureChecks.cmake b/ConfigureChecks.cmake
new file mode 100644
index 0000000..09af851
--- /dev/null
+++ b/ConfigureChecks.cmake
@@ -0,0 +1,33 @@
+###########################################
+#                                         #
+#  Improvements and feedback are welcome  #
+#                                         #
+#  This file is released under GPL >= 3   #
+#                                         #
+###########################################
+
+# required stuff
+find_package( TQt )
+find_package( TDE )
+
+tde_setup_architecture_flags( )
+
+include(TestBigEndian)
+test_big_endian(WORDS_BIGENDIAN)
+
+tde_setup_largefiles( )
+
+
+##### check for gcc visibility support
+
+if( WITH_GCC_VISIBILITY )
+  tde_setup_gcc_visibility( )
+endif( WITH_GCC_VISIBILITY )
+
+
+##### check for OpenSSL
+
+find_package( OpenSSL )
+if( NOT OPENSSL_FOUND )
+   tde_message_fatal( "SSL support is required but OpenSSL was not found on your system" )
+endif( NOT OPENSSL_FOUND )

config.h.cmake

diff --git a/config.h.cmake b/config.h.cmake
new file mode 100644
index 0000000..61ede3a
--- /dev/null
+++ b/config.h.cmake
@@ -0,0 +1,8 @@
+#define VERSION "@VERSION@"
+
+// Defined if you have fvisibility and fvisibility-inlines-hidden support.
+#cmakedefine __KDE_HAVE_GCC_VISIBILITY 1
+
+/* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most
+   significant byte first (like Motorola and SPARC, unlike Intel). */
+#cmakedefine WORDS_BIGENDIAN @WORDS_BIGENDIAN@

doc/CMakeLists.txt

diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt
new file mode 100644
index 0000000..6d0aa9f
--- /dev/null
+++ b/doc/CMakeLists.txt
@@ -0,0 +1 @@
+tde_auto_add_subdirectories( )

doc/en/CMakeLists.txt

diff --git a/doc/en/CMakeLists.txt b/doc/en/CMakeLists.txt
new file mode 100644
index 0000000..c96df24
--- /dev/null
+++ b/doc/en/CMakeLists.txt
@@ -0,0 +1,2 @@
+tde_create_handbook( DESTINATION ${PROJECT_NAME} )
+

doc/man/CMakeLists.txt

diff --git a/doc/man/CMakeLists.txt b/doc/man/CMakeLists.txt
new file mode 100644
index 0000000..8512250
--- /dev/null
+++ b/doc/man/CMakeLists.txt
@@ -0,0 +1,5 @@
+INSTALL(
+    FILES ${PROJECT_NAME}.1
+    DESTINATION ${MAN_INSTALL_DIR}/man1
+    COMPONENT doc
+)

doc/man/kasablanca.1

diff --git a/doc/man/kasablanca.1 b/doc/man/kasablanca.1
new file mode 100644
index 0000000..19f230c
--- /dev/null
+++ b/doc/man/kasablanca.1
@@ -0,0 +1,72 @@
+'\" -*- coding: us-ascii -*-
+.if \n(.g .ds T< \\FC
+.if \n(.g .ds T> \\F[\n[.fam]]
+.de URL
+\\$2 \(la\\$1\(ra\\$3
+..
+.if \n(.g .mso www.tmac
+.TH kasablanca 1 "mars 22, 2006" "" ""
+.SH NAME
+kasablanca \- fast and free ftp client for TDE
+.SH SYNOPSIS
+'nh
+.fi
+.ad l
+\fBkasablanca\fR \kx
+.if (\nx>(\n(.l/2)) .nr x (\n(.l/5)
+'in \n(.iu+\nxu
+[\fB\fIoptions\fB\fR]
+'in \n(.iu-\nxu
+.ad b
+'hy
+.SH DESCRIPTION
+\fBkasablanca\fR is an ftp client, written in c++, using the tde libraries.
+.PP
+Features:
+
+* ftps encryption via AUTH TLS
+.br
+* fxp (direct server to server transfer), supporting alternative mode
+.br
+* advanced bookmarking system
+.br
+* fast responsive multithreaded engine
+.br
+* concurrent connections to multiple hosts
+.br
+* interactive transfer queue, movable by drag and drop
+.br
+* small nifty features, like a skiplist
+.SH OPTIONS
+All TDE and Qt programs accept some common command-line options.
+\fBkasablanca\fR has no application-specific options.
+.TP 
+\*(T<\fB\-\-help\fR\*(T> 
+Show help about options
+.TP 
+\*(T<\fB\-\-help\-qt\fR\*(T> 
+Show Qt specific options
+.TP 
+\*(T<\fB\-\-help\-tde\fR\*(T> 
+Show TDE specific options
+.TP 
+\*(T<\fB\-\-help\-all\fR\*(T> 
+Show all options
+.TP 
+\*(T<\fB\-\-author\fR\*(T> 
+Show author information
+.TP 
+\*(T<\fB\-v\fR\*(T> \*(T<\fB\-\-version\fR\*(T> 
+Show version information
+.TP 
+\*(T<\fB\-\-license\fR\*(T> 
+Show license information
+.SH AUTHOR
+This manual page was written by Fathi Boudra <<\*(T<fboudra@...\*(T>>> for
+the Debian system (but may be used by others). Permission is
+granted to copy, distribute and/or modify this document under
+the terms of the GNU General Public License, Version 2 any 
+later version published by the Free Software Foundation.
+.PP
+On Debian systems, the complete text of the GNU General Public
+License can be found in /usr/share/common-licenses/GPL.

po/CMakeLists.txt

diff --git a/po/CMakeLists.txt b/po/CMakeLists.txt
new file mode 100644
index 0000000..ad36a01
--- /dev/null
+++ b/po/CMakeLists.txt
@@ -0,0 +1,5 @@
+file( GLOB _srcs RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.po )
+
+if( _srcs )
** Diff limit reached (max: 250 lines) **
903ee205 2019-04-12 07:22:18 Slávek Banko 
Add includes to UI files to resolve FTBFS.

Signed-off-by: Slávek Banko <slavek.banko@...>
M src/Q_bookmarkdialog.ui
M src/Q_colorspreferencesdialog.ui
M src/Q_mainwindow.ui
M src/Q_userinterfacepreferencesdialog.ui
** Diff limit reached (max: 250 lines) **
0d2238b5 2019-04-12 07:22:20 Slávek Banko 
Added controlled conversions to char* instead of automatic ascii conversions.
The definition of -UTQT_NO_ASCII_CAST is no longer needed.

Signed-off-by: Slávek Banko <slavek.banko@...>
M CMakeLists.txt
M src/ftpthread.cpp
M src/kasablanca.cpp
** Diff limit reached (max: 250 lines) **

Branch: r14.0.x

5db7d87e 2019-04-12 10:56:16 Slávek Banko 
Add includes to UI files to resolve FTBFS.

Signed-off-by: Slávek Banko <slavek.banko@...>
(cherry picked from commit 903ee205e515f879deacfe7e08c157528d6a14b5)
M src/Q_bookmarkdialog.ui
M src/Q_colorspreferencesdialog.ui
M src/Q_mainwindow.ui
M src/Q_userinterfacepreferencesdialog.ui
** Diff limit reached (max: 250 lines) **
8acdd39b 2019-04-12 10:57:00 Slávek Banko 
Added controlled conversions to char* instead of automatic ascii conversions.
The definition of -UTQT_NO_ASCII_CAST is no longer needed.

Signed-off-by: Slávek Banko <slavek.banko@...>
(cherry picked from commit 0d2238b5a78bc1aa5440b0ce63f83249aafc40c2)
M CMakeLists.txt
M src/ftpthread.cpp
M src/kasablanca.cpp
** Diff limit reached (max: 250 lines) **