Commit Graph

3948 Commits

Author SHA1 Message Date
FrancisANDRE
fc544729b5 Reinstall openssl
Signed-off-by: FrancisANDRE <zosrothko@orange.fr>
2016-03-16 07:52:36 +01:00
FrancisANDRE
6a7f491232 List /usr/include/openssl
Signed-off-by: FrancisANDRE <zosrothko@orange.fr>
2016-03-16 07:46:33 +01:00
FrancisANDRE
c06594e464 Small udpate on backlist branch name.
Signed-off-by: FrancisANDRE <zosrothko@orange.fr>
2016-03-16 07:21:34 +01:00
Aleksandar Fabijanic
4cceea3a78 Merge pull request #1200 from Kampbell/mkrelease-updates
Mkrelease updates
2016-03-15 23:13:31 -07:00
FrancisANDRE
6fd55fffd2 Cygwin64 does not seems to work properly.
Signed-off-by: FrancisANDRE <zosrothko@orange.fr>
2016-03-15 14:26:22 +01:00
FrancisANDRE
4d55e9db30 Install OpenSSL 32 & 64.
Signed-off-by: FrancisANDRE <zosrothko@orange.fr>
2016-03-15 14:05:22 +01:00
FrancisANDRE
eb4b1dbbde Use cygwin for 32 bits and cygwin64 for 64 bits.
Signed-off-by: FrancisANDRE <zosrothko@orange.fr>
2016-03-15 13:45:33 +01:00
FrancisANDRE
3f5324351b Protect MySQL & PostgreSQL install under cygwin
Signed-off-by: FrancisANDRE <zosrothko@orange.fr>
2016-03-15 13:21:26 +01:00
FrancisANDRE
fc4f5b5c13 Fix cygwin make command
Signed-off-by: FrancisANDRE <zosrothko@orange.fr>
2016-03-15 13:06:31 +01:00
FrancisANDRE
6a390fa3c5 Merge remote-tracking branch 'pocoproject@github/develop' into mkrekease-updates 2016-03-15 11:02:53 +01:00
FrancisANDRE
b66ac9f551 Add Data/PostgreSQL. Avoid using make for component without Makefile;
Signed-off-by: FrancisANDRE <zosrothko@orange.fr>
2016-03-15 10:59:52 +01:00
FrancisANDRE
3138f1412d Skip build for Merge pull request.
Signed-off-by: FrancisANDRE <zosrothko@orange.fr>
2016-03-15 09:24:37 +01:00
FrancisANDRE
c435509238 Start Cygwin on AppVEyor
Signed-off-by: FrancisANDRE <zosrothko@orange.fr>
2016-03-15 08:45:13 +01:00
Aleksandar Fabijanic
10b18e0ce7 Merge pull request #1194 from mkrivos/develop
Sqlite 3.11.1
2016-03-14 23:26:06 -07:00
Aleksandar Fabijanic
884949a217 Merge pull request #1195 from vmiklos/netssl-openssl-wshadow-fixes
GH #1050 NetSSL_OpenSSL: fix gcc -Wshadow warnings
2016-03-14 23:25:35 -07:00
Miklos Vajna
617f2635ad GH #1050 NetSSL_OpenSSL: fix gcc -Wshadow warnings 2016-03-14 16:09:50 +01:00
Marian Krivoš
66a815ec6b Merge pull request #28 from pocoproject/develop
Sync 14.3.2016
2016-03-14 14:34:08 +01:00
mkrivos
5faec708cd bump to sqlite 3.11.1 2016-03-14 14:09:45 +01:00
Aleksandar Fabijanic
00a787e0cb Merge pull request #945 from aaron0x/RefactoryBinaryReaderWriter
Refactory BinaryReader and BinaryWriter
2016-03-13 23:08:44 -07:00
Aleksandar Fabijanic
cf137839cb Merge pull request #1193 from Kampbell/AppVeyorAndTravis
AppVeyor and Travis: finalization for Data/MySQL & Data/PostgreSQL
2016-03-13 21:37:36 -07:00
FrancisANDRE
01c174a97a Merge remote-tracking branch 'pocoproject@github/develop' into pr/1113 2016-03-13 07:09:07 +01:00
Aleksandar Fabijanic
2301888296 Merge pull request #1177 from pocoproject/pr/1113
Pr/1113 after merging develop
2016-03-12 13:42:50 -08:00
FrancisANDRE
8c83e7696e Omit Data/postgreSQL for Cygwin as postgreSQL front end is not available.
Signed-off-by: FrancisANDRE <zosrothko@orange.fr>
2016-03-12 21:32:31 +01:00
FrancisANDRE
297d4d1046 Fix typo.
Signed-off-by: FrancisANDRE <zosrothko@orange.fr>
2016-03-12 21:31:11 +01:00
Guenter Obiltschnig
b30da7bcca better logging if rollback fails with Exception 2016-03-12 20:40:39 +01:00
FrancisANDRE
6521d559e2 Remove cache of cmake-3.2.3-Linux-x86_64. Does not work as expected.
Signed-off-by: FrancisANDRE <zosrothko@orange.fr>
2016-03-12 18:51:57 +01:00
FrancisANDRE
978924cef6 Restore Data/SQLite for OSX
Signed-off-by: FrancisANDRE <zosrothko@orange.fr>
2016-03-12 18:07:08 +01:00
FrancisANDRE
cee7b3e7b8 Fix missing space in sub-targets.
Signed-off-by: FrancisANDRE <zosrothko@orange.fr>
2016-03-12 17:42:06 +01:00
FrancisANDRE
f713beea53 Fix syntax of cache.
Signed-off-by: FrancisANDRE <zosrothko@orange.fr>
2016-03-12 16:46:02 +01:00
FrancisANDRE
6067364d5b Comment out list of MySQL directory.
Signed-off-by: FrancisANDRE <zosrothko@orange.fr>
2016-03-12 16:28:19 +01:00
FrancisANDRE
1b737fb5db Cache cmake-3.2.3-Linux-x86_64.
Signed-off-by: FrancisANDRE <zosrothko@orange.fr>
2016-03-12 16:27:14 +01:00
FrancisANDRE
89895be433 Compact COMPONENTS definition.
Signed-off-by: FrancisANDRE <zosrothko@orange.fr>
2016-03-12 16:26:44 +01:00
Guenter Obiltschnig
443e54fdde use TLS_*_method() instead of deprecated SSLv23_*_method() if OpenSSL version is >= 1.1; initialize default/fallback client context to support all TLS protocols, not just TLSv1 2016-03-12 12:20:22 +01:00
FrancisANDRE
a10a2d5fc4 Exclude Data/MySQL.
Signed-off-by: FrancisANDRE <zosrothko@orange.fr>
2016-03-12 11:59:10 +01:00
FrancisANDRE
356a729be4 Reformat. Setup VS variable only with cmake. Readd Data/MySQL testsuite
on Win32.

Signed-off-by: FrancisANDRE <zosrothko@orange.fr>
2016-03-12 11:55:36 +01:00
FrancisANDRE
fa1ba42957 Reorder omitted components
Signed-off-by: FrancisANDRE <zosrothko@orange.fr>
2016-03-12 11:54:11 +01:00
FrancisANDRE
eda8a13b96 Adding <my_glob.h> introduces the macro max with #define max on Linux.
Signed-off-by: FrancisANDRE <zosrothko@orange.fr>
2016-03-12 11:51:13 +01:00
FrancisANDRE
c878878b48 Restore Data/MySQL at it properplace.
Signed-off-by: FrancisANDRE <zosrothko@orange.fr>
2016-03-12 11:48:07 +01:00
FrancisANDRE
f42d829105 Remove cache of C:\Program Files\PostgreSQL\9.4
Signed-off-by: FrancisANDRE <zosrothko@orange.fr>
2016-03-12 11:13:15 +01:00
Alex Fabijanic
2a80322ecb merge dev and resolve conflicts 2016-03-11 20:57:28 -08:00
Aleksandar Fabijanic
d49ea8a51b Merge pull request #1189 from mathausmendel/develop
Compilation fixes for AIX (IBM XLC)
2016-03-11 20:39:47 -08:00
Aleksandar Fabijanic
55fbf1a730 Merge pull request #1190 from Kampbell/Travis
Travis: reformatting & cleanup
2016-03-11 08:19:15 -08:00
FrancisANDRE
598237a817 Merge remote-tracking branch 'pocoproject/develop' into Travis 2016-03-11 16:36:23 +01:00
FrancisANDRE
57bc0cc4cf Display postgres and mysql version.
Signed-off-by: FrancisANDRE <zosrothko@orange.fr>
2016-03-11 15:34:12 +01:00
FrancisANDRE
ff32e89a27 Restore travis/script/runtests
Signed-off-by: FrancisANDRE <zosrothko@orange.fr>
2016-03-11 14:50:05 +01:00
Guenter Obiltschnig
c4ca7bb732 another attempt at #1187: retry mysql_stmt_prepare if server has gone away 2016-03-11 14:47:30 +01:00
Mathäus Mendel
ce8e88cc4b Fixed ${CMAKE_THREAD_LIBS_INIT} being empty during the compilation
The directive checking for the native threads library must be
called before everything else.
2016-03-11 10:35:23 -03:00
Mathäus Mendel
8895045fb5 Made all testsuite link with pthreads on Unix systems
This fixes the linker errors due to missing pthreads library on AIX.
2016-03-11 10:30:15 -03:00
FrancisANDRE
3efe787a64 Use sudo for installing Poco libs.
Signed-off-by: FrancisANDRE <zosrothko@orange.fr>
2016-03-11 14:25:23 +01:00
Mathäus Mendel
473de6d1b1 Fixed compilation on IBM AIX due to name clash with UTF32Char
Both poco and AIX's system header <sys/types.h> defines UTF32Char
type which lead to a name clash and compilation error.
2016-03-11 10:21:40 -03:00