Olivier Goffart
b5ed352aa3
Merge remote-tracking branch 'origin/master' into ocsync
...
Only confluct resolution, do not compile or works
Conflicts:
CMakeLists.txt
CPackConfig.cmake
ConfigureChecks.cmake
client/csync_client.c
cmake/Modules/DefineCompilerFlags.cmake
cmake/Modules/DefineInstallationPaths.cmake
cmake/Modules/FindIconv.cmake
cmake/Modules/FindIniparser.cmake
cmake/Modules/FindNeon.cmake
config.h.cmake
config/CMakeLists.txt
config/ocsync.conf
doc/CMakeLists.txt
modules/csync_owncloud.c
modules/csync_sftp2.c
src/CMakeLists.txt
src/csync.c
src/csync.h
src/csync_config.c
src/csync_exclude.c
src/csync_lock.c
src/csync_macros.h
src/csync_misc.c
src/csync_misc.h
src/csync_private.h
src/csync_propagate.c
src/csync_statedb.c
src/csync_statedb.h
src/csync_update.c
src/csync_util.c
src/csync_util.h
src/std/c_dir.c
src/std/c_file.c
src/std/c_private.h
src/std/c_string.c
src/std/c_string.h
src/std/c_time.c
src/vio/csync_vio.c
src/vio/csync_vio.h
src/vio/csync_vio_file_stat.h
src/vio/csync_vio_local.c
src/vio/csync_vio_method.h
tests/CMakeLists.txt
tests/csync_tests/check_csync_statedb_load.c
tests/csync_tests/check_csync_statedb_query.c
tests/csync_tests/check_csync_treewalk.c
tests/csync_tests/check_csync_update.c
tests/ownCloud/HTTP/DAV.pm
tests/ownCloud/ownCloud/Test.pm
tests/std_tests/check_std_c_str.c
tests/vio_tests/check_vio.c
2013-08-18 16:21:18 +02:00
Daniel Molkentin
f054ca3f72
Disable Werror by default, set CSYNC_STRICT=ON to disable
2013-08-08 16:19:44 +02:00
Daniel Molkentin
6a6bfd1c89
Use proper compiler switch
2013-08-07 16:58:09 +02:00
Daniel Molkentin
045a3f17ba
_USE_GNU -> _GNU_SOURCE
2013-08-05 21:11:14 +02:00
Daniel Molkentin
575874bcbe
asprintf is GNU specific
...
Unless we have a replacement, use _USE_GNU
2013-08-02 15:20:03 +02:00
Daniel Molkentin
8c9799cede
Ignore false-positive compiler warnings
2013-08-02 15:19:41 +02:00
Olivier Goffart
3cc41db0bd
Fix warning with clang
...
/usr/include/features.h:330:4: error: _FORTIFY_SOURCE requires compiling
with optimization (-O) [-Werror,-W#warnings]
# warning _FORTIFY_SOURCE requires compiling with optimization (-O)
2013-08-01 13:13:05 +02:00
Daniel Molkentin
8d99364d63
Eliminate all warnings
...
- use proper casts
- use aproproate types
- offer to build with -Werror
- make printf attribute hinting gnu format style
- remove unused helper methods
- begin to use inttyes.h macros where suitable
- move var declarations to the beginning of the method
- properly use _FILE_OFFSET_BITS
- silence variables unused depending on the define
2013-07-31 13:12:10 +02:00
Andreas Schneider
d80da2a088
LICENSE: Change license of libcsync from GPL to LGPL.
...
All contributors have agreed to change the license of libcsync to LGPL.
2013-07-29 14:04:37 +02:00
Andreas Schneider
b6f9fdb96e
cmake: Remove iniparser dependency.
...
BUG: https://open.cryptomilk.org/issues/5
2013-07-29 09:56:38 +02:00
Andreas Schneider
45cfcfc383
cmake: Pass _FORTIFY_SOURCE only to the precompiler.
2013-07-25 10:00:41 +02:00
Klaas Freitag
fe706dc8f9
cmake: Check for existing header file in neon cmake module.
...
Reviewed-by: Andreas Schneider <asn@cryptomilk.org>
2013-07-23 07:52:49 +02:00
Klaas Freitag
0c3becfdb6
cmake: Fix make install on win32 platform.
...
Reviewed-by: Andreas Schneider <asn@cryptomilk.org>
2013-07-23 07:41:41 +02:00
Andreas Schneider
341e0e8967
cmake: Fix iconv detection on FreeBSD.
2013-07-14 15:51:09 +02:00
Andreas Schneider
bdb3772e8f
cmake: Fix argument order of get_filename_component().
2013-07-14 15:39:40 +02:00
Andreas Schneider
5599573e2f
cmake: Fix getting filename components.
2013-07-14 15:38:10 +02:00
Andreas Schneider
6b189316ab
cmake: Require at least version 3.3.9 for sqlite3_prepare_v2().
2013-07-13 09:17:40 +02:00
Andreas Schneider
9382a047ae
cmake: Update FindNeon and add support for version checking.
2013-07-12 11:57:07 +02:00
Andreas Schneider
81df0406eb
cmake: Rewrite FindIconv from scratch.
...
This version supports BSD correctly.
2013-07-12 11:31:46 +02:00
Andreas Schneider
cccbb6699a
cmake: Find SMBClient correctly.
2013-07-04 10:29:48 +02:00
Andreas Schneider
3043b97815
cmake: Use pkg-config for libsmbclient.
2013-06-16 21:37:03 +02:00
Andreas Schneider
d19a652993
cmake: Fix -D_FORTIFY_SOURCE detection.
2013-06-10 16:17:43 +02:00
Andreas Schneider
480c97c487
cmake: Update compiler flags.
2013-03-14 10:10:41 +01:00
Daniel Molkentin
2b8925c210
FindNeon: Work on non-xbuilds as well
2013-02-08 16:08:29 +03:00
Daniel Molkentin
79159ae32c
Remove debug line
2013-02-08 15:56:26 +03:00
Daniel Molkentin
a6f63aea94
Safely detect neon-config in cross builds
2013-02-08 15:46:42 +03:00
Daniel Molkentin
9c0c693081
Add iconv support to convert charsets to different platforms.
2013-02-06 15:11:40 +01:00
Klaas Freitag
1db825a733
Set path shortcuts for win32 as well.
2013-01-21 13:38:33 +01:00
Klaas Freitag
ba21a9b3a2
Check if neon was built with LFS support.
2013-01-09 15:03:20 +01:00
Markus Goetz
bd71ddf0aa
Iconv: Also search in /usr on OS X
2012-12-11 14:25:56 +01:00
Daniel Molkentin
49d2fd685b
iconv support
...
This allows for files on mac to automatically be converted to UNC
2012-12-07 13:03:01 +01:00
Olivier Goffart
95edd6a9de
Merge remote-tracking branch 'origin/master' into dav
...
Conflicts:
config/ocsync_log.conf
src/csync.c
src/csync.h
src/csync_config.c
src/csync_log.h
src/csync_private.h
src/csync_statedb.c
tests/csync_tests/check_csync_config.c
2012-12-03 17:32:08 +01:00
Markus Goetz
80d53ff4bd
Enable compilation with static iniparser and sqlite
2012-11-07 17:46:13 +01:00
Andreas Schneider
0a6d7435b5
cmake: Get rid of log4c.
2012-10-30 11:27:21 +01:00
Klaas Freitag
2bb52ef6f9
Merge branch 'master' into dav - get cmocka tests and database move.
...
Conflicts:
CMakeLists.txt
cmake/Modules/FindCMocka.cmake
src/csync.c
src/csync_exclude.c
src/csync_reconcile.c
src/csync_statedb.c
src/csync_update.c
src/csync_util.c
src/vio/csync_vio.c
tests/CMakeLists.txt
tests/csync_tests/check_csync_exclude.c
tests/csync_tests/check_csync_statedb_load.c
tests/csync_tests/check_csync_statedb_query.c
tests/csync_tests/check_csync_update.c
tests/std_tests/check_std_c_path.c
2012-10-27 19:27:14 +02:00
Andreas Schneider
cea0c9e85f
cmake: Fix compile option on UNIX with Clang.
2012-10-22 11:20:30 +02:00
Andreas Schneider
c24a18cbfd
cmake: Cleanup testing and enable test target.
2012-10-19 19:07:15 +02:00
Andreas Schneider
b1b0c2c510
tests: Start to use cmocka for the tests.
2012-10-16 10:37:40 +02:00
Klaas Freitag
6ba5bf45d8
removed obsolete FindOpenSSL.
2012-07-30 15:59:55 +03:00
Thomas Mueller
d4e808d45a
use custom FindOpenSSL only for cross compilation in any other cases it is used from the local system
2012-07-30 13:27:59 +03:00
Dominik Schmidt
9626f65b6b
Add patched FindOpenSSL to fix cross-compilation for windows
2012-07-23 10:58:13 +02:00
Klaas Freitag
9e81fd38e1
Added CMocka find module for cmake.
2012-07-09 14:29:17 +02:00
Klaas Freitag
5ceebe1d3c
Added GNUInstallDirs.cmake to lower the required cmake version.
2012-04-18 21:32:18 +02:00
Dominik Schmidt
13f05db934
cmake: Make Log4C optional.
...
Signed-off-by: Andreas Schneider <asn@cryptomilk.org>
2012-04-17 11:21:03 +02:00
Klaas Freitag
4693f313cd
cmake: Removed obsolete FindArgp module.
...
Signed-off-by: Andreas Schneider <asn@cryptomilk.org>
2012-04-17 11:19:44 +02:00
Dominik Schmidt
9eb9116df3
Simplify FindLibIniparser.cmake
...
Signed-off-by: Andreas Schneider <asn@cryptomilk.org>
2012-04-17 11:16:32 +02:00
Dominik Schmidt
e5a9d64353
Simplify FindNeon.cmake
2012-04-14 03:13:28 +02:00
Dominik Schmidt
9d8383c0fe
Libiniparser narf
2012-04-14 03:13:28 +02:00
Klaas Freitag
341c48197e
removed argp lib check.
2012-04-14 03:13:28 +02:00
Dominik Schmidt
9d73d7705d
Make LOG4C optional
2012-04-14 00:05:52 +02:00