Граф коммитов

259 Коммитов

Автор SHA1 Сообщение Дата
Olivier Goffart acf65b4c23 csync: Use Qt for encodeing/decoding filesystem strings
Issues:
 - #5661   On mac, iconv did not support all of unicode and some
           files with emoji in the filename could not be uploaded

 - #5719 , #5676  On linux, we will now support non utf-8 locale
2017-07-13 10:01:17 +02:00
Markus Goetz 1e98ba27c6 CSyncSqliteTest: Fix test 2017-06-22 15:11:49 +02:00
Olivier Goffart 6e57b0219e Don't link dirrectly against openssl
All our crypto code is handled by qt nodaways.
No need to carry this dependency.

Especially since it causes warnings on system where there are
twp openssl version installed:
/usr/bin/ld: warning: libcrypto.so.1.0.0, needed by /usr/lib/libQt5Network.so.5.9.0, may conflict with libcrypto.so.1.1
2017-06-13 11:27:23 +02:00
Julius Härtl b7fa50be4c Set proper application name, icon name for freedesktop notifications
Use application name defined in OEM build configuration
2017-06-01 10:01:05 +02:00
Jocelyn Turcotte b26db062d2 Fix the UNIT_TESTING build on Windows
- Put all tests in the bin directory so that DLLs can be loaded
- Add missing exports
- Skip tests that use code depending on zlib
- The "GMT" timezone is named differently, use the int constructor instead

5 tests are still failing, it's not really worth fixing at the moment
since no developper is currently using Windows as its main platform.
2017-02-14 14:32:41 +01:00
Christian Kamm 3c7545a45f CMake: Don't force-enable asserts #5429
Should be safer now that we've gone through asserts and assured that
one ones that should be fatal continue to exist in release builds
independently of QT_NO_DEBUG.
2017-02-08 15:15:19 +01:00
ckamm 143320341e Build: Enable Q_ASSERT in release mode (#5425) 2017-01-03 13:42:25 +01:00
Kyle Fazzari d1237cdda3 Correctly handle possible missing GIT_SHA1. (#5401)
Currently, if get_git_head_revision() doesn't define GIT_SHA1 (which it
doesn't in some cases) it's possible to end up with the following error:

    CMake Error at CMakeLists.txt:69 (if):
      if given arguments:

        "STREQUAL" "GITDIR-NOTFOUND"

      Unknown arguments specified

Fix this by making sure both left and right hand arguments to STREQUAL
are always strings, even if GIT_SHA1 is undefined.

Signed-off-by: Kyle Fazzari <kyle@canonical.com>
2016-12-21 14:14:26 +01:00
Jocelyn Turcotte 2b274e9460 Fix the MSVC build
- Replace functions that are provided by MinGW with a Win32-based
  implementation
- Explicitly export needed symbols from ocsync.dll
- Rename share.h to sharemanager.h since the name clashes with one
  of the Windows headers and get included from there
- Remove the timestamp from the fallback csync stderr logging, it's
  not used since we always provide a log callback
2016-09-16 17:43:39 +02:00
Olivier Goffart 1d09f6b60f Allow to disable Shiboleth to build without QtWebkit (#5166) 2016-09-11 16:14:08 +02:00
Olivier Goffart e960b265a8 Merge remote-tracking branch '2.1' into 2.2 2016-05-25 16:23:58 +02:00
Olivier Goffart 5676685f58 SyncEngine: Add a compile option so we rename to restoring a move we don't have the permission to do
IL issue 550
2016-05-12 13:15:30 +02:00
Markus Goetz d1649ce4df OS X: Allow ampersand in APPLICATION_NAME #4657 2016-04-15 11:30:49 +02:00
Olivier Goffart fdcdddca16 CMakeLists: move QtKeychain detection in client 2016-04-12 14:43:26 +02:00
Olivier Goffart f8dc263338 CMakeLists: fix Qt4 build
Only the src subdirectory needs Qt.
Otherwise it activates Qt4 also for the dolphin plugin which always need Qt5
2016-04-11 15:49:18 +02:00
Markus Goetz c8590c4468 Remove legacy propagator and neon
The code was already uneeded/unbuilt on Windows and OS X.
2015-10-20 17:57:43 +02:00
Phil Davis 7d191763b5 Minor build etc typos
Just some random stuff I noticed while looking at how this beast is put
together.
2015-09-10 13:20:11 +05:45
Jocelyn Turcotte 854bfb870d Revert "Silence verbose cmake policy warnings on Windows"
This causes an error since those policies aren't known by
2.8.12, so better seeing those warnings on Windows for now.

This reverts commit 4441d3b342.
2015-08-10 11:57:05 +02:00
Jocelyn Turcotte 4441d3b342 Silence verbose cmake policy warnings on Windows 2015-08-10 09:55:29 +02:00
Klaas Freitag 6992631c4c cmake: rather use SHAREDIR than DATADIR define.
DATADIR is a reserved structure name in win32, using it like us here
leads to very nifty compile problems. SHAREDIR is clean.
2015-07-30 16:38:30 +02:00
Jocelyn Turcotte c85ace11dd Allow the OSX build to work without make install
Also deploy sync-exclude.lst to the build directory in this case.
2015-07-28 15:19:09 +02:00
Daniel Molkentin 0610d3ea8d Merge pull request #3347 from jturcotte/shell_integration_findersync
shell_i: Add a FinderSync-based implementation #2340
2015-07-02 14:20:24 +02:00
Daniel Molkentin 0735aa1fbd Structure developer documentation
- rename target "doc-dev"
- group into modules
- move to doc/dev
2015-06-29 18:43:21 +02:00
Daniel Molkentin f4c816f378 Implement doxygen supoort to create developer documentation
Fixes #3371
2015-06-25 16:50:30 +02:00
Jocelyn Turcotte 9797782682 shell_i: Build the extension with the '-' identity by default
This allows developers to build and run the extension by default.
Official packages bundles will be re-signed after the build, we

The SocketApi prefix can be set at configure time through cmake and
should match the key that will be used to sign the whole .app bundle
(including the embedded FindexSync .appex bundle).
2015-06-22 13:55:19 +02:00
Olivier Goffart 3c8409ee69 CMakeList: change the message to indicate that newer versions of Qt are good too
The current message sounds like you need 5.4, but 5.5 would work too
2015-06-15 14:28:11 +02:00
Klaas Freitag 67d38bc87b Filesystem Utilities: Add Checksum calculation methods. 2015-05-19 17:09:39 +02:00
Jocelyn Turcotte 2ddaf5a06a Add a NO_MSG_HANDLER cmake option
This allows QDebug to output to stdout or OutputDebugString
to ease development.
2015-02-19 16:57:16 +01:00
Daniel Molkentin 00e42d1177 More HIDPI support
Except for the non-native activity tab
icon in settings, this should fix #11
2015-02-12 19:44:40 +01:00
Daniel Molkentin 07fe077f7f More Mirall -> Client renaming to make l10n work again 2015-02-07 23:28:20 +01:00
Olivier Goffart eedb5d0dae Revert "cmake: Clearly Define qtmain.lib link policy on Windows"
It make jenkins fail with the error:

CMake Error at CMakeLists.txt:3 (cmake_policy):
  Policy "CMP0020" is not known to this version of CMake.

This reverts commit 6d380c8548.
2015-02-06 17:46:57 +01:00
Klaas Freitag dbca7469f2 Enable the SHA sum in linux when build from source tar. 2015-02-06 12:18:09 +01:00
Daniel Molkentin 6d380c8548 cmake: Clearly Define qtmain.lib link policy on Windows 2015-02-05 15:37:22 +01:00
Daniel Molkentin 59bdda6226 Require OpenSSL > 1.0.0, remove obsolete dep from csync 2015-02-05 13:08:28 +01:00
Klaas Freitag 481d4f3478 CMake: Changed message about compiling against Qt4. 2015-01-30 13:21:38 +01:00
Markus Goetz ea72d7bb11 CMake: Remove FIXME 2015-01-29 20:47:33 +01:00
Olivier Goffart d70e146c1f Merge remote-tracking branch 'origin/ssl_client_cert'
Conflicts:
	CMakeLists.txt
	csync/src/CMakeLists.txt
	csync/src/csync_owncloud.c
2015-01-28 14:13:40 +01:00
Daniel Molkentin 989005d616 Clientcert support: Explictly link libsync against openssl 2015-01-28 13:31:17 +01:00
Olivier Goffart fe51ada1e8 Don't require NEON with Qt 5.4 2015-01-23 17:11:34 +01:00
Markus Goetz 3885d5d706 Discovery: Report root etag from engine to folder
For #2352
2015-01-23 15:30:44 +01:00
Markus Goetz c54621eb19 OS X: Share menu for Finder 2015-01-23 12:00:31 +01:00
Markus Goetz d285db653e CMake: Check for Qt version
This is still WiP, we need to compile without neon if possible
2015-01-22 14:27:49 +01:00
Markus Goetz f9b98d6d1d OS X: Fix exclude file install 2015-01-09 14:38:27 +01:00
Christian Kamm 53d5de685c Merge remote-tracking branch 'origin/1.7'
Conflicts:
	src/gui/folder.cpp
	src/gui/folder.h
	src/libsync/networkjobs.cpp
	src/libsync/owncloudpropagator.h
	src/libsync/propagatedownload.cpp
2014-12-10 13:01:36 +01:00
Klaas Freitag c5daf7d1b6 Mac installer: Make the installer background brandable for MacOSX. 2014-12-03 14:37:59 +01:00
Daniel Molkentin 3016844dd7 Merge branch 'master' into rename_client
Conflicts:
	README.md
	src/gui/folderman.cpp
	src/gui/settingsdialog.cpp
	src/libsync/accessmanager.cpp
	src/libsync/propagateupload.h
2014-12-02 13:37:22 +01:00
Olivier Goffart 78362af168 Compile with TOKEN_AUTH_ONLY
(QtGui is not included in that case)
2014-11-21 12:15:41 +01:00
Christian Kamm 4d7b8bdb25 Merge remote-tracking branch 'origin/1.7'
Conflicts:
	OWNCLOUD.cmake
	test/CMakeLists.txt
	test/testfolderwatcher.h
2014-11-19 14:45:25 +01:00
Markus Goetz e890c4ae1b OS X: Move previous fix to proper location 2014-11-17 18:30:32 +01:00
Daniel Molkentin 281c0e1553 Merge branch 'master' into rename_client
Conflicts:
	CMakeLists.txt
	src/gui/main.cpp
	src/libsync/accessmanager.cpp
	src/libsync/accessmanager.h
	src/libsync/owncloudpropagator_p.h
2014-11-12 00:07:59 +01:00
Daniel Molkentin cdac8d56d5 Merge remote-tracking branch 'origin/master' into crashreporter
Conflicts:
	src/libsync/utility.cpp
	src/libsync/utility.h
2014-11-11 23:53:38 +01:00
Daniel Molkentin 9ebc41ed6f Remove "Mirall" from cmake project files 2014-11-09 22:30:05 +01:00
Daniel Molkentin dc1e73dcb7 Merge remote-tracking branch 'origin/1.7'
Conflicts:
	src/libsync/syncjournaldb.cpp
	test/CMakeLists.txt
2014-10-28 23:27:58 -04:00
Klaas Freitag ab5dae741a Show GIT SHA sum in cmake output. 2014-10-27 11:54:22 +01:00
Markus Goetz 7e3d2029e0 OS X: Fix bundle creation after merge 2014-10-22 12:06:43 +02:00
Christian Kamm 7ae0338f5c Merge remote-tracking branch 'origin/1.7'
Conflicts:
	src/CMakeLists.txt
	src/cmd/cmd.cpp
	src/gui/socketapi.h
	src/libsync/syncengine.h
	test/CMakeLists.txt
2014-10-22 10:41:55 +02:00
Markus Goetz 1d5b3aadea sqlite3: Bundle 3.8.6 for Mac and Windows
it is linked into ocsync.
2014-10-16 17:38:45 +02:00
Daniel Molkentin 78d50f4033 CPack is still needed for Windows
This partially reverts commit dafd9c308f.
This partially reverts commit 7f836cc01b.
2014-10-01 21:16:18 +02:00
Daniel Molkentin dafd9c308f More removal of obsolete CMake code 2014-10-01 12:51:38 +02:00
Olivier Goffart 50e718b1e7 Merge branch '1.7'
Conflicts:
	src/CMakeLists.txt
	src/cmd/cmd.cpp
	src/gui/folder.cpp
	src/gui/socketapi.cpp
	translations/mirall_ca.ts
	translations/mirall_cs.ts
	translations/mirall_de.ts
	translations/mirall_el.ts
	translations/mirall_en.ts
	translations/mirall_es.ts
	translations/mirall_es_AR.ts
	translations/mirall_et.ts
	translations/mirall_eu.ts
	translations/mirall_fa.ts
	translations/mirall_fi.ts
	translations/mirall_fr.ts
	translations/mirall_gl.ts
	translations/mirall_hu.ts
	translations/mirall_it.ts
	translations/mirall_ja.ts
	translations/mirall_nl.ts
	translations/mirall_pl.ts
	translations/mirall_pt.ts
	translations/mirall_pt_BR.ts
	translations/mirall_ru.ts
	translations/mirall_sk.ts
	translations/mirall_sl.ts
	translations/mirall_sv.ts
	translations/mirall_th.ts
	translations/mirall_tr.ts
	translations/mirall_uk.ts
	translations/mirall_zh_CN.ts
	translations/mirall_zh_TW.ts
2014-09-18 17:10:21 +02:00
Christian Kamm aef569ee9d SyncEngine: Use exclude file fallback next to binary on linux.
This is mainly useful for developers where the system-wide exclude file
may not exist.
2014-09-03 14:53:01 +02:00
Dominik Schmidt 1aca22b5f8 Make crash reporter executable branded 2014-08-30 10:46:09 +02:00
Dominik Schmidt b8e8d975aa Add CRASHREPORTER_SUBMIT_URL to OWNCLOUD.cmake 2014-08-28 12:08:07 +02:00
Daniel Molkentin cf12a56b4c Merge remote-tracking branch 'origin/1.7'
Conflicts:
	src/gui/socketapi.cpp
2014-08-27 18:22:07 +02:00
Markus Goetz 5490063b7e OS X: Fix installer creation
The script should know independently of the machine
2014-08-27 12:02:57 +02:00
Dominik Schmidt 2b4849a2fa Add crash reporter using libcrashreporter-qt 2014-08-26 18:15:13 +02:00
Klaas Freitag eb898646bc Create Mac Pack: Copy the creator script to the build directory. 2014-08-26 18:13:43 +02:00
Daniel Molkentin 4fc044d368 Merge branch 'master' into move_lib_to_sep_dir
Conflicts:
	cmake/modules/NSIS.template.in
	src/CMakeLists.txt
	src/creds/shibboleth/authenticationdialog.cpp
	src/creds/shibboleth/authenticationdialog.h
	src/gui/owncloudgui.cpp
	src/libsync/creds/shibboleth/authenticationdialog.cpp
	src/libsync/creds/shibboleth/authenticationdialog.h
	src/libsync/mirallaccessmanager.cpp
	src/mirall/authenticationdialog.cpp
	src/mirall/authenticationdialog.h
2014-08-12 21:08:44 +02:00
Klaas Freitag 742b036a07 CMake: Follow policy for 2.8.0 (avoid cmake warnings) 2014-08-01 12:18:52 +02:00
Daniel Molkentin 5041880854 Try to handle BUILD_LIBRARIES_ONLY correctly
Also, try to fix OS X build
2014-07-11 12:36:01 +02:00
Daniel Molkentin df3c3bca02 Split into three separate projects: library, gui and cmd 2014-07-11 11:07:31 +02:00
Daniel Molkentin 623dfc0286 Socket API: Add test client 2014-07-02 10:10:32 +02:00
Kuba Serafinowski 51e941e7b5 look for Sparkle only on OS X 2014-06-04 00:10:17 +03:00
Olivier Goffart f159b028b4 Add a compile option to not blacklist error code 5xx 2014-04-29 11:39:46 +02:00
Klaas Freitag ba2ff4ec46 Copy test database into the build tree. 2014-03-20 12:35:16 +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 3f4bcbbd62 Find Qt5 version of QtKeychain when built with Qt5 2014-03-12 18:38:59 +01:00
Markus Goetz a2467b5dea CMake: Do options one directory above
This fixes linking when keychain was not desired.
2014-03-12 14:20:38 +01:00
Markus Goetz c24c97703a CMake: Ignore failure when working as submodule 2014-03-11 17:05:44 +01:00
Klaas Freitag f348499bbe For Windows, add the __USE_MINGW_ANSI_STDIO=1 switch 2014-03-05 15:39:49 +01:00
Daniel Molkentin 93db6ca6ab Properly install cmake in OS X app bundle 2014-01-30 22:09:37 +01:00
Daniel Molkentin 528d434c1f Amendment to last commit 2014-01-30 13:07:32 +01:00
Klaas Freitag 688d394576 Check for INotify if compiling for Linuxe and friends 2014-01-23 16:05:35 +01:00
Olivier Goffart 316aade340 Merge branch 'csync_merge'
Conflicts:
	src/CMakeLists.txt
2014-01-20 13:27:33 +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
Daniel Molkentin 2f4de3cc48 Build fix 2013-11-14 20:41:23 +01:00
Daniel Molkentin 63188667bb CMake: Remove cmake module 2013-11-14 19:26:09 +01:00
Daniel Molkentin 121b18bf70 QtKeychain is not a hard dependency 2013-11-11 15:36:29 +01:00
Daniel Molkentin 3577ba2981 Fix httpbf/neon linkage 2013-09-10 19:50:44 +02:00
Daniel Molkentin 6b9950a9a0 Qt5: DBUS is only needed for FDO 2013-09-05 18:41:49 +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 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
Daniel Molkentin 9f89a2fe76 More adjustments around the application name
- libname is now derived from binary name (which is lowercase)
- remove superflouos reimplementation of appName() in owncloud theme
- APPLICATION_SHORTNAME is now optional (and if not set, equals
  APPLICATION_NAME
2013-08-23 10:30:03 +02:00
Daniel Molkentin 31ceff181e Amendment to last commit 2013-08-22 09:51:35 +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 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
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
Krzesimir Nowak 367bc401ee Add Shibboleth credentials implementation. 2013-08-01 16:53:43 +02:00
Daniel Molkentin d4a5ab252d Drop Compat with Qt 4.6
We now require Qt 4.7 due to QNAM
2013-07-24 13:59:03 +02:00
Daniel Molkentin d4ea0ba6ba Merge branch 'master' of git://github.com/gnumdk/mirall
Conflicts:
	CMakeLists.txt

As per PR 457
2013-05-20 16:54:49 +02:00
Daniel Molkentin 3a50eece9e More theming refactoring 2013-05-17 20:56:17 +02:00
Daniel Molkentin b51f210bfa Drop (broken) mirall binary
This remove all non-ownCloud backends, as well
as all obsolete wizard pages. CSync is now
a mandatory dependency.
2013-05-04 14:03:51 +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 55a56cc275 Find csync_version.h, local config.h 2013-04-25 13:19:38 +02:00
Cedric Bellegarde f346503534 Better fdo detection 2013-03-22 11:34:21 +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
Daniel Molkentin e6b9c16d04 Update About dialog 2012-12-20 20:35:21 +01:00
Daniel Molkentin d50d4d1a6f Add windows backend, require Inotify on Linux
Dummy-backend yanked for now, no support for other Unixes...
2012-12-06 17:53:04 +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
Daniel Molkentin f8f188add4 Mac: Deploy sync-exclude.lst to bundle at build time 2012-11-19 12:10:45 +01:00
Dominik Schmidt 351f9aedfb Add testing skeleton 2012-10-26 20:24:12 +02:00
Klaas Freitag 20a875a682 Fix SYCCONFIGDIR => SYSCONFDIR. 2012-10-05 23:01:43 +02:00
Klaas Freitag aa56d1ebea Fix SYSCONFIGDIR install of the sync-exclude file. 2012-10-05 22:47:08 +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 5adcc7d12f CMake: Finding files requires reference to srcdir 2012-09-26 11:29:55 +02:00
Daniel Molkentin 663a1886e9 CMake: Centralize all application-specific parameters. 2012-09-20 17:31:18 +02:00
Klaas Freitag a9c7b9304e Use a macro THEME_CLASS from CMakeLists.txt instead of ifdefs. 2012-09-18 13:52:52 +03:00
Dominik Schmidt 5d6c9339f8 Disable not building in bundle mode on OSX. Unless someone tests that codepath, it's probably better not to allow anyone to build it especially not by default 2012-08-06 16:01:43 +02:00
Klaas Freitag 1ff94e86bd Fix build with UNICODE under windows, fix USE_INOTIFY initialization. 2012-07-30 17:08:42 +03:00
Klaas Freitag a89f8fd2ce Merge commit 'refs/merge-requests/9' of git://gitorious.org/owncloud/mirall into merge-requests/9 2012-07-26 11:43:18 +03:00
Klaas Freitag a84361afd3 Merge commit 'refs/merge-requests/8' of git://gitorious.org/owncloud/mirall into merge-requests/8 2012-07-26 11:35:58 +03: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 5246a6fad4 Fix SYSCONFIGDIR check, Patch from Riddell 2012-07-20 12:33:23 +02:00
Michael Georg Hansen 324120e69c Make building of tests configurable via configuration switch.
This commit makes building of tests configurable via a configuration switch given to CMake: -DUNIT_TESTING=true

Therefore, making changes to CMakeLists.txt for enabling tests is not necessary any more. It is done the same way in CSync.
2012-07-18 22:59:22 +02:00
Michael Georg Hansen eae20fc537 Configure version.h into the build directory, not the source directory. 2012-07-18 22:46:54 +02:00
Klaas Freitag 07ecd8527d Back to SYSCONFDIR again :-/ 2012-06-22 15:39:17 +02:00
Klaas Freitag 5e2729ddef Fix a typo in ssl dialog 2012-06-18 18:27:06 +02:00
Klaas Freitag 6f7165f9f0 A lot of krazy2 (codechecker) fixes. 2012-05-21 16:48:49 +02:00
Klaas Freitag 428ef9aba3 Install exclude list to /etc 2012-05-16 17:07:03 +02:00
Klaas Freitag aa86561f31 write version set in VERSION.cmake to version.h 2012-05-11 10:19:15 +02:00
Klaas Freitag 125d2a4533 Make OWNCLOUD_CLIENT compile flag depending on the compile target. 2012-05-02 15:45:38 +02:00
Klaas Freitag c2f0459a36 Add russian translation contributed by cas@altlinux.ru
Fixed cmake to glob all translation files
2012-04-30 12:47:54 +02:00
Dominik Schmidt 2cf667f055 Handle SYSCONFDIR correctly 2012-04-26 16:32:50 +02:00
Klaas Freitag 8e1ee5c19f Decreased the needed cmake version to 2.6 2012-04-23 10:58:21 +02:00
Thomas Müller 527bece4a9 Backport to Qt 4.6 finished - test against a local installation of owncloud via http 2012-04-21 21:03:29 +02:00
Klaas Freitag 1fefd09e1a Install exclude.lst to /etc, not to /usr/etc. 2012-04-18 16:24:42 +02:00
Thomas Mueller 7a9ab6e753 Qt version requirement is 4.7 2012-04-18 13:47:03 +02:00
Dominik Schmidt ccac3dcf95 Make it buildable as bundle on OSX 2012-04-16 13:03:20 +02:00
Klaas Freitag 4a89768d02 Removed obsolete QWebdav class from CMake 2012-04-15 14:43:50 +02:00
Dominik Schmidt 91d374c514 Use CMAKE_INSTALL_SYSCONFDIR instead of /etc 2012-04-14 04:43:04 +02:00
Klaas Freitag 5da0859cea enable install of exclude.lst again 2012-04-02 20:20:19 +02:00
Klaas Freitag 2e8c963d21 remove test setting of own version. 2012-04-02 20:19:01 +02:00
Klaas Freitag 1ca83a4a02 install exclude list to /etc. 2012-04-02 14:05:23 +02:00
Klaas Freitag b79aff6b65 install the exclude list. 2012-04-02 13:56:32 +02:00
Klaas Freitag 6f49d20785 - enable WIN32 build
- enable cpack changes.
2012-04-02 13:47:53 +02:00
Klaas Freitag 5259ae1565 added translations of the application. 2012-03-26 09:48:30 +02:00