nextcloud
/
desktop
Π·Π΅Ρ€ΠΊΠ°Π»ΠΎ ΠΈΠ· https://github.com/nextcloud/desktop.git
1
0
Π€ΠΎΡ€ΠΊΠ½ΡƒΡ‚ΡŒ 0
Код Π—Π°Π΄Π°Ρ‡ΠΈ ΠŸΠ°ΠΊΠ΅Ρ‚Ρ‹ ΠŸΡ€ΠΎΠ΅ΠΊΡ‚Ρ‹ Π Π΅Π»ΠΈΠ·Ρ‹ Π’ΠΈΠΊΠΈ ΠΠΊΡ‚ΠΈΠ²Π½ΠΎΡΡ‚ΡŒ
17Β 029 ΠΊΠΎΠΌΠΌΠΈΡ‚ΠΎΠ² 473 Π’Π΅Ρ‚ΠΊΠΈ 255 Π’Π΅Π³ΠΈ 499 MiB
Π“Ρ€Π°Ρ„ ΠΊΠΎΠΌΠΌΠΈΡ‚ΠΎΠ²

468 ΠšΠΎΠΌΠΌΠΈΡ‚ΠΎΠ²

Автор SHA1 Π‘ΠΎΠΎΠ±Ρ‰Π΅Π½ΠΈΠ΅ Π”Π°Ρ‚Π°
Olivier Goffart 9f0848ba15 Merge remote-tracking branch 'origin/libowncloudsync_noqtgui' 2014-04-29 12:23:15 +02:00
Klaas Freitag 1af7dc952c Update to latest GNUInstallDirs cmake module 
This version correctly detects debians multiarch lib handling and
lets us remove the manually set CMAKE_LIB_INSTALL_DIRS from the rules
file.
 2014-04-23 13:04:16 +02:00
Markus Goetz f6711b2842 CMake: Find libraries also on Win host compile 2014-04-22 21:02:08 +02:00
Markus Goetz 77ac092975 WiP: Attempt to compile without UI 2014-04-21 19:57:15 +02:00
Klaas Freitag 7d79d3d30d Fix Search for Qt5 version Qt4 2014-04-08 12:08:01 +02:00
Daniel Molkentin 4ff39d8114 Cleanups, build if Qt5 is not on system 2014-04-07 18:08:28 +02:00
Daniel Molkentin 9f8d867ce2 About correctly when Qt5Keychain isn't found 2014-04-07 17:41:33 +02:00
Daniel Molkentin d416c97eac Fix Qt5 detection 2014-04-07 17:38:30 +02:00
Daniel Molkentin 7d7d03071a Add Copyright.txt for cmake modules 
Fixes #1438
 2014-04-07 01:27:59 +02:00
Daniel Molkentin 57c59850e1 Fix installation paths 2014-04-04 15:52:41 +02:00
Daniel Molkentin 4bcd620c29 Avoid build attempts with Qt4 on Windows and Linux 2014-04-04 09:29:01 +02:00
Daniel Molkentin 9822002480 Spell APPLICATION_SHORTNAME correctly 
Fixes #1547
 2014-03-28 15:56:35 +01:00
Daniel Molkentin 411cffd3d5 NSIS: libcrypto-10 dependency got lost somehow 2014-03-26 09:10:01 +01:00
Daniel Molkentin 7c7fad78f7 Qt5: QtLocation is not needed 2014-03-25 22:52:28 +01:00
Daniel Molkentin 1c8e5ef4ee Fix typo 2014-03-25 20:05:06 +01:00
Daniel Molkentin 45ec489f71 Merge branch 'master' of github.com:shadone/mirall into shadone-master 
Conflicts:
	cmake/modules/QtVersionAbstraction.cmake
	src/CMakeLists.txt
	src/mirall/owncloudgui.cpp
 2014-03-25 19:56:45 +01:00
Daniel Molkentin dddec8b250 -fPIC is implied on Windows 2014-03-25 19:04:05 +01:00
Daniel Molkentin 06082b585a Add translations when using Qt5 as well 2014-03-25 19:04:05 +01:00
Daniel Molkentin 4bf0a2b188 NSIS: depend on Qt5-based installations 2014-03-25 19:04:05 +01:00
Daniel Molkentin d10aec6055 NSIS: Install owncloudcmd on Windows 2014-03-18 23:56:50 +01:00
Olivier Goffart 33289bde29 Merge remote-tracking branch 'origin/1.5' 
Conflicts:
	CMakeLists.txt
	VERSION.cmake
	src/CMakeLists.txt
 2014-03-14 17:27:50 +01:00
Daniel Molkentin 87f3755b1f Deploy with Qt5 2014-03-13 00:52:01 +01:00
Daniel Molkentin 3f4bcbbd62 Find Qt5 version of QtKeychain when built with Qt5 2014-03-12 18:38:59 +01:00
Daniel Molkentin 955b932806 Qt5: QtLocation is not required 2014-03-12 18:23:45 +01:00
Daniel Molkentin e7b6560c39 cmake: Remove debug 2014-03-12 18:20:45 +01:00
Daniel Molkentin 80e583c337 Error out if a Qt module is missing 
Fixes #1487
 2014-03-12 18:18:02 +01:00
Daniel Molkentin bc3d298491 Find QtKeychain on multiarch Debian/Ubuntu 2014-03-12 18:17:43 +01:00
Daniel Molkentin 28cf9ce1a4 Properly abort if QtKeychain is not found 
Fixes #1486
 2014-03-12 17:55:30 +01:00
Klaas Freitag aa4e90acfc Put ocsync to a private library - WIP 2014-03-11 10:18:07 +01:00
Denis Dzyubenko a51cb0982b Added Mac-specific settings dialog that looks more native 2014-02-18 02:22:16 +01:00
Daniel Molkentin beb9752f09 Merge remote-tracking branch 'origin/1.5' 2014-02-12 21:17:06 +01:00
Daniel Molkentin 4db7b5f2a7 NSIS: accept /noautoupdate 2014-02-12 17:57:50 +01:00
Daniel Molkentin 958253bb2b Respect skipUpdate policy from global config files and windows policy. 2014-02-12 17:55:05 +01:00
Olivier Goffart a5379ef2aa make BUILD_WITH_QT4 off by default 
Rationale:
When Qt5 is not found, the script will automatically use Qt4.
However, without this change, when Qt4 is not found, it will not
try to find Qt5 because BUILD_WITH_QT4 is ON by default forbidding the
use of Qt5 even if it is installed.

Also, other packages default to Qt5 including qtkeychain

See also issue #1418
 2014-02-12 11:25:08 +01:00
Thomas MΓΌller 0322a44be5 Adding quotes - necessary for themes containing spaces in APPLICATION_NAME 2014-02-11 11:24:10 +01:00
Thomas MΓΌller 60ca442728 Adding quotes - necessary for themes containing spaces in APPLICATION_NAME 2014-02-11 11:23:34 +01:00
Markus Goetz 43345dc236 Icon: Make png2ico / windres failure non-fatal 2014-02-10 14:36:32 +01:00
Thomas MΓΌller fdf73fe539 - Replace undeclared variables: 
- PageReinstall_OLD_MUI_HEADER_TEXT_SUBTITLE
  - PageReinstall_OLD_Field_2
  - PageReinstall_OLD_Field_3
  - REVISION
- README.md updated - calling bin/l10n.sh was missing

This commit includes updated translations from transifex.
 2014-02-05 12:01:36 +01:00
Markus Goetz e001e70816 Sparkle: Get it working 2014-02-04 17:37:01 +01:00
Daniel Molkentin 924e7d4e39 Mac OS: Make icns generation work when building with Qt 5 2014-02-04 08:50:45 +01:00
Daniel Molkentin cfdc6395d8 Find sparkle the first time around 2014-01-30 12:57:33 +01:00
Klaas Freitag f2fc866cc4 Set the library and bin install path to cmake standard path. 2014-01-24 13:43:05 +01:00
Daniel Molkentin 815efb69d7 NSIS: implement /launch for updater 2014-01-23 17:17:13 +01:00
Daniel Molkentin 1d32fb74f9 NSIS: Don't try to log 2014-01-23 16:15:46 +01:00
Klaas Freitag 9c300b83bd Add FindINotify cmake module. 2014-01-23 16:15:29 +01:00
Daniel Molkentin f98db9ac9d NSIS: find DLL from csync copy within cmake 2014-01-23 15:55:55 +01:00
Daniel Molkentin 484ad28cd6 Merge pull request #1357 from owncloud/nsis_fixes 
NSIS preparations for upgrade mode
 2014-01-22 07:20:53 -08:00
Daniel Molkentin 8303c8f909 Mac OS Bundle file: bump copyright year 2014-01-21 11:23:46 +01:00
Klaas Freitag 05b81bc7d8 rename csync/doc to csync/csync_doc to satisfy cmake. 
CMake throws a warning if there are two subdirs with the same name.
 2014-01-20 16:19:30 +01:00
Olivier Goffart 316aade340 Merge branch 'csync_merge' 
Conflicts:
	src/CMakeLists.txt
 2014-01-20 13:27:33 +01:00
Daniel Molkentin 28c4cd9caa NSIS: Cleanup: Use MEMENTO defines where possible 2014-01-18 00:06:58 +01:00
Daniel Molkentin 2a0f28208c NSIS: Don't install link to Desktop of a link by the same name already exists 
Unfortunately, we cannot determine the target path for the .lnk file
without pulling in closed source plugins (or write our own), a length
I am not willing to go in the light of MSI.

Fixes #356
 2014-01-18 00:01:44 +01:00
Daniel Molkentin 77610eb184 NSIS: Only remove sections that we actually installed 
We can query the NSIS Memento extension for that.
 2014-01-17 23:51:52 +01:00
Daniel Molkentin 4c7ddb769a NSIS: INSTALL_PATH has never been used 
Remove it to avoid confusion
 2014-01-17 12:11:19 +01:00
Daniel Molkentin 91345d9e25 NSIS: Fix transations in uninstaller 
Before, we could not show custom strings at all
 2014-01-17 12:11:19 +01:00
Olivier Goffart c7227297af Make it compile with the merge of csync mirall 2014-01-15 12:20:03 +01:00
Klaas Freitag aba1252e60 Remove inotify from cmake files. 2014-01-14 15:06:06 +01:00
Olivier Goffart 924e0e3242 Merge csync inside the mirall repository 2014-01-13 14:43:14 +01:00
Olivier Goffart bf7ca60bec Move csync in order to merge it with mirall 2014-01-13 14:39:50 +01:00
Olivier Goffart ebee52ea8a Merge branch '1.5' 2014-01-09 12:32:08 +01:00
Daniel Molkentin f37f5ccf69 Display version in Mac OS Bundle again 2014-01-08 11:15:28 +01:00
Ville SkyttΓ€ 1c9a4784c7 Don't discard user CXXFLAGS, append to them instead. 2013-12-30 00:30:48 +02:00
Thomas MΓΌller 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
Daniel Molkentin 93d75932ac NSIS: fix c&p error. 2013-12-12 10:46:37 +01:00
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
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
Daniel Molkentin ae2e3e7fb1 Remove autostart option from Windows installer 
now handled by the application
 2013-07-15 11:05:14 +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
Olivier Goffart 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
Daniel Molkentin 1ca8ebebd9 Do not add shortcuts to non-existent files 2013-04-23 17:19:27 +02:00
fastfwd 6695b50965 Fix Issue #382 
Just a couple of typo/cut-and-paste errors.
 2013-04-22 01:22:16 -07:00
Daniel Molkentin 1c6523bcec Add plugin for screenreader support 2013-03-21 17:49:03 +03:00
Andreas Schneider 480c97c487 cmake: Update compiler flags. 2013-03-14 10:10:41 +01:00
Daniel Molkentin dbec98ff48 Manual update of avail translations 2013-02-21 18:35:33 +03: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 7734656ae3 Make mirall packager for win bundle the new openSSL dlls. 2013-02-05 14:37:39 +01:00
Daniel Molkentin a04cf32a69 No need to ship ocsync.conf 2013-01-30 09:48:45 +01:00
Daniel Molkentin bfee6402a6 Simplify NSIS template 2013-01-25 12:56:00 +01:00
Klaas Freitag 1385aab65d Changed FindCSync module to not check relative pathes + docu. 2013-01-22 15:08:56 +01:00
Klaas Freitag 1db825a733 Set path shortcuts for win32 as well. 2013-01-21 13:38:33 +01:00
Daniel Molkentin 635cb4dc7c NSIS: Remove GnuTLS remainders 2013-01-16 14:41:12 +01:00
Daniel Molkentin 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
Klaas Freitag ba21a9b3a2 Check if neon was built with LFS support. 2013-01-09 15:03:20 +01:00
Daniel Molkentin e6b9c16d04 Update About dialog 2012-12-20 20:35:21 +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
Daniel Molkentin ff1706c729 Add libqtkeychain dll to NSIS 2012-12-06 17:53:04 +01:00
Daniel Molkentin 8f9ad524c2 Find inotify on multiarch debian/ubuntu 2012-12-04 17:48:14 +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
Klaas Freitag 9d05a53c89 Fix cmake checks on QtKeyChain. 2012-11-28 10:44:25 +01:00
Dominik Schmidt 2b2eb853fc Add qtkeychain to cmake - WIP read password from keychain. 
Conflicts:

	CMakeLists.txt
 2012-11-27 19:28:03 +01:00
Daniel Molkentin 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
Markus Goetz 80d53ff4bd Enable compilation with static iniparser and sqlite 2012-11-07 17:46:13 +01:00
Daniel Molkentin 4fbfe7bfef Installer: Only show license on special request 
GPL is a distribution license, and should thus
not be required to be accepted upon installation.
 2012-11-02 16:14:33 +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
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
Dominik Schmidt 9eb9116df3 Simplify FindLibIniparser.cmake 
Signed-off-by: Andreas Schneider <asn@cryptomilk.org>
 2012-04-17 11:16:32 +02:00
Dominik Schmidt ccac3dcf95 Make it buildable as bundle on OSX 2012-04-16 13:03:20 +02:00
Dominik Schmidt f7c34ea652 Try some stuff with FindCsync.cmake 2012-04-14 04:19:52 +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
Dominik Schmidt 8e64cebe57 Simplify FindLibIniparser.cmake 2012-04-13 23:20:34 +02:00
Klaas Freitag 95f6f90cb5 Add win32 packaging with nsi 2012-04-02 13:44:24 +02:00
Klaas Freitag 1b12e6590f Built a portable version of FindCSync that finds dev setup stuff. 2012-03-14 15:26:22 +01:00
Klaas Freitag 09fdcf2053 add a path hint for the locally built version of csync to findcsync. 2012-03-12 17:36:38 +01:00
Klaas Freitag df2d745747 Add a hint to find the development time csync libs and includes. 2012-03-08 11:38:15 +01:00
Andreas Schneider f0f36120ad module: Build the webdav module. 2012-02-22 18:23:17 +01:00
Andreas Schneider d0888ffba8 cmake: Fix build on OSX. 2012-01-20 15:23:18 +01:00
Duncan Mac-Vicar P 3ce5932bbd g 
Basic implementation of a CSyncFolder

Still waiting for Jann's patches for conflictcopy to hit a stable
release to make it the default.
 2011-04-07 19:04:07 +02:00
Andreas Schneider 7394c19ea1 Update FindLibSSH module to the lastest version. 2010-02-15 11:55:15 +01:00
Andreas Schneider 96822d7f99 Fixed generate_findpackage_file. 2010-01-12 15:43:45 +01:00
Andreas Schneider 3a265152d8 Set compiler to c99. 2009-09-12 12:26:09 +02:00
Andreas Schneider 16c76166bd Improve detection of system libraries. 2009-09-01 12:25:10 +02:00
Andreas Schneider 93acacfa62 Improve FindCheck module. 2009-09-01 12:16:51 +02:00
Andreas Schneider f33a01216a Fix FindLog4C.cmake. 2009-09-01 12:16:31 +02:00
Andreas Schneider 14c1366c86 Fix generate_findpackage_file. 2009-09-01 12:16:10 +02:00
Andreas Schneider b608f782c3 Improve the Log4C module. 2009-09-01 12:08:52 +02:00
Andreas Schneider 6ca27cd6c1 Improve generate_findpackage_file. 2009-09-01 12:01:04 +02:00
Andreas Schneider 5e282c1fc3 Add an improved FindLibSSH module. 2009-08-25 10:53:33 +02:00
Andreas Schneider 44b5fd650e Fix Windows installation paths. 2009-05-14 19:40:33 +02:00
Andreas Schneider 4e462e9762 Fix indent. 2009-05-14 19:38:40 +02:00
Andreas Schneider 338370514e Don't force the build type or we can't overwrite it. 2009-05-14 11:22:38 +02:00
Andreas Schneider 80de674a84 Improve SQLite3 module. 2009-05-07 17:04:48 +02:00
Andreas Schneider 9586291bd0 Rename FindLog4C. 2009-05-07 17:03:24 +02:00
Andreas Schneider 050b806dc8 Rename FindLibSSH. 2009-05-07 17:00:25 +02:00
Jim McDonough 7ad9628a24 Fix build with cmake >= 2.6.3. -D does not overwrite FORCE. 
Signed-off-by: Andreas Schneider <mail@cynapses.org>
 2009-03-18 10:15:04 +01:00
Andreas Schneider d88cffe607 Make the LIB_FOUND variable accessible in CMake. 2009-03-14 11:11:44 +01:00
Andreas Schneider adb520a3eb Some bugfixed to the findpackage script. 2009-02-04 14:26:08 +01:00
Andreas Schneider 2bbd66d82c Add a new line after pkg-config stuff. 2008-09-04 10:26:27 +02:00
Andreas Schneider f059286e48 Update doxygen generation. 2008-08-20 18:58:17 +02:00
Andreas Schneider ecf1027a54 This is a start for a sftp module. 2008-08-06 18:16:54 +02:00
Andreas Schneider fc85165f48 Mark the include dir as advanced too. 
Thanks to Bernhard Walle.
 2008-08-04 10:17:37 +02:00
Andreas Schneider 5853d67855 Use readline. Patch by Bernhard Walle. 2008-08-04 10:13:10 +02:00
Andreas Schneider 7ef568d815 Mark each library as advanced. 2008-07-15 14:06:21 +02:00
Andreas Schneider 177bcce3ae Use -Wextra compiler flag by default. 2008-07-09 09:47:24 +02:00
Andreas Schneider bd36d85aae Copy the file to the cmake for manpage generation. 2008-07-02 21:00:59 +02:00
Andreas Schneider ea950dc870 Always compile with -fPIC if supported by the compiler. 2008-07-02 20:20:50 +02:00
Andreas Schneider 67efe90536 Add a manpage for the csync commandline client. 2008-07-02 19:02:27 +02:00