generic-library/poco
1
0
Fork 0
mirror of https://github.com/pocoproject/poco.git synced 2025-11-25 06:36:37 +01:00
Code Issues Projects Releases Wiki Activity

WIP on Gradle for Linux

Browse Source
This commit is contained in:
zosrothko
2018-03-30 16:25:03 +02:00
parent 530e7b585a
commit facf90b22c
3 changed files with 142 additions and 110 deletions
Download Patch File Download Diff File Expand all files Collapse all files

204
build.gradle
View File

@@ -271,42 +271,42 @@ subprojects {
} }
} }
} }
def opensslHome = new File(rootDir, "openssl/build")
def opensslBrewHome = new File('/usr/local/opt/openssl')
def opensslLinuxHome = new File('/usr/lib/x86_64-linux-gnu')
crypto { crypto {
headers.srcDir "$opensslHome/include"
binaries.withType(StaticLibraryBinary) { binaries.withType(StaticLibraryBinary) {
def libName = "foobar" def libName = "foobar"
if (buildType == buildTypes.debug) { if (buildType == buildTypes.debug) {
if (targetPlatform.name == 'win32') { if (targetPlatform.name == 'win32') {
headers.srcDir "$openSSLWinHome/include"
libName = 'libcryptod.lib' libName = 'libcryptod.lib'
staticLibraryFile = file("$opensslHome/win32/lib/debug/$libName") staticLibraryFile = file("$openSSLWinHome/win32/lib/debug/$libName")
} else if (targetPlatform.name == 'win64') { } else if (targetPlatform.name == 'win64') {
headers.srcDir "$openSSLWinHome/include"
libName = 'libcryptod.lib' libName = 'libcryptod.lib'
staticLibraryFile = file("$opensslHome/win64/lib/debug/$libName") staticLibraryFile = file("$openSSLWinHome/win64/lib/debug/$libName")
} else if (targetPlatform.operatingSystem.macOsX) { } else if (targetPlatform.operatingSystem.macOsX) {
headers.srcDir "$openSSLBrewHome/include"
libName = 'libcryptod.a' libName = 'libcryptod.a'
staticLibraryFile = file("$opensslBrewHome/lib/$libName") staticLibraryFile = file("$openSSLBrewHome/lib/$libName")
} else if (targetPlatform.operatingSystem.linux) { } else if (targetPlatform.operatingSystem.linux) {
libName = 'libcryptod.a' headers.srcDir "$openSSLLinuxInc/include"
staticLibraryFile = file("$opensslLinuxHome/$libName") libName = 'libcrypto.a'
staticLibraryFile = file("$openSSLLinuxLib/$libName")
} }
} else } else
if (buildType == buildTypes.release) { if (buildType == buildTypes.release) {
if (targetPlatform.name == 'win32') { if (targetPlatform.name == 'win32') {
libName = 'libcrypto.lib' libName = 'libcrypto.lib'
staticLibraryFile = file("$opensslHome/win32/lib/release/$libName") staticLibraryFile = file("$openSSLWinHome/win32/lib/release/$libName")
} else if (targetPlatform.name == 'win64') { } else if (targetPlatform.name == 'win64') {
libName = 'libcrypto.lib' libName = 'libcrypto.lib'
staticLibraryFile = file("$opensslHome/win64/lib/release/$libName") staticLibraryFile = file("$openSSLWinHome/win64/lib/release/$libName")
} else if (targetPlatform.operatingSystem.macOsX) { } else if (targetPlatform.operatingSystem.macOsX) {
libName = 'libcrypto.a' libName = 'libcrypto.a'
staticLibraryFile = file("$opensslBrewHome/lib/$libName") staticLibraryFile = file("$openSSLBrewHome/lib/$libName")
} else if (targetPlatform.operatingSystem.linux) { } else if (targetPlatform.operatingSystem.linux) {
headers.srcDir "$openSSLLinuxInc/include"
libName = 'libcrypto.a' libName = 'libcrypto.a'
staticLibraryFile = file("$opensslLinuxHome/$libName") staticLibraryFile = file("$openSSLLinuxLib/$libName")
} }
} else { } else {
throw new GradleException("Unknown buildType" + buildType) throw new GradleException("Unknown buildType" + buildType)
@@ -319,46 +319,48 @@ subprojects {
if (targetPlatform.name == 'win32') { if (targetPlatform.name == 'win32') {
dllName = 'libcryptod.dll' dllName = 'libcryptod.dll'
linkName = 'libcryptod.lib' linkName = 'libcryptod.lib'
sharedLibraryFile = file("$opensslHome/win32/bin/debug/$dllName") sharedLibraryFile = file("$openSSLWinHome/win32/bin/debug/$dllName")
sharedLibraryLinkFile = file("$opensslHome/win32/bin/debug/$linkName") sharedLibraryLinkFile = file("$openSSLWinHome/win32/bin/debug/$linkName")
} else if (targetPlatform.name == 'win64') { } else if (targetPlatform.name == 'win64') {
dllName = 'libcryptod.dll' dllName = 'libcryptod.dll'
linkName = 'libcryptod.lib' linkName = 'libcryptod.lib'
sharedLibraryFile = file("$opensslHome/win64/bin/debug/$dllName") sharedLibraryFile = file("$openSSLWinHome/win64/bin/debug/$dllName")
sharedLibraryLinkFile = file("$opensslHome/win64/bin/debug/$linkName") sharedLibraryLinkFile = file("$openSSLWinHome/win64/bin/debug/$linkName")
} else if (targetPlatform.operatingSystem.macOsX) { } else if (targetPlatform.operatingSystem.macOsX) {
dllName = 'libcryptod.dylib' dllName = 'libcryptod.dylib'
linkName = 'libcryptod.dylib' linkName = 'libcryptod.dylib'
sharedLibraryFile = file("$opensslBrewHome/lib/$dllName") sharedLibraryFile = file("$openSSLBrewHome/lib/$dllName")
sharedLibraryLinkFile = file("$opensslBrewHome/lib/$linkName") sharedLibraryLinkFile = file("$openSSLBrewHome/lib/$linkName")
} else if (targetPlatform.operatingSystem.linux) { } else if (targetPlatform.operatingSystem.linux) {
dllName = 'libcryptod.so' headers.srcDir "$openSSLLinuxInc/include"
linkName = 'libcryptod.so' dllName = 'libcrypto.so'
sharedLibraryFile = file("$opensslLinuxHome/$dllName") linkName = 'libcrypto.a'
sharedLibraryLinkFile = file("$opensslLinuxHome/$linkName") sharedLibraryFile = file("$openSSLLinuxLib/$dllName")
sharedLibraryLinkFile = file("$openSSLLinuxLib/$linkName")
} }
} else } else
if (buildType == buildTypes.release) { if (buildType == buildTypes.release) {
if (targetPlatform.name == 'win32') { if (targetPlatform.name == 'win32') {
dllName = 'libcrypto.dll' dllName = 'libcrypto.dll'
linkName = 'libcrypto.lib' linkName = 'libcrypto.lib'
sharedLibraryFile = file("$opensslHome/win32/bin/release/$dllName") sharedLibraryFile = file("$openSSLWinHome/win32/bin/release/$dllName")
sharedLibraryLinkFile = file("$opensslHome/win32/bin/release/$linkName") sharedLibraryLinkFile = file("$openSSLWinHome/win32/bin/release/$linkName")
} else if (targetPlatform.name == 'win64') { } else if (targetPlatform.name == 'win64') {
dllName = 'libcrypto.dll' dllName = 'libcrypto.dll'
linkName = 'libcrypto.lib' linkName = 'libcrypto.lib'
sharedLibraryFile = file("$opensslHome/win64/bin/release/$dllName") sharedLibraryFile = file("$openSSLWinHome/win64/bin/release/$dllName")
sharedLibraryLinkFile = file("$opensslHome/win64/bin/release/$linkName") sharedLibraryLinkFile = file("$openSSLWinHome/win64/bin/release/$linkName")
} else if (targetPlatform.operatingSystem.macOsX) { } else if (targetPlatform.operatingSystem.macOsX) {
dllName = 'libcrypto.dylib' dllName = 'libcrypto.dylib'
linkName = 'libcrypto.dylib' linkName = 'libcrypto.dylib'
sharedLibraryFile = file("$opensslBrewHome/lib/$dllName") sharedLibraryFile = file("$openSSLBrewHome/lib/$dllName")
sharedLibraryLinkFile = file("$opensslBrewHome/lib/$linkName") sharedLibraryLinkFile = file("$openSSLBrewHome/lib/$linkName")
} else if (targetPlatform.operatingSystem.linux) { } else if (targetPlatform.operatingSystem.linux) {
headers.srcDir "$openSSLLinuxInc/include"
dllName = 'libcrypto.so' dllName = 'libcrypto.so'
linkName = 'libcrypto.so' linkName = 'libcrypto.a'
sharedLibraryFile = file("$opensslLinuxHome/$dllName") sharedLibraryFile = file("$openSSLLinuxLib/$dllName")
sharedLibraryLinkFile = file("$opensslLinuxHome/$linkName") sharedLibraryLinkFile = file("$openSSLLinuxLib/$linkName")
} }
} else { } else {
throw new GradleException("Unknown buildType" + buildType) throw new GradleException("Unknown buildType" + buildType)
@@ -366,38 +368,41 @@ subprojects {
} }
} }
ssl { ssl {
headers.srcDir "$opensslHome/include"
binaries.withType(StaticLibraryBinary) { binaries.withType(StaticLibraryBinary) {
def libName def libName
if (buildType == buildTypes.debug) { if (buildType == buildTypes.debug) {
if (targetPlatform.name == 'win32') { if (targetPlatform.name == 'win32') {
headers.srcDir "$openSSLWinHome/include"
libName = 'libssld.lib' libName = 'libssld.lib'
staticLibraryFile = file("$opensslHome/win32/lib/debug/$libName") staticLibraryFile = file("$openSSLWinHome/win32/lib/debug/$libName")
} else if (targetPlatform.name == 'win64') { } else if (targetPlatform.name == 'win64') {
headers.srcDir "$openSSLWinHome/include"
libName = 'libssld.lib' libName = 'libssld.lib'
staticLibraryFile = file("$opensslHome/win64/lib/debug/$libName") staticLibraryFile = file("$openSSLWinHome/win64/lib/debug/$libName")
} else if (targetPlatform.operatingSystem.macOsX) { } else if (targetPlatform.operatingSystem.macOsX) {
libName = 'libssld.a' libName = 'libssld.a'
staticLibraryFile = file("$opensslBrewHome/lib/$libName") staticLibraryFile = file("$openSSLBrewHome/lib/$libName")
} else if (targetPlatform.operatingSystem.linux) { } else if (targetPlatform.operatingSystem.linux) {
libName = 'libssld.a' headers.srcDir "$openSSLLinuxInc/include"
staticLibraryFile = file("$opensslLinuxHome/$libName") libName = 'libssl.a'
staticLibraryFile = file("$openSSLLinuxLib/$libName")
} }
} else } else
if (buildType == buildTypes.release) { if (buildType == buildTypes.release) {
if (targetPlatform.name == 'win32') { if (targetPlatform.name == 'win32') {
libName = 'libssl.lib' libName = 'libssl.lib'
staticLibraryFile = file("$opensslHome/win32/lib/release/$libName") staticLibraryFile = file("$openSSLWinHome/win32/lib/release/$libName")
} else if (targetPlatform.name == 'win64') { } else if (targetPlatform.name == 'win64') {
libName = 'libssl.lib' libName = 'libssl.lib'
staticLibraryFile = file("$opensslHome/win64/lib/release/$libName") staticLibraryFile = file("$openSSLWinHome/win64/lib/release/$libName")
} else if (targetPlatform.operatingSystem.macOsX) { } else if (targetPlatform.operatingSystem.macOsX) {
libName = 'libssl.a' libName = 'libssl.a'
staticLibraryFile = file("$opensslBrewHome/lib/$libName") staticLibraryFile = file("$openSSLBrewHome/lib/$libName")
} else if (targetPlatform.operatingSystem.linux) { } else if (targetPlatform.operatingSystem.linux) {
headers.srcDir "$openSSLLinuxInc/include"
libName = 'libssl.a' libName = 'libssl.a'
staticLibraryFile = file("$opensslLinuxHome/$libName") staticLibraryFile = file("$openSSLLinuxLib/$libName")
} }
} else { } else {
throw new GradleException("Unknown buildType" + buildType) throw new GradleException("Unknown buildType" + buildType)
@@ -410,45 +415,47 @@ subprojects {
if (targetPlatform.name == 'win32') { if (targetPlatform.name == 'win32') {
dllName = 'libssld.dll' dllName = 'libssld.dll'
linkName = 'libssld.lib' linkName = 'libssld.lib'
sharedLibraryFile = file("$opensslHome/win32/bin/debug/$dllName") sharedLibraryFile = file("$openSSLWinHome/win32/bin/debug/$dllName")
sharedLibraryLinkFile = file("$opensslHome/win32/bin/debug/$linkName") sharedLibraryLinkFile = file("$openSSLWinHome/win32/bin/debug/$linkName")
} else if (targetPlatform.name == 'win64') { } else if (targetPlatform.name == 'win64') {
dllName = 'libssld.dll' dllName = 'libssld.dll'
linkName = 'libssld.lib' linkName = 'libssld.lib'
sharedLibraryFile = file("$opensslHome/win64/bin/debug/$dllName") sharedLibraryFile = file("$openSSLWinHome/win64/bin/debug/$dllName")
sharedLibraryLinkFile = file("$opensslHome/win64/bin/debug/$linkName") sharedLibraryLinkFile = file("$openSSLWinHome/win64/bin/debug/$linkName")
} else if (targetPlatform.operatingSystem.macOsX) { } else if (targetPlatform.operatingSystem.macOsX) {
dllName = 'libssld.dylib' dllName = 'libssld.dylib'
linkName = 'libssld.dylib' linkName = 'libssld.dylib'
sharedLibraryFile = file("$opensslBrewHome/lib/$dllName") sharedLibraryFile = file("$openSSLBrewHome/lib/$dllName")
sharedLibraryLinkFile = file("$opensslBrewHome/lib/$linkName") sharedLibraryLinkFile = file("$openSSLBrewHome/lib/$linkName")
} else if (targetPlatform.operatingSystem.linux) { } else if (targetPlatform.operatingSystem.linux) {
dllName = 'libssld.so' headers.srcDir "$openSSLLinuxInc/include"
linkName = 'libssld.so' dllName = 'libssl.so'
sharedLibraryFile = file("$opensslLinuxHome/$dllName") linkName = 'libssl.a'
sharedLibraryLinkFile = file("$opensslLinuxHome/$linkName") sharedLibraryFile = file("$openSSLLinuxLib/$dllName")
sharedLibraryLinkFile = file("$openSSLLinuxLib/$linkName")
} }
} else if (buildType == buildTypes.release) { } else if (buildType == buildTypes.release) {
if (targetPlatform.name == 'win32') { if (targetPlatform.name == 'win32') {
dllName = 'libssl.dll' dllName = 'libssl.dll'
linkName = 'libssl.lib' linkName = 'libssl.lib'
sharedLibraryFile = file("$opensslHome/win32/bin/release/$dllName") sharedLibraryFile = file("$openSSLWinHome/win32/bin/release/$dllName")
sharedLibraryLinkFile = file("$opensslHome/win32/bin/release/$linkName") sharedLibraryLinkFile = file("$openSSLWinHome/win32/bin/release/$linkName")
} else if (targetPlatform.name == 'win64') { } else if (targetPlatform.name == 'win64') {
dllName = 'libssl.dll' dllName = 'libssl.dll'
linkName = 'libssl.lib' linkName = 'libssl.lib'
sharedLibraryFile = file("$opensslHome/win64/bin/release/$dllName") sharedLibraryFile = file("$openSSLWinHome/win64/bin/release/$dllName")
sharedLibraryLinkFile = file("$opensslHome/win64/bin/release/$linkName") sharedLibraryLinkFile = file("$openSSLWinHome/win64/bin/release/$linkName")
} else if (targetPlatform.operatingSystem.macOsX) { } else if (targetPlatform.operatingSystem.macOsX) {
dllName = 'libssl.dylib' dllName = 'libssl.dylib'
linkName = 'libssl.dylib' linkName = 'libssl.dylib'
sharedLibraryFile = file("$opensslBrewHome/lib/$dllName") sharedLibraryFile = file("$openSSLBrewHome/lib/$dllName")
sharedLibraryLinkFile = file("$opensslBrewHome/lib/$linkName") sharedLibraryLinkFile = file("$openSSLBrewHome/lib/$linkName")
} else if (targetPlatform.operatingSystem.linux) { } else if (targetPlatform.operatingSystem.linux) {
headers.srcDir "$openSSLLinuxInc/include"
dllName = 'libssl.so' dllName = 'libssl.so'
linkName = 'libssl.so' linkName = 'libssl.a'
sharedLibraryFile = file("$opensslLinuxHome/$dllName") sharedLibraryFile = file("$openSSLLinuxLib/$dllName")
sharedLibraryLinkFile = file("$opensslLinuxHome/$linkName") sharedLibraryLinkFile = file("$openSSLLinuxLib/$linkName")
} }
} else { } else {
throw new GradleException("Unknown buildType" + buildType) throw new GradleException("Unknown buildType" + buildType)
@@ -459,8 +466,8 @@ subprojects {
} }
components { components {
withType(NativeComponentSpec) { withType(NativeComponentSpec) {
targetPlatform "win32" // targetPlatform "win32"
targetPlatform "win64" // targetPlatform "win64"
targetPlatform "linux32" targetPlatform "linux32"
targetPlatform "linux64" targetPlatform "linux64"
targetPlatform "macos" targetPlatform "macos"
@@ -724,34 +731,61 @@ subprojects {
environment "Path", "$PATH" environment "Path", "$PATH"
String CPPUNIT_IGNORE; String CPPUNIT_IGNORE = "";
if (name.contains('Win32') || name.contains('Win64')) {
CPPUNIT_IGNORE =' class CppUnit::TestCaller<class NTPClientTest>.testTimeSync'; CPPUNIT_IGNORE =' class CppUnit::TestCaller<class NTPClientTest>.testTimeSync';
CPPUNIT_IGNORE+=', class CppUnit::TestCaller<class RawSocketTest>.testEchoIPv4'; CPPUNIT_IGNORE+=' class CppUnit::TestCaller<class RawSocketTest>.testEchoIPv4';
CPPUNIT_IGNORE+=', class CppUnit::TestCaller<class RawSocketTest>.testSendToReceiveFromIPv4'; CPPUNIT_IGNORE+=' class CppUnit::TestCaller<class RawSocketTest>.testSendToReceiveFromIPv4';
CPPUNIT_IGNORE+=', class CppUnit::TestCaller<class ICMPClientTest>.testPing'; CPPUNIT_IGNORE+=' class CppUnit::TestCaller<class ICMPClientTest>.testPing';
CPPUNIT_IGNORE+=', class CppUnit::TestCaller<class ICMPClientTest>.testBigPing'; CPPUNIT_IGNORE+=' class CppUnit::TestCaller<class ICMPClientTest>.testBigPing';
CPPUNIT_IGNORE+=', class CppUnit::TestCaller<class HTTPSClientSessionTest>.testProxy'; CPPUNIT_IGNORE+=' class CppUnit::TestCaller<class HTTPSClientSessionTest>.testProxy';
CPPUNIT_IGNORE+=', class CppUnit::TestCaller<class HTTPSStreamFactoryTest>.testProxy'; CPPUNIT_IGNORE+=' class CppUnit::TestCaller<class HTTPSStreamFactoryTest>.testProxy';
CPPUNIT_IGNORE+=', class CppUnit::TestCaller<class TCPServerTest>.testReuseSocket'; CPPUNIT_IGNORE+=' class CppUnit::TestCaller<class TCPServerTest>.testReuseSocket';
//FIXME Those tests below should work //FIXME Those tests below should work
CPPUNIT_IGNORE+=', class CppUnit::TestCaller<class ProcessTest>.testLaunch'; CPPUNIT_IGNORE+=' class CppUnit::TestCaller<class ProcessTest>.testLaunch';
CPPUNIT_IGNORE+=', class CppUnit::TestCaller<class ProcessTest>.testLaunchRedirectIn'; CPPUNIT_IGNORE+=' class CppUnit::TestCaller<class ProcessTest>.testLaunchRedirectIn';
CPPUNIT_IGNORE+=', class CppUnit::TestCaller<class ProcessTest>.testLaunchRedirectOut'; CPPUNIT_IGNORE+=' class CppUnit::TestCaller<class ProcessTest>.testLaunchRedirectOut';
CPPUNIT_IGNORE+=', class CppUnit::TestCaller<class ProcessTest>.testLaunchEnv'; CPPUNIT_IGNORE+=' class CppUnit::TestCaller<class ProcessTest>.testLaunchEnv';
CPPUNIT_IGNORE+=', class CppUnit::TestCaller<class ProcessTest>.testLaunchArgs'; CPPUNIT_IGNORE+=' class CppUnit::TestCaller<class ProcessTest>.testLaunchArgs';
CPPUNIT_IGNORE+=', class CppUnit::TestCaller<class ProcessTest>.testIsRunning'; CPPUNIT_IGNORE+=' class CppUnit::TestCaller<class ProcessTest>.testIsRunning';
CPPUNIT_IGNORE+=', class CppUnit::TestCaller<class ProcessTest>.testIsRunningAllowsForTermination'; CPPUNIT_IGNORE+=' class CppUnit::TestCaller<class ProcessTest>.testIsRunningAllowsForTermination';
//FIXME won't work until SharedLibraries be properly generated //FIXME won't work until SharedLibraries be properly generated
CPPUNIT_IGNORE+=', class CppUnit::TestCaller<class SharedLibraryTest>.testSharedLibrary1'; CPPUNIT_IGNORE+=' class CppUnit::TestCaller<class SharedLibraryTest>.testSharedLibrary1';
CPPUNIT_IGNORE+=', class CppUnit::TestCaller<class SharedLibraryTest>.testSharedLibrary2'; CPPUNIT_IGNORE+=' class CppUnit::TestCaller<class SharedLibraryTest>.testSharedLibrary2';
CPPUNIT_IGNORE+=', class CppUnit::TestCaller<class SharedLibraryTest>.testSharedLibrary3'; CPPUNIT_IGNORE+=' class CppUnit::TestCaller<class SharedLibraryTest>.testSharedLibrary3';
CPPUNIT_IGNORE+=', class CppUnit::TestCaller<class ClassLoaderTest>.testClassLoader2'; CPPUNIT_IGNORE+=' class CppUnit::TestCaller<class ClassLoaderTest>.testClassLoader2';
CPPUNIT_IGNORE+=', class CppUnit::TestCaller<class ClassLoaderTest>.testClassLoader3'; CPPUNIT_IGNORE+=' class CppUnit::TestCaller<class ClassLoaderTest>.testClassLoader3';
}
if (name.contains('Linux32') || name.contains('Linux64')) {
CPPUNIT_IGNORE+=' N7CppUnit10TestCallerI8PathTestEE.testExpand';
CPPUNIT_IGNORE+=' N7CppUnit10TestCallerI13RawSocketTestEE.testEchoIPv4';
CPPUNIT_IGNORE+=' N7CppUnit10TestCallerI13RawSocketTestEE.testSendToReceiveFromIPv4';
CPPUNIT_IGNORE+=' N7CppUnit10TestCallerI14ICMPClientTestEE.testPing';
CPPUNIT_IGNORE+=' N7CppUnit10TestCallerI14ICMPClientTestEE.testBigPing';
CPPUNIT_IGNORE+=' N7CppUnit10TestCallerI22HTTPSClientSessionTestEE.testProxy';
CPPUNIT_IGNORE+=' N7CppUnit10TestCallerI22HTTPSStreamFactoryTestEE.testProxy';
CPPUNIT_IGNORE+=' N7CppUnit10TestCallerI19MulticastSocketTestEE.testMulticast';
CPPUNIT_IGNORE+=' N7CppUnit10TestCallerI13NTPClientTestEE.testTimeSync';
CPPUNIT_IGNORE+=' N7CppUnit10TestCallerI9TimerTestEE.testTimer';
//FIXME won't work until SharedLibraries be properly generated
CPPUNIT_IGNORE+=' N7CppUnit10TestCallerI17SharedLibraryTestEE.testSharedLibrary1';
CPPUNIT_IGNORE+=' N7CppUnit10TestCallerI17SharedLibraryTestEE.testSharedLibrary2';
CPPUNIT_IGNORE+=' N7CppUnit10TestCallerI17SharedLibraryTestEE.testSharedLibrary3';
CPPUNIT_IGNORE+=' N7CppUnit10TestCallerI15ClassLoaderTestEE.testClassLoader2';
CPPUNIT_IGNORE+=' N7CppUnit10TestCallerI15ClassLoaderTestEE.testClassLoader3';
//FIXME Those tests below should work
CPPUNIT_IGNORE+=' N7CppUnit10TestCallerI11ProcessTestEE.testLaunch';
CPPUNIT_IGNORE+=' N7CppUnit10TestCallerI11ProcessTestEE.testLaunchRedirectIn';
CPPUNIT_IGNORE+=' N7CppUnit10TestCallerI11ProcessTestEE.testLaunchRedirectOut';
CPPUNIT_IGNORE+=' N7CppUnit10TestCallerI11ProcessTestEE.testLaunchEnv';
}
CPPUNIT_IGNORE+=' ';
environment "CPPUNIT_IGNORE", "\"$CPPUNIT_IGNORE\"" environment "CPPUNIT_IGNORE", "\"$CPPUNIT_IGNORE\""
environment "POCO_BASE", "$rootDir" environment "POCO_BASE", "$rootDir"
args test args test

4
gradle.properties
View File

@@ -44,3 +44,7 @@ test=-print
LD_LIBRARY_PATH= LD_LIBRARY_PATH=
cpus= cpus=
openSSLWindowsHome = new File(rootDir, "openssl/build")
openSSLBrewHome = new File('/usr/local/opt/openssl')
openSSLLinuxLib = new File('/usr/local/lib')
openSSLLinuxInc = new File('/usr/local/include/openssl')

34
settings.gradle
View File

@@ -8,17 +8,15 @@ include ':XML'
include ':JSON' include ':JSON'
include ':Util' include ':Util'
include ':Net' include ':Net'
include ':Crypto' //include ':Crypto'
include ':NetSSL_OpenSSL' //include ':NetSSL_OpenSSL'
if (os.windows) { if (os.windows) {
include ':NetSSL_Win' include ':NetSSL_Win'
} }
include ':Data' //include ':Data'
if (os.windows) { //include ':Data:ODBC'
include ':Data:ODBC' //include ':Data:SQLite'
include ':Data:SQLite'
include ':Data:MySQL' include ':Data:MySQL'
}
include ':Zip' include ':Zip'
include ':PageCompiler' include ':PageCompiler'
include ':PageCompiler:File2Page' include ':PageCompiler:File2Page'
@@ -35,28 +33,24 @@ include ':XML:testsuite'
include ':JSON:testsuite' include ':JSON:testsuite'
include ':Util:testsuite' include ':Util:testsuite'
include ':Net:testsuite' include ':Net:testsuite'
include ':Crypto:testsuite' //include ':Crypto:testsuite'
include ':NetSSL_OpenSSL:testsuite' //include ':NetSSL_OpenSSL:testsuite'
if (os.windows) { if (os.windows) {
include ':NetSSL_Win:testsuite' include ':NetSSL_Win:testsuite'
} }
include ':Data:testsuite' //include ':Data:testsuite'
if (os.windows) { //include ':Data:ODBC:testsuite'
include ':Data:ODBC:testsuite' //include ':Data:SQLite:testsuite'
include ':Data:SQLite:testsuite' //include ':Data:MySQL:testsuite'
include ':Data:MySQL:testsuite' include ':MongoDB:testsuite'
}
//include ':MongoDB:testsuite'
include ':Redis:testsuite' include ':Redis:testsuite'
include ':CppParser:testsuite' include ':CppParser:testsuite'
include ':Zip:testsuite' include ':Zip:testsuite'
include ':Encodings:samples' include ':Encodings:samples'
include ':Foundation:samples' include ':Foundation:samples'
if (os.windows) { //include ':Data:samples'
include ':Data:samples' //include ':NetSSL_OpenSSL:samples'
}
include ':NetSSL_OpenSSL:samples'
if (os.windows) { if (os.windows) {
include ':NetSSL_Win:samples' include ':NetSSL_Win:samples'
} }