Commit Graph
304 Commits
Author SHA1 Message Date
Daniel Molkentin 8491d95ca4 NSIS: English must be enumerated, too
Fixes empty strings in installer.
2013-12-12 10:46:13 +01:00
Olivier Goffart 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
Thomas Müller f05e998430 Translation SectionGroup Shortcuts 2013-12-10 18:08:07 +01:00
Thomas Müller 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
Thomas Müller d82a9423d6 adding Turkish translation to installer 2013-12-10 09:59:23 +01:00
Thomas Müller b41feebcdd Multi-lingual installer 2013-12-10 00:43:58 +01:00
Daniel Molkentin 31989d23a6 Adjust Windows and Mac binaries package names 2013-12-09 17:41:41 +01:00
Daniel Molkentin f5e8efd435 Add build number into versioning scheme
This is an enabler to improve update experience
2013-12-09 16:39:13 +01:00
Thomas Müller ec075a6d2a removing libiniparder.dll and libdl.dll from NSNIS installer 2013-12-02 13:20:10 +01:00
Daniel Molkentin 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
Daniel Molkentin 5c4d240c66 Build on mac with Qt 5
I still had this patch on disk.
2013-11-19 14:41:40 +01:00
Daniel Molkentin e20f39f040 Another cleanup 2013-11-14 19:31:38 +01:00
Daniel Molkentin c2eaf5e627 owncloud is no longer a dl'opened module, but linked into csync 2013-11-14 19:22:22 +01:00
Sven Strickroth 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
Sven Strickroth 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
Daniel Molkentin 475a4f2676 Windows: ship QtSql lib 2013-11-13 14:32:09 +01:00
Daniel Molkentin 763cb43e46 Add qsqlite plugin on Windows 2013-10-04 12:45:17 +02:00
Klaas Freitag dbe63727a3 Quote regexp to hopefully not confuse cmake 2.6 2013-10-02 09:15:17 +02:00
Klaas Freitag 6a73fd984c Added missing cmake modules for cmake 2.6 2013-10-01 16:09:59 +02:00
Daniel Molkentin 3577ba2981 Fix httpbf/neon linkage 2013-09-10 19:50:44 +02:00
Daniel Molkentin 48b4c57d92 Use shared version of libhttpbf, package it on win 2013-09-10 14:45:08 +02:00
Daniel Molkentin 6b9950a9a0 Qt5: DBUS is only needed for FDO 2013-09-05 18:41:49 +02:00
Daniel Molkentin 35ac6610c7 Compile with Qt5 on Linux 2013-09-05 17:13:31 +02:00
Klaas Freitag 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
Olivier Goffart bf6d0a521c Compile with Qt5 2013-08-28 20:58:22 +02:00
Olivier Goffart 336bbb2403 Compile with Qt4 2013-08-28 20:14:40 +02:00
Daniel Molkentin 73da086964 Initial changes to also build on Qt5, doesn't compile yet 2013-08-28 17:03:31 +02:00
Thomas Müller 8bfb44fd28 Inverting the logic to set the prefix for SYSCONF_INSTALL_DIR 2013-08-26 22:42:17 +02:00
Daniel Molkentin 79d3b84fad Reintroduce workaround for /etc in root if files go to /usr 2013-08-26 21:59:52 +02:00
Daniel Molkentin 30b2406533 Fix windows packaging 2013-08-23 15:37:24 +02:00
Daniel Molkentin 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
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
Olivier Goffart 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
Daniel Molkentin f054ca3f72 Disable Werror by default, set CSYNC_STRICT=ON to disable 2013-08-08 16:19:44 +02:00
Daniel Molkentin c323041040 NSIS: install libjpeg for qjpeg4.dll 2013-08-08 15:39:34 +02:00
Daniel Molkentin 6a6bfd1c89 Use proper compiler switch 2013-08-07 16:58:09 +02:00
Daniel Molkentin a493f81ec2 Windows Installer: Add jpeg,gif,ico image formats 2013-08-07 16:24:10 +02:00
Daniel Molkentin b08c1ada02 -Wno-long-long required due to Qt headers 2013-08-07 13:19:21 +02:00
Krzesimir Nowak 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
Daniel Molkentin 85a832fb7c NSIS: Add WebKit dll 2013-08-05 23:25:14 +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
Daniel Molkentin ce851a7a8b Use wildcards for translations, so they are always up-to-date 2013-08-01 15:28:06 +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
Daniel Molkentin be65f78174 Fix win32 installer 2013-07-31 08:35:13 +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