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
Daniel Molkentin
aad21c8c4a
Add license to Windows installer
2012-10-12 14:44:21 +02:00
Daniel Molkentin
62a36cd3bb
CMake: Also set CSYNC_BINARY_DIR
...
...so NSIS finds its resource in the right place.
2012-10-10 15:15:19 +02:00
Daniel Molkentin
aa63a789dc
Fix for prev. commmit
2012-10-10 14:19:29 +02:00
Daniel Molkentin
d599c4532c
replace relative csync buildir detection magic
...
If you do not want to run make install for lib(o)csync,
pass -DCSYNC_LIBRARY_PATH=$your_csync_builddir
and -DCSYNC_INCLUDE_PATH=$your_csync_srcdir/src
to cmake when building mirall.
2012-10-10 14:04:24 +02:00
Daniel Molkentin
6459f574cc
Prepare for Mac package signing.
2012-10-09 01:40:43 +02:00
Daniel Molkentin
fdfafb6e70
NSI: add proper version of ocsync.conf
2012-10-09 01:40:43 +02:00
Klaas Freitag
7e1c58b602
Fix include path search.
2012-10-05 17:13:23 +02:00
Klaas Freitag
e0a21ebfd6
Fix to find the header even from installed ocsync packages.
2012-10-05 17:02:39 +02:00
Klaas Freitag
736a8dc457
fixed name of the csync owncloud module.
2012-10-05 10:03:16 +02:00
Daniel Molkentin
af99be4cd5
NSIS: shut down binary before uninstall
2012-09-27 10:38:31 +02:00
Klaas Freitag
fabb353158
Use Qt proxy setting in csync in case its "default proxy"
2012-10-02 13:24:10 +02:00
Klaas Freitag
de60d53a78
Merge branch 'sslerrordialog' of https://github.com/sebasje/mirall into sebasje-sslerrordialog
...
Conflicts:
src/mirall/application.cpp
src/mirall/application.h
src/mirall/owncloudinfo.cpp
2012-10-02 12:34:06 +02:00
Klaas Freitag
d09693f191
Read sync-exclude.lst from /etc/ownCloud, renamed from exclude.lst.
2012-09-27 13:16:14 +02:00
Daniel Molkentin
9d479f9061
Installers on Windows are called Setup
...
Also remove bogus manual line break.
2012-09-24 07:19:09 +02:00
Daniel Molkentin
783207fa40
At least the Program group should be in 'Minimal'.
2012-09-24 03:45:12 +02:00
Daniel Molkentin
ea123b1705
Fix typo
2012-09-24 03:44:32 +02:00
Daniel Molkentin
8233c0c82a
Add autostart section
2012-09-24 03:44:03 +02:00
Daniel Molkentin
a05a4c3741
More templatization.
2012-09-21 13:10:55 +02:00
Daniel Molkentin
663a1886e9
CMake: Centralize all application-specific parameters.
2012-09-20 17:31:18 +02:00
Daniel Molkentin
8a56a90d16
NSIS: fix typo, expand variables properly.
2012-09-20 12:21:21 +02:00
Daniel Molkentin
881f8463e8
OS X: reintroduce LSUIElement in Info.plist
2012-09-17 21:55:57 +02:00
Daniel Molkentin
92ea6a2bef
Tiny fix to previous commit
2012-09-17 21:50:30 +02:00
Daniel Molkentin
f1cd510058
Fix up Info.plist metadata for OS X
...
- behave correctly on retina displays
- fix focus policy
- insert correct version info from cmake
2012-09-17 21:46:18 +02:00
Klaas Freitag
912f440176
Added win dir to most hackish solution ever.
2012-08-30 18:47:43 +03:00
Klaas Freitag
a2b5596ee1
removed wrong path piece "win"
2012-08-27 18:56:34 +03:00
Klaas Freitag
6b98958de6
Fatal error if svn2ico is missing.
2012-08-13 15:05:40 +03:00
Klaas Freitag
4012e3ff25
Updated translation list in installer template
2012-08-10 13:25:36 +03:00
Klaas Freitag
c4a6827ab3
Add libproxy dlls.
2012-08-08 16:46:00 +03: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
4b33997678
Check the system for inotify in cmake and use a config.h file.
2012-07-20 17:12:29 +02:00
Klaas Freitag
11b4b36c3f
Add sync.dll to Windows bundler.
2012-07-18 17:26:58 +02:00
Klaas Freitag
9e81fd38e1
Added CMocka find module for cmake.
2012-07-09 14:29:17 +02:00
Thomas Mueller
89b9e55945
second possible header name added
2012-06-19 00:13:58 +02:00
Thomas Mueller
963e76dea4
added HINTS to a path which can be specified via a environment setting
2012-06-18 23:21:12 +02:00
Klaas Freitag
496572314d
Fix the app icon to be ownclouds
2012-05-02 16:33:07 +02:00
Dominik Schmidt
f96fa3dbeb
win: allow building the installer from local csync build dir and from installed csync as well
2012-04-26 17:16:34 +02:00
Dominik Schmidt
f02a018711
win: remove klaasi haasi's harcoded paths from the nsi
2012-04-26 16:55:14 +02:00
Dominik Schmidt
b5f43a89ea
win: copy exclude.lst from correct location into the installer
2012-04-26 16:37:00 +02:00
Klaas Freitag
9109d7b5ac
Add missing GNUInstallDirs module for cmake.
2012-04-21 11:22:03 +02:00
Klaas Freitag
5ceebe1d3c
Added GNUInstallDirs.cmake to lower the required cmake version.
2012-04-18 21:32:18 +02:00
Klaas Freitag
3f027cda73
Handle translation files correct.
2012-04-18 13:59:03 +02:00
Klaas Freitag
313a56f6d6
added crypto dlls for windows package
2012-04-17 17:04:09 +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
