Daniel Molkentin
bfee6402a6
Simplify NSIS template
2013-01-25 12:56:00 +01:00
Klaas Freitag
1385aab65d
Changed FindCSync module to not check relative pathes + docu.
2013-01-22 15:08:56 +01:00
Klaas Freitag
1db825a733
Set path shortcuts for win32 as well.
2013-01-21 13:38:33 +01:00
Daniel Molkentin
635cb4dc7c
NSIS: Remove GnuTLS remainders
2013-01-16 14:41:12 +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
Klaas Freitag
ba21a9b3a2
Check if neon was built with LFS support.
2013-01-09 15:03:20 +01:00
Daniel Molkentin
e6b9c16d04
Update About dialog
2012-12-20 20:35:21 +01:00
Markus Goetz
bd71ddf0aa
Iconv: Also search in /usr on OS X
2012-12-11 14:25:56 +01:00
Daniel Molkentin
49d2fd685b
iconv support
...
This allows for files on mac to automatically be converted to UNC
2012-12-07 13:03:01 +01:00
Daniel Molkentin
ff1706c729
Add libqtkeychain dll to NSIS
2012-12-06 17:53:04 +01:00
Daniel Molkentin
8f9ad524c2
Find inotify on multiarch debian/ubuntu
2012-12-04 17:48:14 +01:00
Olivier Goffart
95edd6a9de
Merge remote-tracking branch 'origin/master' into dav
...
Conflicts:
config/ocsync_log.conf
src/csync.c
src/csync.h
src/csync_config.c
src/csync_log.h
src/csync_private.h
src/csync_statedb.c
tests/csync_tests/check_csync_config.c
2012-12-03 17:32:08 +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
Markus Goetz
80d53ff4bd
Enable compilation with static iniparser and sqlite
2012-11-07 17:46:13 +01:00
Daniel Molkentin
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
Andreas Schneider
0a6d7435b5
cmake: Get rid of log4c.
2012-10-30 11:27:21 +01:00
Klaas Freitag
2bb52ef6f9
Merge branch 'master' into dav - get cmocka tests and database move.
...
Conflicts:
CMakeLists.txt
cmake/Modules/FindCMocka.cmake
src/csync.c
src/csync_exclude.c
src/csync_reconcile.c
src/csync_statedb.c
src/csync_update.c
src/csync_util.c
src/vio/csync_vio.c
tests/CMakeLists.txt
tests/csync_tests/check_csync_exclude.c
tests/csync_tests/check_csync_statedb_load.c
tests/csync_tests/check_csync_statedb_query.c
tests/csync_tests/check_csync_update.c
tests/std_tests/check_std_c_path.c
2012-10-27 19:27:14 +02:00
Andreas Schneider
cea0c9e85f
cmake: Fix compile option on UNIX with Clang.
2012-10-22 11:20:30 +02:00
Andreas Schneider
c24a18cbfd
cmake: Cleanup testing and enable test target.
2012-10-19 19:07:15 +02:00
Andreas Schneider
b1b0c2c510
tests: Start to use cmocka for the tests.
2012-10-16 10:37:40 +02:00
Daniel Molkentin
aad21c8c4a
Add license to Windows installer
2012-10-12 14:44:21 +02:00
Daniel Molkentin
62a36cd3bb
CMake: Also set CSYNC_BINARY_DIR
...
...so NSIS finds its resource in the right place.
2012-10-10 15:15:19 +02:00
Daniel Molkentin
aa63a789dc
Fix for prev. commmit
2012-10-10 14:19:29 +02:00
Daniel Molkentin
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
Daniel Molkentin
6459f574cc
Prepare for Mac package signing.
2012-10-09 01:40:43 +02:00
Daniel Molkentin
fdfafb6e70
NSI: add proper version of ocsync.conf
2012-10-09 01:40:43 +02:00
Klaas Freitag
7e1c58b602
Fix include path search.
2012-10-05 17:13:23 +02:00
Klaas Freitag
e0a21ebfd6
Fix to find the header even from installed ocsync packages.
2012-10-05 17:02:39 +02:00
Klaas Freitag
736a8dc457
fixed name of the csync owncloud module.
2012-10-05 10:03:16 +02:00
Daniel Molkentin
af99be4cd5
NSIS: shut down binary before uninstall
2012-09-27 10:38:31 +02:00
Klaas Freitag
fabb353158
Use Qt proxy setting in csync in case its "default proxy"
2012-10-02 13:24:10 +02:00
Klaas Freitag
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
Klaas Freitag
d09693f191
Read sync-exclude.lst from /etc/ownCloud, renamed from exclude.lst.
2012-09-27 13:16:14 +02:00
Daniel Molkentin
9d479f9061
Installers on Windows are called Setup
...
Also remove bogus manual line break.
2012-09-24 07:19:09 +02:00
Daniel Molkentin
783207fa40
At least the Program group should be in 'Minimal'.
2012-09-24 03:45:12 +02:00
Daniel Molkentin
ea123b1705
Fix typo
2012-09-24 03:44:32 +02:00
Daniel Molkentin
8233c0c82a
Add autostart section
2012-09-24 03:44:03 +02:00
Daniel Molkentin
a05a4c3741
More templatization.
2012-09-21 13:10:55 +02:00
Daniel Molkentin
663a1886e9
CMake: Centralize all application-specific parameters.
2012-09-20 17:31:18 +02:00
Daniel Molkentin
8a56a90d16
NSIS: fix typo, expand variables properly.
2012-09-20 12:21:21 +02:00
Daniel Molkentin
881f8463e8
OS X: reintroduce LSUIElement in Info.plist
2012-09-17 21:55:57 +02:00
Daniel Molkentin
92ea6a2bef
Tiny fix to previous commit
2012-09-17 21:50:30 +02:00
Daniel Molkentin
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
Klaas Freitag
912f440176
Added win dir to most hackish solution ever.
2012-08-30 18:47:43 +03:00
Klaas Freitag
a2b5596ee1
removed wrong path piece "win"
2012-08-27 18:56:34 +03:00
Klaas Freitag
6b98958de6
Fatal error if svn2ico is missing.
2012-08-13 15:05:40 +03:00
Klaas Freitag
4012e3ff25
Updated translation list in installer template
2012-08-10 13:25:36 +03:00
Klaas Freitag
c4a6827ab3
Add libproxy dlls.
2012-08-08 16:46:00 +03:00
Klaas Freitag
6ba5bf45d8
removed obsolete FindOpenSSL.
2012-07-30 15:59:55 +03:00
Thomas Mueller
d4e808d45a
use custom FindOpenSSL only for cross compilation in any other cases it is used from the local system
2012-07-30 13:27:59 +03:00
Dominik Schmidt
9626f65b6b
Add patched FindOpenSSL to fix cross-compilation for windows
2012-07-23 10:58:13 +02: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
11b4b36c3f
Add sync.dll to Windows bundler.
2012-07-18 17:26:58 +02:00
Klaas Freitag
9e81fd38e1
Added CMocka find module for cmake.
2012-07-09 14:29:17 +02:00
Thomas Mueller
89b9e55945
second possible header name added
2012-06-19 00:13:58 +02:00
Thomas Mueller
963e76dea4
added HINTS to a path which can be specified via a environment setting
2012-06-18 23:21:12 +02:00
Klaas Freitag
496572314d
Fix the app icon to be ownclouds
2012-05-02 16:33:07 +02:00
Dominik Schmidt
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
Dominik Schmidt
f02a018711
win: remove klaasi haasi's harcoded paths from the nsi
2012-04-26 16:55:14 +02:00
Dominik Schmidt
b5f43a89ea
win: copy exclude.lst from correct location into the installer
2012-04-26 16:37:00 +02:00
Klaas Freitag
9109d7b5ac
Add missing GNUInstallDirs module for cmake.
2012-04-21 11:22:03 +02:00
Klaas Freitag
5ceebe1d3c
Added GNUInstallDirs.cmake to lower the required cmake version.
2012-04-18 21:32:18 +02:00
Klaas Freitag
3f027cda73
Handle translation files correct.
2012-04-18 13:59:03 +02:00
Klaas Freitag
313a56f6d6
added crypto dlls for windows package
2012-04-17 17:04:09 +02:00
Dominik Schmidt
13f05db934
cmake: Make Log4C optional.
...
Signed-off-by: Andreas Schneider <asn@cryptomilk.org>
2012-04-17 11:21:03 +02:00
Klaas Freitag
4693f313cd
cmake: Removed obsolete FindArgp module.
...
Signed-off-by: Andreas Schneider <asn@cryptomilk.org>
2012-04-17 11:19:44 +02:00
Dominik Schmidt
9eb9116df3
Simplify FindLibIniparser.cmake
...
Signed-off-by: Andreas Schneider <asn@cryptomilk.org>
2012-04-17 11:16:32 +02:00
Dominik Schmidt
ccac3dcf95
Make it buildable as bundle on OSX
2012-04-16 13:03:20 +02:00
Dominik Schmidt
f7c34ea652
Try some stuff with FindCsync.cmake
2012-04-14 04:19:52 +02:00
Dominik Schmidt
e5a9d64353
Simplify FindNeon.cmake
2012-04-14 03:13:28 +02:00
Dominik Schmidt
9d8383c0fe
Libiniparser narf
2012-04-14 03:13:28 +02:00
Klaas Freitag
341c48197e
removed argp lib check.
2012-04-14 03:13:28 +02:00
Dominik Schmidt
9d73d7705d
Make LOG4C optional
2012-04-14 00:05:52 +02:00
Dominik Schmidt
8e64cebe57
Simplify FindLibIniparser.cmake
2012-04-13 23:20:34 +02:00
Klaas Freitag
95f6f90cb5
Add win32 packaging with nsi
2012-04-02 13:44:24 +02:00
Klaas Freitag
1b12e6590f
Built a portable version of FindCSync that finds dev setup stuff.
2012-03-14 15:26:22 +01:00
Klaas Freitag
09fdcf2053
add a path hint for the locally built version of csync to findcsync.
2012-03-12 17:36:38 +01:00
Klaas Freitag
df2d745747
Add a hint to find the development time csync libs and includes.
2012-03-08 11:38:15 +01:00
Andreas Schneider
f0f36120ad
module: Build the webdav module.
2012-02-22 18:23:17 +01:00
Andreas Schneider
d0888ffba8
cmake: Fix build on OSX.
2012-01-20 15:23:18 +01:00
Duncan Mac-Vicar P
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
Andreas Schneider
7394c19ea1
Update FindLibSSH module to the lastest version.
2010-02-15 11:55:15 +01:00
Andreas Schneider
96822d7f99
Fixed generate_findpackage_file.
2010-01-12 15:43:45 +01:00
Andreas Schneider
3a265152d8
Set compiler to c99.
2009-09-12 12:26:09 +02:00
Andreas Schneider
16c76166bd
Improve detection of system libraries.
2009-09-01 12:25:10 +02:00
Andreas Schneider
93acacfa62
Improve FindCheck module.
2009-09-01 12:16:51 +02:00
Andreas Schneider
f33a01216a
Fix FindLog4C.cmake.
2009-09-01 12:16:31 +02:00
Andreas Schneider
14c1366c86
Fix generate_findpackage_file.
2009-09-01 12:16:10 +02:00
Andreas Schneider
b608f782c3
Improve the Log4C module.
2009-09-01 12:08:52 +02:00
Andreas Schneider
6ca27cd6c1
Improve generate_findpackage_file.
2009-09-01 12:01:04 +02:00
Andreas Schneider
5e282c1fc3
Add an improved FindLibSSH module.
2009-08-25 10:53:33 +02:00
Andreas Schneider
44b5fd650e
Fix Windows installation paths.
2009-05-14 19:40:33 +02:00
Andreas Schneider
4e462e9762
Fix indent.
2009-05-14 19:38:40 +02:00
Andreas Schneider
338370514e
Don't force the build type or we can't overwrite it.
2009-05-14 11:22:38 +02:00
Andreas Schneider
80de674a84
Improve SQLite3 module.
2009-05-07 17:04:48 +02:00
Andreas Schneider
9586291bd0
Rename FindLog4C.
2009-05-07 17:03:24 +02:00
Andreas Schneider
050b806dc8
Rename FindLibSSH.
2009-05-07 17:00:25 +02:00
Jim McDonough
7ad9628a24
Fix build with cmake >= 2.6.3. -D does not overwrite FORCE.
...
Signed-off-by: Andreas Schneider <mail@cynapses.org>
2009-03-18 10:15:04 +01:00
Andreas Schneider
d88cffe607
Make the LIB_FOUND variable accessible in CMake.
2009-03-14 11:11:44 +01:00
Andreas Schneider
adb520a3eb
Some bugfixed to the findpackage script.
2009-02-04 14:26:08 +01:00
Andreas Schneider
2bbd66d82c
Add a new line after pkg-config stuff.
2008-09-04 10:26:27 +02:00
Andreas Schneider
f059286e48
Update doxygen generation.
2008-08-20 18:58:17 +02:00
Andreas Schneider
ecf1027a54
This is a start for a sftp module.
2008-08-06 18:16:54 +02:00
Andreas Schneider
fc85165f48
Mark the include dir as advanced too.
...
Thanks to Bernhard Walle.
2008-08-04 10:17:37 +02:00
Andreas Schneider
5853d67855
Use readline. Patch by Bernhard Walle.
2008-08-04 10:13:10 +02:00
Andreas Schneider
7ef568d815
Mark each library as advanced.
2008-07-15 14:06:21 +02:00
Andreas Schneider
177bcce3ae
Use -Wextra compiler flag by default.
2008-07-09 09:47:24 +02:00
Andreas Schneider
bd36d85aae
Copy the file to the cmake for manpage generation.
2008-07-02 21:00:59 +02:00
Andreas Schneider
ea950dc870
Always compile with -fPIC if supported by the compiler.
2008-07-02 20:20:50 +02:00
Andreas Schneider
67efe90536
Add a manpage for the csync commandline client.
2008-07-02 19:02:27 +02:00
Andreas Schneider
c1b9dffd12
Remove unused CMake module.
2008-06-09 18:16:46 +02:00
Andreas Schneider
dddfe5ac79
Disable check for C++ compiler.
2008-06-03 11:00:50 +02:00
Andreas Schneider
3da8b33143
Rename the sqlite3 module.
2008-05-20 21:55:57 +02:00
Andreas Schneider
0a6cf13caf
Fix typo.
2008-05-20 19:16:47 +02:00
Andreas Schneider
b1c0cc7f58
Fix variables in sqlite find module.
2008-05-20 19:07:15 +02:00
Andreas Schneider
83fdb412ad
Add more accurate time measurement.
2008-05-15 19:18:41 +02:00
Andreas Schneider
804e5adee6
Add more warnings.
2008-05-08 16:17:17 +02:00
Andreas Schneider
9dbd938791
Set the default buildtype to RelWithDebInfo.
2008-05-07 15:38:04 +02:00
Andreas Schneider
c7b77fab5b
Add stackprotector flag and check for fourtify source.
2008-05-07 11:42:45 +02:00
Andreas Schneider
1f48d22f24
Add cmake 2.6 compatible FindCheck module.
2008-05-06 11:18:20 +02:00
Andreas Schneider
93df0adc08
Fix bug in generate_findpackage_file script.
2008-05-06 11:17:53 +02:00
Andreas Schneider
a1116b0e00
Add a module to find libdl.so.
2008-05-06 10:54:15 +02:00
Andreas Schneider
fc6a5ce222
Add CMake 2.6 compatible FindSqlite3 module.
2008-05-06 10:53:42 +02:00
Andreas Schneider
7e9cf16825
Fix CMake 2.6 warnings.
2008-05-06 10:51:12 +02:00
Andreas Schneider
c9b34b8aae
Add cmake 2.6 support for generate_findpackage_file.
2008-05-06 10:50:25 +02:00
Andreas Schneider
c08ec25f5b
Add a new version for the sqlite3 find module.
2008-05-05 17:32:11 +02:00
Andreas Schneider
a262be870a
Add a macro to copy a file if it is different.
2008-03-03 13:42:26 +01:00
Andreas Schneider
1b29a420bc
Initial commit
2008-02-27 18:56:47 +01:00
