91345d9e25
NSIS: Fix transations in uninstaller
...
Before, we could not show custom strings at all
2014-01-17 12:11:19 +01:00
c7227297af
Make it compile with the merge of csync mirall
2014-01-15 12:20:03 +01:00
aba1252e60
Remove inotify from cmake files.
2014-01-14 15:06:06 +01:00
924e0e3242
Merge csync inside the mirall repository
2014-01-13 14:43:14 +01:00
bf7ca60bec
Move csync in order to merge it with mirall
2014-01-13 14:39:50 +01:00
ebee52ea8a
Merge branch '1.5'
2014-01-09 12:32:08 +01:00
f37f5ccf69
Display version in Mac OS Bundle again
2014-01-08 11:15:28 +01:00
1c9a4784c7
Don't discard user CXXFLAGS, append to them instead.
2013-12-30 00:30:48 +02:00
900397c05e
fixes #1305
...
Installer will fallback to English in case there are no translations available for the current system language
2013-12-20 10:02:30 +01:00
93d75932ac
NSIS: fix c&p error.
2013-12-12 10:46:37 +01:00
8491d95ca4
NSIS: English must be enumerated, too
...
Fixes empty strings in installer.
2013-12-12 10:46:13 +01:00
f5c46d481c
Tru to get NE_LFS properly
...
The csync and mirall build system are slightly different so this might help
2013-12-11 20:44:46 +01:00
f05e998430
Translation SectionGroup Shortcuts
2013-12-10 18:08:07 +01:00
13f5d29c3c
No language selection dialog - use Windows GUI langaage, which is default as of today with NSIS
2013-12-10 11:10:48 +01:00
d82a9423d6
adding Turkish translation to installer
2013-12-10 09:59:23 +01:00
b41feebcdd
Multi-lingual installer
2013-12-10 00:43:58 +01:00
31989d23a6
Adjust Windows and Mac binaries package names
2013-12-09 17:41:41 +01:00
f5e8efd435
Add build number into versioning scheme
...
This is an enabler to improve update experience
2013-12-09 16:39:13 +01:00
ec075a6d2a
removing libiniparder.dll and libdl.dll from NSNIS installer
2013-12-02 13:20:10 +01:00
5d6700c68d
Merge pull request #1165 from csware/startmenu-according-to-ms-guidelines
...
Startmenu according to ms guidelines
2013-11-25 04:27:43 -08:00
5c4d240c66
Build on mac with Qt 5
...
I still had this patch on disk.
2013-11-19 14:41:40 +01:00
e20f39f040
Another cleanup
2013-11-14 19:31:38 +01:00
c2eaf5e627
owncloud is no longer a dl'opened module, but linked into csync
2013-11-14 19:22:22 +01:00
ed5b0973dd
Do not create folder for single link
...
Signed-off-by: Sven Strickroth <email@cs-ware.de>
2013-11-14 15:45:14 +01:00
336e22233d
Do not create uninstall shortcut in start menu
...
According to Microsoft Design guidelines (http://msdn.microsoft.com/en-us/library/windows/desktop/aa511447.aspx ) no icons for uninstallers should be created.
Signed-off-by: Sven Strickroth <email@cs-ware.de>
2013-11-14 14:40:21 +01:00
475a4f2676
Windows: ship QtSql lib
2013-11-13 14:32:09 +01:00
763cb43e46
Add qsqlite plugin on Windows
2013-10-04 12:45:17 +02:00
dbe63727a3
Quote regexp to hopefully not confuse cmake 2.6
2013-10-02 09:15:17 +02:00
6a73fd984c
Added missing cmake modules for cmake 2.6
2013-10-01 16:09:59 +02:00
3577ba2981
Fix httpbf/neon linkage
2013-09-10 19:50:44 +02:00
48b4c57d92
Use shared version of libhttpbf, package it on win
2013-09-10 14:45:08 +02:00
6b9950a9a0
Qt5: DBUS is only needed for FDO
2013-09-05 18:41:49 +02:00
35ac6610c7
Compile with Qt5 on Linux
2013-09-05 17:13:31 +02:00
8fe102662d
Merge branch 'propagator-ng': Fixes to work with new LGPL ocsync.
...
Conflicts:
src/mirall/csyncthread.cpp
2013-09-04 16:33:06 +02:00
bf6d0a521c
Compile with Qt5
2013-08-28 20:58:22 +02:00
336bbb2403
Compile with Qt4
2013-08-28 20:14:40 +02:00
73da086964
Initial changes to also build on Qt5, doesn't compile yet
2013-08-28 17:03:31 +02:00
8bfb44fd28
Inverting the logic to set the prefix for SYSCONF_INSTALL_DIR
2013-08-26 22:42:17 +02:00
79d3b84fad
Reintroduce workaround for /etc in root if files go to /usr
2013-08-26 21:59:52 +02:00
30b2406533
Fix windows packaging
2013-08-23 15:37:24 +02:00
42abf4101c
Honor cmake's install prefix
...
since the entire ting is so incredibly broken in cmake,
use the approach taken by csync (which emulates the
approach of autotools), to get the directories right.
This mandates changes in the theme, which need discussion
(APPLICATION_SHORTNAME must now equal appName(), and
APPLICATION_NAME should equal appGuiName()).
2013-08-22 09:40:25 +02:00
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
0589bfc51b
Merge branch 'master' into propagator-ng
...
This just fix the conflict.
Do not compile or work yet
Conflicts:
src/CMakeLists.txt
src/mirall/csyncthread.cpp
src/mirall/csyncthread.h
src/mirall/owncloudfolder.cpp
src/mirall/syncfileitem.h
test/CMakeLists.txt
2013-08-14 15:19:21 +02:00
f054ca3f72
Disable Werror by default, set CSYNC_STRICT=ON to disable
2013-08-08 16:19:44 +02:00
c323041040
NSIS: install libjpeg for qjpeg4.dll
2013-08-08 15:39:34 +02:00
6a6bfd1c89
Use proper compiler switch
2013-08-07 16:58:09 +02:00
a493f81ec2
Windows Installer: Add jpeg,gif,ico image formats
2013-08-07 16:24:10 +02:00
b08c1ada02
-Wno-long-long required due to Qt headers
2013-08-07 13:19:21 +02:00
114f66f297
Add -Wall -Wextra -Wpedantic (or -pedantic) warnings by default.
...
This also introduces a MIRALL_FATAL_WARNINGS to enable a -Werror for
GNU compilers and clang.
MSVC compilers are yet to be handled.
2013-08-07 12:54:34 +02:00
85a832fb7c
NSIS: Add WebKit dll
2013-08-05 23:25:14 +02:00
045a3f17ba
_USE_GNU -> _GNU_SOURCE
2013-08-05 21:11:14 +02:00
575874bcbe
asprintf is GNU specific
...
Unless we have a replacement, use _USE_GNU
2013-08-02 15:20:03 +02:00
8c9799cede
Ignore false-positive compiler warnings
2013-08-02 15:19:41 +02:00
ce851a7a8b
Use wildcards for translations, so they are always up-to-date
2013-08-01 15:28:06 +02:00
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
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
be65f78174
Fix win32 installer
2013-07-31 08:35:13 +02:00
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
b6f9fdb96e
cmake: Remove iniparser dependency.
...
BUG: https://open.cryptomilk.org/issues/5
2013-07-29 09:56:38 +02:00
45cfcfc383
cmake: Pass _FORTIFY_SOURCE only to the precompiler.
2013-07-25 10:00:41 +02:00
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
0c3becfdb6
cmake: Fix make install on win32 platform.
...
Reviewed-by: Andreas Schneider <asn@cryptomilk.org>
2013-07-23 07:41:41 +02:00
ae2e3e7fb1
Remove autostart option from Windows installer
...
now handled by the application
2013-07-15 11:05:14 +02:00
341e0e8967
cmake: Fix iconv detection on FreeBSD.
2013-07-14 15:51:09 +02:00
bdb3772e8f
cmake: Fix argument order of get_filename_component().
2013-07-14 15:39:40 +02:00
5599573e2f
cmake: Fix getting filename components.
2013-07-14 15:38:10 +02:00
6b189316ab
cmake: Require at least version 3.3.9 for sqlite3_prepare_v2().
2013-07-13 09:17:40 +02:00
9382a047ae
cmake: Update FindNeon and add support for version checking.
2013-07-12 11:57:07 +02:00
81df0406eb
cmake: Rewrite FindIconv from scratch.
...
This version supports BSD correctly.
2013-07-12 11:31:46 +02:00
cccbb6699a
cmake: Find SMBClient correctly.
2013-07-04 10:29:48 +02:00
3043b97815
cmake: Use pkg-config for libsmbclient.
2013-06-16 21:37:03 +02:00
d19a652993
cmake: Fix -D_FORTIFY_SOURCE detection.
2013-06-10 16:17:43 +02:00
e1e8842548
New owncloud propagator that skip the vio abstraction layer
...
The vio abstraction layer within csync is inneficient for the owncloud
use case because not all calls maps well to the POSIX interface. We can
be much more efficient by doing exactly what we need.
Also, this will allow us to scedule better the calls and possibly to use
threads.
2013-05-04 11:02:30 +02:00
1ca8ebebd9
Do not add shortcuts to non-existent files
2013-04-23 17:19:27 +02:00
6695b50965
Fix Issue #382
...
Just a couple of typo/cut-and-paste errors.
2013-04-22 01:22:16 -07:00
1c6523bcec
Add plugin for screenreader support
2013-03-21 17:49:03 +03:00
480c97c487
cmake: Update compiler flags.
2013-03-14 10:10:41 +01:00
dbec98ff48
Manual update of avail translations
2013-02-21 18:35:33 +03:00
2b8925c210
FindNeon: Work on non-xbuilds as well
2013-02-08 16:08:29 +03:00
79159ae32c
Remove debug line
2013-02-08 15:56:26 +03:00
a6f63aea94
Safely detect neon-config in cross builds
2013-02-08 15:46:42 +03:00
9c0c693081
Add iconv support to convert charsets to different platforms.
2013-02-06 15:11:40 +01:00
7734656ae3
Make mirall packager for win bundle the new openSSL dlls.
2013-02-05 14:37:39 +01:00
a04cf32a69
No need to ship ocsync.conf
2013-01-30 09:48:45 +01:00
bfee6402a6
Simplify NSIS template
2013-01-25 12:56:00 +01:00
1385aab65d
Changed FindCSync module to not check relative pathes + docu.
2013-01-22 15:08:56 +01:00
1db825a733
Set path shortcuts for win32 as well.
2013-01-21 13:38:33 +01:00
635cb4dc7c
NSIS: Remove GnuTLS remainders
2013-01-16 14:41:12 +01:00
5c495265f4
Consolidate theming support.
...
This implements out-of-repository-theming, and removes the old
custom.ini theming that never worked on all platforms and had
no straight deployment story.
The new approach requires the CMAKE variable OEM_THEME_DIR to
point to a directory that must at least contain an OEM.cmake file
(check OWNCLOUD.cmake for possible options) as well as a themes.qrc
and a themes/ directory that directly correspond to the ones in
the source tree.
2013-01-10 17:16:59 +01:00
ba21a9b3a2
Check if neon was built with LFS support.
2013-01-09 15:03:20 +01:00
e6b9c16d04
Update About dialog
2012-12-20 20:35:21 +01:00
bd71ddf0aa
Iconv: Also search in /usr on OS X
2012-12-11 14:25:56 +01:00
49d2fd685b
iconv support
...
This allows for files on mac to automatically be converted to UNC
2012-12-07 13:03:01 +01:00
ff1706c729
Add libqtkeychain dll to NSIS
2012-12-06 17:53:04 +01:00
8f9ad524c2
Find inotify on multiarch debian/ubuntu
2012-12-04 17:48:14 +01:00
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
9d05a53c89
Fix cmake checks on QtKeyChain.
2012-11-28 10:44:25 +01:00
2b2eb853fc
Add qtkeychain to cmake - WIP read password from keychain.
...
Conflicts:
CMakeLists.txt
2012-11-27 19:28:03 +01:00
78c7dc95a0
Add doc cmake targets (HTML, PDF, QtHelp, CHM, man)
...
make doc will build all of the above, except for CHM,
which needs manual preparation and can be built with
make doc-chm. See doc/scripts/README.rst for details.
We do our best to ensure to detect the required tools
before adding targets, so a build should always succeed.
Exception: On Debian and Ubuntu, the following packages are
required to build the PDF target (in addition to pdflatex
itself, which is autodetected):
* texlive-latex-recommended
* texlive-latex-extra
* texlive-fonts-recommended
If pdflatex is present, but those are not, the doc target
will fail.
Results can be found in $BUILDDIR/doc/$format.
2012-11-25 00:38:47 +01:00
80d53ff4bd
Enable compilation with static iniparser and sqlite
2012-11-07 17:46:13 +01:00
Daniel Molkentin