fa6dc8dbb7
Adjust to new version of NSIS UAC
2015-07-17 14:42:26 +02:00
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
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
201d397391
CMocka tests: install the test utilities with make install.
2015-07-08 18:13:39 +02:00
8bcd0261dc
Merge remote-tracking branch 'origin/1.8'
...
Conflicts:
VERSION.cmake
2015-06-15 14:03:46 +02:00
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
f9659d80c9
Revert "NSIS: depend on nsProcess instead of Processes NSIS plugin"
...
This reverts commit e1a36b53dc
2015-06-05 09:17:46 +02:00
553e831121
Revert "Adjust to new version of NSIS UAC"
...
This reverts commit 1d600ceecc
2015-06-05 09:17:39 +02:00
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
eb6d29a223
Revert "NSIS: Fix NSIS error handling"
...
This reverts commit 3df26ef189
2015-06-05 09:15:14 +02:00
3df26ef189
NSIS: Fix NSIS error handling
2015-06-05 08:45:23 +02:00
0f7773ff99
NSIS: Star Trek taught me: "Reversing the polarity will fix it". It's true.
2015-06-04 12:53:42 +02:00
1d600ceecc
Adjust to new version of NSIS UAC
2015-06-03 08:21:10 +02:00
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
6b27d2e703
Merge remote-tracking branch 'origin/1.8'
2015-05-26 12:28:31 +02:00
793130a533
Win32: Make Setup/Update Mutex theme-unique (2/2)
...
Fixes #3272
2015-05-25 21:54:03 +02:00
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
9b73308edd
NSIS: Add Norwegian (Bokmål) translation
2015-05-25 21:41:23 +02:00
e708c145fa
Win32: Make Setup/Update Mutex theme-unique
...
Fixes #3272
2015-05-23 09:40:31 +02:00
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
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
9693048f78
Find & use QtConcurrent
2015-05-19 17:09:39 +02:00
8dd374fc2b
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-03-13 14:04:16 +01:00
457f9b587d
Merge remote-tracking branch 'origin/1.8'
...
Conflicts:
src/gui/sharedialog.cpp
src/gui/sharedialog.h
2015-03-13 14:03:03 +01:00
227ed8ae07
win32: libproxy is not needed
2015-03-06 15:47:15 +01:00
bd8b7cdff2
Bump Copyright year to 2015
...
Otherwise the copyright meta-info of the application shows 2014
2015-03-06 11:54:03 +01:00
276dd50650
Update GetGitRevisionDescription.cmake
...
From https://github.com/rpavlik/cmake-modules
2015-02-20 10:11:30 +01:00
4f4ae5861a
Enable c++11 regardless of the compiler detection
...
CMake is using "c++" as the compiler and the clang detection fails.
Since we require C++11 at this point, enable it in all cases.
Removed the MSVC todos since we don't plan supporting it yet.
2015-02-17 18:20:15 +01:00
fedf368c7a
Merge pull request #2849 from owncloud/nsis_shortcuts_all_users
...
Install shortcuts for all users
2015-02-17 18:13:11 +01:00
c5f78fab51
Make NSIS installer with /S fully silent
...
Addresses #2006
2015-02-17 17:59:14 +01:00
56a907128a
Install shortcuts for all users
...
Implements #2413
2015-02-17 17:17:39 +01:00
d3103adbd8
Ship translations on Windows again after rename
2015-02-07 22:32:42 +01:00
11f1229c31
Fix Qt4 build
2015-02-04 18:04:50 +01:00
1ac523ec01
Output libocsync and libowncloudsync in the bin directory
...
Windows finds DLLs using PATH or the directory of the process'
executable. By outputing those dependend DLLs together with
owncloud.exe, the developer only need to have OpenSSL's bin
and the qtkeychain build directory in his PATH to let the
dynamic linker find them.
As the documentation of RUNTIME_OUTPUT_DIRECTORY points out,
this only affects windows as other platforms don't consider
libraries as runtime targets.
2015-02-04 15:00:22 +01:00
43a51c1bef
Fix the MinGW build
...
- qtkeychain isn't necessarily in a qt5keychain subdirectory.
- Explicitly add OpenSSL to the include directories
- Make sure that the USE_OUR_OWN_SQLITE3 code is initialized
for csync by calling find_package.
2015-02-04 14:50:38 +01:00
68ec24797b
Add some define.
...
Since Qt5.4, on release build, qDebug do not provide anymore the line
number unless we define QT_MESSAGELOGCONTEXT
Also define QT_USE_QSTRINGBUILDER while i'm on it (free optimisation)
2015-02-04 13:43:02 +01:00
6c0a449ebe
NSIS: Fix c&p error
2015-01-29 15:25:14 +01:00
183b3c61e4
Update NSIS installer to install ContextMenu Extension
2015-01-29 13:19:54 +01:00
2c432e0b97
Remove socketapiclient
2015-01-28 11:13:38 +01:00
2a3df5562c
Add new Qt 5.4 dependencies, remove neon ones
2015-01-28 08:34:09 +01:00
f284786749
Fix typo
2015-01-23 14:44:53 +01:00
39097980b0
Deployment: Accessiblewidgets no longer exists in Qt 5.4
...
Part of #2699
2015-01-22 15:27:19 +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
aeb1f10621
NSIS: Reload shell after registering shellextension, use blackslashes
...
It also registers and unregisters the shell extensions properly and
forces explorer to reload/unload the DLLs so they can be removed.
This obsoletes #2377 .
Fixes #2487
Fixes #2377
2014-12-09 23:52:07 +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
3a448fda91
Windows mingw32: Fix finding of windres binary.
2014-11-19 14:16:56 +01:00
1e94161ec1
Revert "Install shortcuts for all users"
2014-11-15 21:04:33 +01:00
02e96484a8
Install shortcuts for all users
2014-11-15 17:07:39 +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
de11f602d5
Merge remote-tracking branch 'origin/il'
...
Conflicts:
csync/src/csync_private.h
src/CMakeLists.txt
src/gui/folder.cpp
src/libsync/owncloudpropagator.cpp
src/libsync/owncloudpropagator.h
src/libsync/propagator_qnam.cpp
src/libsync/propagator_qnam.h
src/libsync/syncengine.cpp
src/libsync/syncengine.h
src/mirall/syncjournaldb.cpp
2014-11-08 10:48:36 +01: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
6048a7143a
Revert "Remove references to qsqlite3"
...
QtWebkit needs it
This reverts commit b1c10c8454
2014-10-20 10:27:34 +02:00
271cdac474
Really use internal SQLite on Windows
2014-10-19 08:51:01 +02:00
3021fb546e
NSIS: Fix copying of qtbase translations
2014-10-17 16:37:37 +02:00
52a5729298
Merge pull request #2319 from owncloud/sqlite_capi
...
Introduce a common sqlite layer across csync and mirall.
This avoids conflicts that both each load different and/or updated sqlite versions.
2014-10-17 12:11:27 +02:00
b1c10c8454
Remove references to qsqlite3
2014-10-16 17:51:17 +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
4527784905
Second part of #1661
...
- QT_INSTALL_TRANSLATIONS was not defined in Qt5
- Some languages have been split up in multiple qm's. We only need qtbase for now
2014-10-16 11:08:29 +02:00
b20752f13e
Fix the build with clang and Qt4
2014-10-09 17:54:46 +02:00
9d5d6aff38
Q_DECL_OVERRIDE for Qt4 only for GCC >= 4.7
2014-10-08 18:55:41 +02:00
2ba007ee4f
CMake: Add else() case for Qt detection
2014-10-07 14:46:55 +02:00
78d50f4033
CPack is still needed for Windows
...
This partially reverts commit dafd9c308f7f836cc01b
2014-10-01 21:16:18 +02:00
7f836cc01b
Kill obsolete Mac deployment code
2014-10-01 12:35:21 +02:00
637fb449c6
Fixed https://github.com/owncloud/mirall/issues/1699
...
Added missing copyright headers.
2014-09-18 12:30:42 +02:00
c3d41f0d48
Fixed https://github.com/owncloud/mirall/issues/1699
...
Missing copyright headers added.
2014-09-18 12:26:55 +02:00
ef70052b0e
Package installer if it was built
2014-08-30 14:12:40 +02:00
bcff1ced5e
Merge branch '1.7'
...
Conflicts:
src/CMakeLists.txt
src/cmd/cmd.cpp
src/gui/folderman.cpp
src/gui/wizard/owncloudadvancedsetuppage.cpp
src/libsync/account.cpp
2014-08-29 20:40:33 +02:00
cc5f5cf3a6
Set the minimum supported OS X version to 10.7
...
We dropped 10.6 support quite a while ago.
This should avoid bug reports from 10.6 users.
Fixes #2122
2014-08-28 14:50:00 +02:00
902bb7a198
Merge remote-tracking branch 'origin/master' into move_lib_to_sep_dir
...
Conflicts:
src/CMakeLists.txt
src/gui/accountsettings.cpp
src/gui/folderwizard.cpp
src/gui/settingsdialog.cpp
src/libsync/syncengine.h
2014-08-26 11:29:42 +02:00
c60b433c42
create shellext path
2014-08-21 20:33:25 +02:00
933c7e36d1
NSIS: fix target path for shell extension
2014-08-21 17:33:22 +02:00
ccf532672b
Use InstallLib to install the overlay icons
...
This allows for a cleaner expirience
2014-08-20 16:07:22 +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
57ef515def
Use std=c++0x instead of c++11
...
Required for compat with Ubuntu 12.04, and possibly RHEL.
2014-08-11 15:46:45 +02:00
acd3df33b6
Merge branch 'long_running_put' into il
2014-08-08 12:00:26 +02:00
1bc8fd9b49
CMake: Don't need translations with token auth compile
2014-08-08 11:59:14 +02:00
fa8f6f91c4
NSIS: Add a packaging routine for the overlay icons
2014-08-07 15:54:39 +02:00
f06019ab81
NSIS: First steps at installing the shell extension
2014-08-06 10:44:17 +02:00
8b1aebcdba
No need to ship the Qt4-based qtkeychain DLL
2014-08-05 13:11:15 +02:00
f004d5085d
Merge remote-tracking branch 'origin/1.6' into il
...
Conflicts:
VERSION.cmake
2014-07-25 12:37:27 +02:00
f84e0010ee
NSIS: ICU rebumped to 5.3 as per build service change
2014-07-24 10:07:46 +02:00
8a88ca6f34
Merge branch 'il'
...
Conflicts:
src/mirall/propagator_legacy.h
2014-07-18 17:00:38 +02:00
81d786733d
Merge remote-tracking branch 'origin/1.6' into il
...
Conflicts:
VERSION.cmake
src/mirall/propagator_qnam.cpp
src/mirall/propagator_qnam.h
2014-07-18 16:59:29 +02:00
7ff62bc577
NSIS: ICU rebumped to 5.3 as per build service change
2014-07-17 14:57:04 +02:00
d8ebebaf12
WinInstaller: No hardcoded www in front of the url on final page.
2014-07-16 18:39:51 +02:00
ea690c285b
Make NSIS installer work with new structure
2014-07-14 13:12:31 +02:00
846773efd3
Define Q_DECL_OVERRIDE for Qt4
...
That macro is new in Qt5, define it as well when compiling with Qt4
so we can use it in mirall
Note: QNetworkCookieJar::deleteCookie was not existing in Qt4.
2014-07-09 23:31:56 +02:00
2961c44bbe
NSIS: look for socketapiclient in the right place
2014-07-03 09:35:45 +02:00
997559dc6d
NSIS: fix typo
2014-07-03 09:17:08 +02:00
6bc425f981
NSIS: Add socketapiclient
2014-07-02 12:05:23 +02:00
92f07cb60f
Enable C++11
...
In order to avoid the warning
warning: anonymous variadic macros were introduced in C99
Due to the use of variadic macro in the qDebug macro in Qt 5.3
C++11 requires a space between string literal and macro to avoid the
ambiguity with user defined litteral
2014-06-25 12:01:27 +02:00
3c4f410a4e
cmake compilation flags: don't define -Wdeclaration-after-statement
...
We are in 2014, let me use C99 already.
2014-06-24 11:02:58 +02:00
02704cdf74
Merge remote-tracking branch 'origin/1.6' into il
...
Conflicts:
VERSION.cmake
csync/src/csync_statedb.c
src/mirall/syncengine.cpp
src/mirall/syncfileitem.h
2014-06-23 12:48:34 +02:00
c855b783d9
NSIS: Remove duplicated entry
2014-06-20 15:53:10 +02:00
f593fc8e4d
NSIS: Bump required libpng version to 16
2014-06-20 15:50:42 +02:00
9ca82ba14d
NSIS: add libwinpthread dependency
2014-06-20 14:58:05 +02:00
be7b08b50a
CMake: Fix token auth compile
2014-06-16 15:34:46 +02:00
b814b45e50
Add version and product information to installer properties
2014-06-05 11:51:12 +02:00
9f0848ba15
Merge remote-tracking branch 'origin/libowncloudsync_noqtgui'
2014-04-29 12:23:15 +02:00
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
f6711b2842
CMake: Find libraries also on Win host compile
2014-04-22 21:02:08 +02:00
77ac092975
WiP: Attempt to compile without UI
2014-04-21 19:57:15 +02:00
7d79d3d30d
Fix Search for Qt5 version Qt4
2014-04-08 12:08:01 +02:00
4ff39d8114
Cleanups, build if Qt5 is not on system
2014-04-07 18:08:28 +02:00
9f8d867ce2
About correctly when Qt5Keychain isn't found
2014-04-07 17:41:33 +02:00
d416c97eac
Fix Qt5 detection
2014-04-07 17:38:30 +02:00
7d7d03071a
Add Copyright.txt for cmake modules
...
Fixes #1438
2014-04-07 01:27:59 +02:00
57c59850e1
Fix installation paths
2014-04-04 15:52:41 +02:00
4bcd620c29
Avoid build attempts with Qt4 on Windows and Linux
2014-04-04 09:29:01 +02:00
9822002480
Spell APPLICATION_SHORTNAME correctly
...
Fixes #1547
2014-03-28 15:56:35 +01:00
411cffd3d5
NSIS: libcrypto-10 dependency got lost somehow
2014-03-26 09:10:01 +01:00
7c7fad78f7
Qt5: QtLocation is not needed
2014-03-25 22:52:28 +01:00
1c8e5ef4ee
Fix typo
2014-03-25 20:05:06 +01:00
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
dddec8b250
-fPIC is implied on Windows
2014-03-25 19:04:05 +01:00
06082b585a
Add translations when using Qt5 as well
2014-03-25 19:04:05 +01:00
4bf0a2b188
NSIS: depend on Qt5-based installations
2014-03-25 19:04:05 +01:00
d10aec6055
NSIS: Install owncloudcmd on Windows
2014-03-18 23:56:50 +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
87f3755b1f
Deploy with Qt5
2014-03-13 00:52:01 +01:00
3f4bcbbd62
Find Qt5 version of QtKeychain when built with Qt5
2014-03-12 18:38:59 +01:00
955b932806
Qt5: QtLocation is not required
2014-03-12 18:23:45 +01:00
e7b6560c39
cmake: Remove debug
2014-03-12 18:20:45 +01:00
80e583c337
Error out if a Qt module is missing
...
Fixes #1487
2014-03-12 18:18:02 +01:00
bc3d298491
Find QtKeychain on multiarch Debian/Ubuntu
2014-03-12 18:17:43 +01:00
28cf9ce1a4
Properly abort if QtKeychain is not found
...
Fixes #1486
2014-03-12 17:55:30 +01:00
aa4e90acfc
Put ocsync to a private library - WIP
2014-03-11 10:18:07 +01:00
a51cb0982b
Added Mac-specific settings dialog that looks more native
2014-02-18 02:22:16 +01:00
beb9752f09
Merge remote-tracking branch 'origin/1.5'
2014-02-12 21:17:06 +01:00
4db7b5f2a7
NSIS: accept /noautoupdate
2014-02-12 17:57:50 +01:00
958253bb2b
Respect skipUpdate policy from global config files and windows policy.
2014-02-12 17:55:05 +01:00
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
0322a44be5
Adding quotes - necessary for themes containing spaces in APPLICATION_NAME
2014-02-11 11:24:10 +01:00
60ca442728
Adding quotes - necessary for themes containing spaces in APPLICATION_NAME
2014-02-11 11:23:34 +01:00
43345dc236
Icon: Make png2ico / windres failure non-fatal
2014-02-10 14:36:32 +01:00
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
e001e70816
Sparkle: Get it working
2014-02-04 17:37:01 +01:00
924e7d4e39
Mac OS: Make icns generation work when building with Qt 5
2014-02-04 08:50:45 +01:00
cfdc6395d8
Find sparkle the first time around
2014-01-30 12:57:33 +01:00
f2fc866cc4
Set the library and bin install path to cmake standard path.
2014-01-24 13:43:05 +01:00
815efb69d7
NSIS: implement /launch for updater
2014-01-23 17:17:13 +01:00
1d32fb74f9
NSIS: Don't try to log
2014-01-23 16:15:46 +01:00
9c300b83bd
Add FindINotify cmake module.
2014-01-23 16:15:29 +01:00
f98db9ac9d
NSIS: find DLL from csync copy within cmake
2014-01-23 15:55:55 +01:00
484ad28cd6
Merge pull request #1357 from owncloud/nsis_fixes
...
NSIS preparations for upgrade mode
2014-01-22 07:20:53 -08:00
8303c8f909
Mac OS Bundle file: bump copyright year
2014-01-21 11:23:46 +01:00
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
316aade340
Merge branch 'csync_merge'
...
Conflicts:
src/CMakeLists.txt
2014-01-20 13:27:33 +01:00
28c4cd9caa
NSIS: Cleanup: Use MEMENTO defines where possible
2014-01-18 00:06:58 +01:00
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