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
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
4c7ddb769a
NSIS: INSTALL_PATH has never been used
...
Remove it to avoid confusion
2014-01-17 12:11:19 +01:00
91345d9e25
NSIS: Fix transations in uninstaller
...
Before, we could not show custom strings at all
2014-01-17 12:11:19 +01:00
c7227297af
Make it compile with the merge of csync mirall
2014-01-15 12:20:03 +01:00
aba1252e60
Remove inotify from cmake files.
2014-01-14 15:06:06 +01:00
924e0e3242
Merge csync inside the mirall repository
2014-01-13 14:43:14 +01:00
bf7ca60bec
Move csync in order to merge it with mirall
2014-01-13 14:39:50 +01:00
ebee52ea8a
Merge branch '1.5'
2014-01-09 12:32:08 +01:00
f37f5ccf69
Display version in Mac OS Bundle again
2014-01-08 11:15:28 +01:00
1c9a4784c7
Don't discard user CXXFLAGS, append to them instead.
2013-12-30 00:30:48 +02:00
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
93d75932ac
NSIS: fix c&p error.
2013-12-12 10:46:37 +01:00
8491d95ca4
NSIS: English must be enumerated, too
...
Fixes empty strings in installer.
2013-12-12 10:46:13 +01:00
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
f05e998430
Translation SectionGroup Shortcuts
2013-12-10 18:08:07 +01:00
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
d82a9423d6
adding Turkish translation to installer
2013-12-10 09:59:23 +01:00
b41feebcdd
Multi-lingual installer
2013-12-10 00:43:58 +01:00
31989d23a6
Adjust Windows and Mac binaries package names
2013-12-09 17:41:41 +01:00
f5e8efd435
Add build number into versioning scheme
...
This is an enabler to improve update experience
2013-12-09 16:39:13 +01:00
ec075a6d2a
removing libiniparder.dll and libdl.dll from NSNIS installer
2013-12-02 13:20:10 +01:00
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
5c4d240c66
Build on mac with Qt 5
...
I still had this patch on disk.
2013-11-19 14:41:40 +01:00
e20f39f040
Another cleanup
2013-11-14 19:31:38 +01:00
c2eaf5e627
owncloud is no longer a dl'opened module, but linked into csync
2013-11-14 19:22:22 +01:00
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
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
475a4f2676
Windows: ship QtSql lib
2013-11-13 14:32:09 +01:00
763cb43e46
Add qsqlite plugin on Windows
2013-10-04 12:45:17 +02:00
3577ba2981
Fix httpbf/neon linkage
2013-09-10 19:50:44 +02:00
48b4c57d92
Use shared version of libhttpbf, package it on win
2013-09-10 14:45:08 +02:00
6b9950a9a0
Qt5: DBUS is only needed for FDO
2013-09-05 18:41:49 +02:00
35ac6610c7
Compile with Qt5 on Linux
2013-09-05 17:13:31 +02:00
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
bf6d0a521c
Compile with Qt5
2013-08-28 20:58:22 +02:00
336bbb2403
Compile with Qt4
2013-08-28 20:14:40 +02:00
73da086964
Initial changes to also build on Qt5, doesn't compile yet
2013-08-28 17:03:31 +02:00
8bfb44fd28
Inverting the logic to set the prefix for SYSCONF_INSTALL_DIR
2013-08-26 22:42:17 +02:00
79d3b84fad
Reintroduce workaround for /etc in root if files go to /usr
2013-08-26 21:59:52 +02:00
30b2406533
Fix windows packaging
2013-08-23 15:37:24 +02:00
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
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
c323041040
NSIS: install libjpeg for qjpeg4.dll
2013-08-08 15:39:34 +02:00
a493f81ec2
Windows Installer: Add jpeg,gif,ico image formats
2013-08-07 16:24:10 +02:00
b08c1ada02
-Wno-long-long required due to Qt headers
2013-08-07 13:19:21 +02:00
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
85a832fb7c
NSIS: Add WebKit dll
2013-08-05 23:25:14 +02:00
ce851a7a8b
Use wildcards for translations, so they are always up-to-date
2013-08-01 15:28:06 +02:00
be65f78174
Fix win32 installer
2013-07-31 08:35:13 +02:00
ae2e3e7fb1
Remove autostart option from Windows installer
...
now handled by the application
2013-07-15 11:05:14 +02:00
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
1ca8ebebd9
Do not add shortcuts to non-existent files
2013-04-23 17:19:27 +02:00
6695b50965
Fix Issue #382
...
Just a couple of typo/cut-and-paste errors.
2013-04-22 01:22:16 -07:00
1c6523bcec
Add plugin for screenreader support
2013-03-21 17:49:03 +03:00
dbec98ff48
Manual update of avail translations
2013-02-21 18:35:33 +03:00
7734656ae3
Make mirall packager for win bundle the new openSSL dlls.
2013-02-05 14:37:39 +01:00
a04cf32a69
No need to ship ocsync.conf
2013-01-30 09:48:45 +01:00
bfee6402a6
Simplify NSIS template
2013-01-25 12:56:00 +01:00
1385aab65d
Changed FindCSync module to not check relative pathes + docu.
2013-01-22 15:08:56 +01:00
635cb4dc7c
NSIS: Remove GnuTLS remainders
2013-01-16 14:41:12 +01:00
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
e6b9c16d04
Update About dialog
2012-12-20 20:35:21 +01:00
ff1706c729
Add libqtkeychain dll to NSIS
2012-12-06 17:53:04 +01:00
8f9ad524c2
Find inotify on multiarch debian/ubuntu
2012-12-04 17:48:14 +01:00
9d05a53c89
Fix cmake checks on QtKeyChain.
2012-11-28 10:44:25 +01:00
2b2eb853fc
Add qtkeychain to cmake - WIP read password from keychain.
...
Conflicts:
CMakeLists.txt
2012-11-27 19:28:03 +01:00
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
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
aad21c8c4a
Add license to Windows installer
2012-10-12 14:44:21 +02:00
62a36cd3bb
CMake: Also set CSYNC_BINARY_DIR
...
...so NSIS finds its resource in the right place.
2012-10-10 15:15:19 +02:00
aa63a789dc
Fix for prev. commmit
2012-10-10 14:19:29 +02:00
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
6459f574cc
Prepare for Mac package signing.
2012-10-09 01:40:43 +02:00
fdfafb6e70
NSI: add proper version of ocsync.conf
2012-10-09 01:40:43 +02:00
7e1c58b602
Fix include path search.
2012-10-05 17:13:23 +02:00
e0a21ebfd6
Fix to find the header even from installed ocsync packages.
2012-10-05 17:02:39 +02:00
736a8dc457
fixed name of the csync owncloud module.
2012-10-05 10:03:16 +02:00
af99be4cd5
NSIS: shut down binary before uninstall
2012-09-27 10:38:31 +02:00
fabb353158
Use Qt proxy setting in csync in case its "default proxy"
2012-10-02 13:24:10 +02:00
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
d09693f191
Read sync-exclude.lst from /etc/ownCloud, renamed from exclude.lst.
2012-09-27 13:16:14 +02:00
9d479f9061
Installers on Windows are called Setup
...
Also remove bogus manual line break.
2012-09-24 07:19:09 +02:00
783207fa40
At least the Program group should be in 'Minimal'.
2012-09-24 03:45:12 +02:00
ea123b1705
Fix typo
2012-09-24 03:44:32 +02:00
8233c0c82a
Add autostart section
2012-09-24 03:44:03 +02:00
a05a4c3741
More templatization.
2012-09-21 13:10:55 +02:00
663a1886e9
CMake: Centralize all application-specific parameters.
2012-09-20 17:31:18 +02:00
8a56a90d16
NSIS: fix typo, expand variables properly.
2012-09-20 12:21:21 +02:00
881f8463e8
OS X: reintroduce LSUIElement in Info.plist
2012-09-17 21:55:57 +02:00
92ea6a2bef
Tiny fix to previous commit
2012-09-17 21:50:30 +02:00
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
912f440176
Added win dir to most hackish solution ever.
2012-08-30 18:47:43 +03:00
a2b5596ee1
removed wrong path piece "win"
2012-08-27 18:56:34 +03:00
6b98958de6
Fatal error if svn2ico is missing.
2012-08-13 15:05:40 +03:00
4012e3ff25
Updated translation list in installer template
2012-08-10 13:25:36 +03:00
c4a6827ab3
Add libproxy dlls.
2012-08-08 16:46:00 +03:00
4b33997678
Check the system for inotify in cmake and use a config.h file.
2012-07-20 17:12:29 +02:00
11b4b36c3f
Add sync.dll to Windows bundler.
2012-07-18 17:26:58 +02:00
89b9e55945
second possible header name added
2012-06-19 00:13:58 +02:00
963e76dea4
added HINTS to a path which can be specified via a environment setting
2012-06-18 23:21:12 +02:00
496572314d
Fix the app icon to be ownclouds
2012-05-02 16:33:07 +02:00
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
f02a018711
win: remove klaasi haasi's harcoded paths from the nsi
2012-04-26 16:55:14 +02:00
b5f43a89ea
win: copy exclude.lst from correct location into the installer
2012-04-26 16:37:00 +02:00
9109d7b5ac
Add missing GNUInstallDirs module for cmake.
2012-04-21 11:22:03 +02:00
3f027cda73
Handle translation files correct.
2012-04-18 13:59:03 +02:00
313a56f6d6
added crypto dlls for windows package
2012-04-17 17:04:09 +02:00
ccac3dcf95
Make it buildable as bundle on OSX
2012-04-16 13:03:20 +02:00
f7c34ea652
Try some stuff with FindCsync.cmake
2012-04-14 04:19:52 +02:00
95f6f90cb5
Add win32 packaging with nsi
2012-04-02 13:44:24 +02:00
1b12e6590f
Built a portable version of FindCSync that finds dev setup stuff.
2012-03-14 15:26:22 +01:00
09fdcf2053
add a path hint for the locally built version of csync to findcsync.
2012-03-12 17:36:38 +01:00
df2d745747
Add a hint to find the development time csync libs and includes.
2012-03-08 11:38:15 +01:00
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
Olivier Goffart