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
Andreas Schneider
b6f9fdb96e
cmake: Remove iniparser dependency.
...
BUG: https://open.cryptomilk.org/issues/5
2013-07-29 09:56:38 +02:00
Andreas Schneider
7c9de0230f
cmake: Fix names of the include dirs.
2013-07-14 15:57:30 +02:00
Andreas Schneider
341e0e8967
cmake: Fix iconv detection on FreeBSD.
2013-07-14 15:51:09 +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
c1e02db882
BUG 16: Correctly include iconv headers.
2013-07-12 11:32:15 +02:00
Olivier Goffart
3d2c3b321c
Disable the blacklist by default
...
The blacklist might hide errors and reduce the ability to do proper
diagnostics.
Note that in _csync_push_file, we kept csync_statedb_get_progressinfo
because it is also used for the resume feature
Also added output when a file has been blacklisted.
2013-06-18 19:19:28 +02:00
Olivier Goffart
3c87cd71d7
Merge branch 'rename_folders' into dav
...
Conflicts:
modules/csync_owncloud.c
src/csync.c
src/csync.h
src/csync_propagate.c
src/csync_propagate.h
src/csync_statedb.c
src/csync_statedb.h
src/csync_util.c
src/std/c_path.h
2013-05-07 15:24:12 +02:00
Daniel Molkentin
776d5dfe37
Generate csync version from CMake variables
2013-04-25 12:32:01 +02:00
Klaas Freitag
c46371b469
Push WIN32 preprocessor derectives to csync_lock.c.
2013-04-22 14:30:12 +02:00
Olivier Goffart
d88c58deae
WIP: rename folders
2013-02-06 18:40:02 +01:00
Daniel Molkentin
9c0c693081
Add iconv support to convert charsets to different platforms.
2013-02-06 15:11:40 +01:00
Klaas Freitag
e134c85ae7
Initial checkin of the http-big-file handling.
2013-01-28 21:17:23 +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
Andreas Schneider
8a0b4319d3
csync: Add a new logging system.
2012-10-30 11:27:21 +01:00
Klaas Freitag
404073fe7f
Rename csync to ocsync to not collide with upstream csync.
2012-10-01 12:39:05 +02:00
Klaas Freitag
99691059bf
Removed all usage of openSSL.
2012-08-29 15:37:31 +03:00
Klaas Freitag
1e41c469f0
Add the dbtree function module.
2012-08-23 17:49:47 +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
Klaas Freitag
2b4261f15a
Added functions to generate MD5-Sums based on openssl with tests.
2012-07-18 17:00:46 +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
Dominik Schmidt
9d73d7705d
Make LOG4C optional
2012-04-14 00:05:52 +02:00
Dominik Schmidt
00c47f62c4
windows: install libcsync.dll to bin/
2012-03-02 17:04:02 +01:00
Dominik Schmidt
593cd4514a
windows: disable locks
2012-03-02 17:04:02 +01:00
Andreas Schneider
3952c4be62
misc: Add csync_get_user_home_dir() and csync_get_local_username().
2012-03-02 13:40:05 +01:00
Andreas Schneider
16c76166bd
Improve detection of system libraries.
2009-09-01 12:25:10 +02:00
Andreas Schneider
0634e0fdea
Don't require a C++ compiler.
2009-03-18 10:55:14 +01:00
Andreas Schneider
6d20c8b4fc
Install the modules to a version directory.
...
The directory version number is the soversion of the library.
2008-12-16 15:03:57 +01:00
Andreas Schneider
88690312d7
Rename the csync_journal files to csync_statedb.
2008-07-09 09:57:19 +02:00
Andreas Schneider
3da8b33143
Rename the sqlite3 module.
2008-05-20 21:55:57 +02:00
Andreas Schneider
0be9a1e02b
Add reconciler.
...
Currently only new directories are created. Other functions are prepared
bug not tested yet.
2008-05-16 17:30:57 +02:00
Andreas Schneider
83fdb412ad
Add more accurate time measurement.
2008-05-15 19:18:41 +02:00
Andreas Schneider
4489fbfa2b
Implement the reconciler.
2008-05-15 13:50:34 +02:00
Andreas Schneider
988591491a
Install needed header files.
2008-05-13 13:36:50 +02:00
Andreas Schneider
a1116b0e00
Add a module to find libdl.so.
2008-05-06 10:54:15 +02:00
Andreas Schneider
20da2351cf
Add function to calculate the time difference between the replicas.
2008-05-05 10:35:38 +02:00
Andreas Schneider
94fbdc1d04
Remove in source iniparser library and require system lib.
2008-05-01 10:01:34 +02:00
Andreas Schneider
6a2f1f0add
Add a file tree walker for the update detection.
2008-04-23 12:12:48 +02:00
Andreas Schneider
8fb079ae60
Add local functions for the vio plugin system.
2008-04-21 14:55:59 +02:00
Andreas Schneider
59eff42dc4
Fix includes.
2008-04-10 15:44:41 +02:00
Andreas Schneider
ab39159607
Add virtual IO plugin system.
...
This is the initial commit of the vio plugin system. The idea is based on
gnomevfs.
2008-04-07 17:16:41 +02:00
Andreas Schneider
335d07e0b8
Add a exclude list.
2008-03-25 16:13:44 +01:00
Andreas Schneider
2e34b51373
Load the config file.
2008-03-06 17:43:58 +01:00
Andreas Schneider
1b29a420bc
Initial commit
2008-02-27 18:56:47 +01:00
