Markus Goetz
d1649ce4df
OS X: Allow ampersand in APPLICATION_NAME #4657
2016-04-15 11:30:49 +02:00
Christian Kamm
4f79f1b5e8
Explicitly depend on Qt5Test.
2016-04-12 12:45:55 +02:00
Markus Goetz
6c517638d0
NSIS Silent mode: Force uninstall before install #4543
2016-03-18 16:00:29 +01:00
Lukas Reschke
7db3bc91b5
Bump year to 2016
...
My yearly contribution to the client 😉
2016-02-10 19:52:55 +01:00
Hefee
aa8b772bff
Don't install tests and cmocka lib.
...
Neither tests nor the libcmocka needs to be installed globally.
2016-02-05 14:14:07 +01:00
Daniel Molkentin
0ef9bd9e23
Remove bearer plugins
...
Causes regressions due to constant Wifi scanning
2016-01-04 11:54:11 +01:00
Olivier Goffart
685f2a259f
csync: remove PLUGIN install patch from cmake files
...
This conflicts with the KDE_INSTALL_PLUGINDIR and prevent the
dolphin plugin to be installed at the right location.
Since csync no longer have plugin, this can be removed
2015-12-02 13:13:41 +01:00
Klaas Freitag
300c1c2055
Merge remote-tracking branch 'origin/depclean' into 2.1
...
Conflicts:
cmake/modules/QtVersionAbstraction.cmake
2015-11-18 14:43:41 +01:00
Klaas Freitag
6123fab091
CMake version abstractions: Remove some dependencies.
...
That lets us get rid of the hard dependency on Qt tools which are
not easily available everywhere.
2015-11-11 15:24:02 +01:00
Markus Goetz
fd4a5100a6
NSIS: Include Qt bearer management DLLs #3969
2015-11-11 15:19:15 +01:00
Markus Goetz
dae724b21c
QtVersionAbstraction: Quick not neeed on OS X
2015-11-05 11:35:42 +01: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
Klaas Freitag
cb3a301f2c
Merge pull request #3899 from sebasje/sebas/cmake
...
fix multiarch library path for Debian/Ubuntu
2015-10-06 15:36:43 +02:00
Sebastian Kügler
a7cf1b04ad
Simplify creating the library path
...
Instead of checking whether the library path ends up somewhere in /usr,
set the architecture prefix, anyway. The library path mechanism is also
used in custom prefixes, without this change, the library gets installed
globally on Debian and Ubuntu, leading to non-standard behaviour and
cross-build problems, as multiple architecture builds of this library
can't be installed alongside each other.
This is the minimal change to correct this behaviour from upstream cmake.
2015-09-29 00:15:39 +02:00
Daniel Molkentin
c71058980a
Revert "NSIS: Try to ignore (invalid) errors from NSIS UAC"
...
This reverts commit 38eaf241fa
2015-09-17 14:47:54 +02:00
Daniel Molkentin
38eaf241fa
NSIS: Try to ignore (invalid) errors from NSIS UAC
2015-09-17 13:40:02 +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
Olivier Goffart
bfb637e64d
Fix build with old cmake
...
DIRECOTRY is new in 2.8.12.
Uses PATH instead
2015-08-14 14:21:40 +02:00
Kirill Bychkov
7786f1f9a9
Fix linking with libinotify on OpenBSD.
2015-08-13 09:44:55 +03:00
Daniel Molkentin
c7353fc382
Revert "win32: libwebp has been bumped to version 5"
...
This reverts commit 18efb21157
2015-08-07 09:21:08 +02:00
Daniel Molkentin
5657d4ec1b
NSIS: Remove (almost untranslated) Slovak tr for now
2015-08-06 17:36:53 +02:00
Daniel Molkentin
864bf33f10
NSIS: Elevate uninstaller, too
...
Resolves #3546
2015-08-04 12:38:29 +02:00
Daniel Molkentin
db8b919099
NSIS: add polish translation
2015-08-03 20:02:11 +02:00
Daniel Molkentin
18efb21157
win32: libwebp has been bumped to version 5
2015-08-03 19:24:01 +02:00
Daniel Molkentin
f15236acb7
remove stay file
2015-08-01 18:48:00 +02:00
Daniel Molkentin
f66ebb2f1e
NSIS: Actually call the elevation wrapper
2015-07-31 18:25:17 +02:00
Daniel Molkentin
b9edc64982
NSIS: Fix NSIS error handling
2015-07-17 14:43:18 +02:00
Daniel Molkentin
d00aa3da84
NSIS: Star Trek taught me: "Reversing the polarity will fix it". It's true.
2015-07-17 14:42:58 +02:00
Daniel Molkentin
fa6dc8dbb7
Adjust to new version of NSIS UAC
2015-07-17 14:42:26 +02:00
Daniel Molkentin
7a8a8ceedc
NSIS: depend on nsProcess instead of Processes NSIS plugin
...
The Processes plugin is no longer maintained, and OBS
compiles an up-to-date version of nsProcess for us.
2015-07-17 14:42:18 +02:00
Daniel Molkentin
d53eaf8fd6
Win32: Remove confusing option to remove AppData
...
- This only works for the current user (while being a HKLM installer)
- The naming is confusing.
Fixes #3461
2015-07-16 16:22:00 +02:00
Klaas Freitag
201d397391
CMocka tests: install the test utilities with make install.
2015-07-08 18:13:39 +02:00
Olivier Goffart
8bcd0261dc
Merge remote-tracking branch 'origin/1.8'
...
Conflicts:
VERSION.cmake
2015-06-15 14:03:46 +02:00
Jocelyn Turcotte
7a7bf4c561
NSIS: Force an update of the shell_extension #3320
...
Since our DLLs version number aren't bumped, a same file size could
cause a DLL not to be installed to replace an old one.
This eventually can cause a crash of explorer if an incompatible version
of OCUtil.dll is installed alone.
Fix the issue by defining LIBRARY_IGNORE_VERSION. This also makes sure
that installing an old version of the client over a more recent one
if we decide to add version numbers to those DLLs.
2015-06-10 17:01:08 +02:00
Daniel Molkentin
f9659d80c9
Revert "NSIS: depend on nsProcess instead of Processes NSIS plugin"
...
This reverts commit e1a36b53dc
2015-06-05 09:17:46 +02:00
Daniel Molkentin
553e831121
Revert "Adjust to new version of NSIS UAC"
...
This reverts commit 1d600ceecc
2015-06-05 09:17:39 +02:00
Daniel Molkentin
e9ff471e1c
Revert "NSIS: Star Trek taught me: "Reversing the polarity will fix it". It's true."
...
This reverts commit 0f7773ff99
2015-06-05 09:16:14 +02:00
Daniel Molkentin
eb6d29a223
Revert "NSIS: Fix NSIS error handling"
...
This reverts commit 3df26ef189
2015-06-05 09:15:14 +02:00
Daniel Molkentin
3df26ef189
NSIS: Fix NSIS error handling
2015-06-05 08:45:23 +02:00
Daniel Molkentin
0f7773ff99
NSIS: Star Trek taught me: "Reversing the polarity will fix it". It's true.
2015-06-04 12:53:42 +02:00
Daniel Molkentin
1d600ceecc
Adjust to new version of NSIS UAC
2015-06-03 08:21:10 +02:00
Daniel Molkentin
e1a36b53dc
NSIS: depend on nsProcess instead of Processes NSIS plugin
...
The Processes plugin is no longer maintained, and OBS
compiles an up-to-date version of nsProcess for us.
2015-06-03 08:21:10 +02:00
Olivier Goffart
6b27d2e703
Merge remote-tracking branch 'origin/1.8'
2015-05-26 12:28:31 +02:00
Daniel Molkentin
793130a533
Win32: Make Setup/Update Mutex theme-unique (2/2)
...
Fixes #3272
2015-05-25 21:54:03 +02:00
Daniel Molkentin
070d9d3147
NSIS Installer: Fix Basque, Galician, Slovak, Turkish
...
Not sure when this broke, but those languages could never have worked...
2015-05-25 21:48:21 +02:00
Daniel Molkentin
9b73308edd
NSIS: Add Norwegian (Bokmål) translation
2015-05-25 21:41:23 +02:00
Daniel Molkentin
e708c145fa
Win32: Make Setup/Update Mutex theme-unique
...
Fixes #3272
2015-05-23 09:40:31 +02:00
Klaas Freitag
34593cccb6
Remove QtConcurrent from component list for Qt4.
...
According to Olivier QtConcurrent was part of QtCore in Qt4.
2015-05-20 17:00:27 +02:00
Markus Goetz
63294f0702
Revert "NSIS: depend on nsProcess instead of Processes NSIS plugin"
...
This reverts commit 8dd374fc2bhttps://github.com/owncloud/client/issues/3254
2015-05-20 12:33:17 +02:00
Daniel Molkentin
9693048f78
Find & use QtConcurrent
2015-05-19 17:09:39 +02:00
