c358980448
[cse] Link Against OpenSSL
...
For some reason, this was working untill I added a call
to X509_REQ_get_subject_name, then the linking suddenly
stopped working (even tougth I'm using a ton of other
OpenSSL calls)
Force to link against 1.0
2017-10-18 21:51:37 +02:00
af24b4132d
Packaging: Require ZLIB
...
For owncloud/enterprise#2295
2017-10-17 16:53:11 +02:00
d8ed9e5bde
use IS_DIRECTORY ${CMAKE_SOURCE_DIR}/admin
...
We need to test presence of admin folder using ${CMAKE_SOURCE_DIR}, or it is always false. Bad for ox, (good for everything else)
2017-10-05 22:01:39 +02:00
c1e2bdc3d2
Update CMakeLists.txt
...
Make admin folder optional. It is needed for osx, but it is deleted from Linux builds for the sake of easier license review as discussed in https://github.com/owncloud/client/issues/6005
2017-10-05 22:01:38 +02:00
9143ddd0ad
Packaging: Add options for fine-grained builds #5957
...
Extracted and adjusted from packaging.diff by @jnweiger and @dschmidt
2017-10-05 22:01:37 +02:00
f46440eb67
Packaging: Adjust APPNAME handling #5957
...
Extracted and adjusted from packaging.diff by @jnweiger and @dschmidt
2017-10-05 22:01:37 +02:00
bfc7ea562d
Move Utility to a new common static library
...
Now that csync builds as C++, this will avoid having to implement
functionalities needed by csync mandatorily in csync itself.
This library is built as part of libocsync and symbols exported
through it.
This requires a relicense of Utility as LGPL. All classes moved into
this library from src/libsync will need to be relicensed as well.
2017-10-05 22:01:03 +02:00
f897a91354
Move csync to src/csync
2017-10-05 22:01:03 +02:00
5948f26884
Move csync/tests to test/csync
2017-10-05 22:01:03 +02:00
1c03fa8642
use IS_DIRECTORY ${CMAKE_SOURCE_DIR}/admin
...
We need to test presence of admin folder using ${CMAKE_SOURCE_DIR}, or it is always false. Bad for ox, (good for everything else)
2017-10-04 07:49:27 +02:00
2afcac763d
Update CMakeLists.txt
...
Make admin folder optional. It is needed for osx, but it is deleted from Linux builds for the sake of easier license review as discussed in https://github.com/owncloud/client/issues/6005
2017-09-28 19:32:55 +02:00
ca4ad58a06
Packaging: Add options for fine-grained builds #5957
...
Extracted and adjusted from packaging.diff by @jnweiger and @dschmidt
2017-09-27 09:13:44 +02:00
89df8fb692
Packaging: Adjust APPNAME handling #5957
...
Extracted and adjusted from packaging.diff by @jnweiger and @dschmidt
2017-09-27 09:13:44 +02:00
cf15cbf0b3
Move Utility to a new common static library
...
Now that csync builds as C++, this will avoid having to implement
functionalities needed by csync mandatorily in csync itself.
This library is built as part of libocsync and symbols exported
through it.
This requires a relicense of Utility as LGPL. All classes moved into
this library from src/libsync will need to be relicensed as well.
2017-09-05 17:25:19 +02:00
28a0971cdf
Move csync to src/csync
2017-08-22 11:18:22 +02:00
5c9827a33c
Move csync/tests to test/csync
2017-08-22 11:18:22 +02:00
1c3127e43b
CMake: Print the Qt version and path #5957 #5932
2017-08-14 14:24:27 +02:00
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
1e98ba27c6
CSyncSqliteTest: Fix test
2017-06-22 15:11:49 +02:00
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
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
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
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
143320341e
Build: Enable Q_ASSERT in release mode ( #5425 )
2017-01-03 13:42:25 +01:00
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
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
1d09f6b60f
Allow to disable Shiboleth to build without QtWebkit ( #5166 )
2016-09-11 16:14:08 +02:00
e960b265a8
Merge remote-tracking branch '2.1' into 2.2
2016-05-25 16:23:58 +02:00
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
d1649ce4df
OS X: Allow ampersand in APPLICATION_NAME #4657
2016-04-15 11:30:49 +02:00
fdcdddca16
CMakeLists: move QtKeychain detection in client
2016-04-12 14:43:26 +02:00
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
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
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
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
4441d3b342
Silence verbose cmake policy warnings on Windows
2015-08-10 09:55:29 +02:00
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
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
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
0735aa1fbd
Structure developer documentation
...
- rename target "doc-dev"
- group into modules
- move to doc/dev
2015-06-29 18:43:21 +02:00
f4c816f378
Implement doxygen supoort to create developer documentation
...
Fixes #3371
2015-06-25 16:50:30 +02:00
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
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
67d38bc87b
Filesystem Utilities: Add Checksum calculation methods.
2015-05-19 17:09:39 +02:00
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
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
07fe077f7f
More Mirall -> Client renaming to make l10n work again
2015-02-07 23:28:20 +01:00
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
dbca7469f2
Enable the SHA sum in linux when build from source tar.
2015-02-06 12:18:09 +01:00
6d380c8548
cmake: Clearly Define qtmain.lib link policy on Windows
2015-02-05 15:37:22 +01:00
59bdda6226
Require OpenSSL > 1.0.0, remove obsolete dep from csync
2015-02-05 13:08:28 +01:00
481d4f3478
CMake: Changed message about compiling against Qt4.
2015-01-30 13:21:38 +01:00
ea72d7bb11
CMake: Remove FIXME
2015-01-29 20:47:33 +01:00
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
989005d616
Clientcert support: Explictly link libsync against openssl
2015-01-28 13:31:17 +01:00
fe51ada1e8
Don't require NEON with Qt 5.4
2015-01-23 17:11:34 +01:00
3885d5d706
Discovery: Report root etag from engine to folder
...
For #2352
2015-01-23 15:30:44 +01:00
c54621eb19
OS X: Share menu for Finder
2015-01-23 12:00:31 +01:00
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
f9b98d6d1d
OS X: Fix exclude file install
2015-01-09 14:38:27 +01:00
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
c5daf7d1b6
Mac installer: Make the installer background brandable for MacOSX.
2014-12-03 14:37:59 +01:00
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
78362af168
Compile with TOKEN_AUTH_ONLY
...
(QtGui is not included in that case)
2014-11-21 12:15:41 +01:00
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
e890c4ae1b
OS X: Move previous fix to proper location
2014-11-17 18:30:32 +01:00
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
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
9ebc41ed6f
Remove "Mirall" from cmake project files
2014-11-09 22:30:05 +01:00
dc1e73dcb7
Merge remote-tracking branch 'origin/1.7'
...
Conflicts:
src/libsync/syncjournaldb.cpp
test/CMakeLists.txt
2014-10-28 23:27:58 -04:00
ab5dae741a
Show GIT SHA sum in cmake output.
2014-10-27 11:54:22 +01:00
7e3d2029e0
OS X: Fix bundle creation after merge
2014-10-22 12:06:43 +02:00
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
1d5b3aadea
sqlite3: Bundle 3.8.6 for Mac and Windows
...
it is linked into ocsync.
2014-10-16 17:38:45 +02:00
78d50f4033
CPack is still needed for Windows
...
This partially reverts commit dafd9c308f7f836cc01b
2014-10-01 21:16:18 +02:00
dafd9c308f
More removal of obsolete CMake code
2014-10-01 12:51:38 +02:00
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
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
1aca22b5f8
Make crash reporter executable branded
2014-08-30 10:46:09 +02:00
b8e8d975aa
Add CRASHREPORTER_SUBMIT_URL to OWNCLOUD.cmake
2014-08-28 12:08:07 +02:00
cf12a56b4c
Merge remote-tracking branch 'origin/1.7'
...
Conflicts:
src/gui/socketapi.cpp
2014-08-27 18:22:07 +02:00
5490063b7e
OS X: Fix installer creation
...
The script should know independently of the machine
2014-08-27 12:02:57 +02:00
2b4849a2fa
Add crash reporter using libcrashreporter-qt
2014-08-26 18:15:13 +02:00
eb898646bc
Create Mac Pack: Copy the creator script to the build directory.
2014-08-26 18:13:43 +02:00
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
742b036a07
CMake: Follow policy for 2.8.0 (avoid cmake warnings)
2014-08-01 12:18:52 +02:00
5041880854
Try to handle BUILD_LIBRARIES_ONLY correctly
...
Also, try to fix OS X build
2014-07-11 12:36:01 +02:00
df3c3bca02
Split into three separate projects: library, gui and cmd
2014-07-11 11:07:31 +02:00
623dfc0286
Socket API: Add test client
2014-07-02 10:10:32 +02:00
51e941e7b5
look for Sparkle only on OS X
2014-06-04 00:10:17 +03:00
f159b028b4
Add a compile option to not blacklist error code 5xx
2014-04-29 11:39:46 +02:00
ba2ff4ec46
Copy test database into the build tree.
2014-03-20 12:35:16 +01:00
33289bde29
Merge remote-tracking branch 'origin/1.5'
...
Conflicts:
CMakeLists.txt
VERSION.cmake
src/CMakeLists.txt
2014-03-14 17:27:50 +01:00
3f4bcbbd62
Find Qt5 version of QtKeychain when built with Qt5
2014-03-12 18:38:59 +01:00
a2467b5dea
CMake: Do options one directory above
...
This fixes linking when keychain was not desired.
2014-03-12 14:20:38 +01:00
c24c97703a
CMake: Ignore failure when working as submodule
2014-03-11 17:05:44 +01:00
f348499bbe
For Windows, add the __USE_MINGW_ANSI_STDIO=1 switch
2014-03-05 15:39:49 +01:00
93db6ca6ab
Properly install cmake in OS X app bundle
2014-01-30 22:09:37 +01:00
528d434c1f
Amendment to last commit
2014-01-30 13:07:32 +01:00
688d394576
Check for INotify if compiling for Linuxe and friends
2014-01-23 16:05:35 +01:00
Tomaz Canabrava