diff --git a/build.gradle b/build.gradle index f50aa79e8..50bbf9d5b 100644 --- a/build.gradle +++ b/build.gradle @@ -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 { - headers.srcDir "$opensslHome/include" - binaries.withType(StaticLibraryBinary) { def libName = "foobar" if (buildType == buildTypes.debug) { if (targetPlatform.name == 'win32') { + headers.srcDir "$openSSLWinHome/include" libName = 'libcryptod.lib' - staticLibraryFile = file("$opensslHome/win32/lib/debug/$libName") + staticLibraryFile = file("$openSSLWinHome/win32/lib/debug/$libName") } else if (targetPlatform.name == 'win64') { + headers.srcDir "$openSSLWinHome/include" libName = 'libcryptod.lib' - staticLibraryFile = file("$opensslHome/win64/lib/debug/$libName") + staticLibraryFile = file("$openSSLWinHome/win64/lib/debug/$libName") } else if (targetPlatform.operatingSystem.macOsX) { + headers.srcDir "$openSSLBrewHome/include" libName = 'libcryptod.a' - staticLibraryFile = file("$opensslBrewHome/lib/$libName") + staticLibraryFile = file("$openSSLBrewHome/lib/$libName") } else if (targetPlatform.operatingSystem.linux) { - libName = 'libcryptod.a' - staticLibraryFile = file("$opensslLinuxHome/$libName") + headers.srcDir "$openSSLLinuxInc/include" + libName = 'libcrypto.a' + staticLibraryFile = file("$openSSLLinuxLib/$libName") } } else if (buildType == buildTypes.release) { if (targetPlatform.name == 'win32') { libName = 'libcrypto.lib' - staticLibraryFile = file("$opensslHome/win32/lib/release/$libName") + staticLibraryFile = file("$openSSLWinHome/win32/lib/release/$libName") } else if (targetPlatform.name == 'win64') { libName = 'libcrypto.lib' - staticLibraryFile = file("$opensslHome/win64/lib/release/$libName") + staticLibraryFile = file("$openSSLWinHome/win64/lib/release/$libName") } else if (targetPlatform.operatingSystem.macOsX) { libName = 'libcrypto.a' - staticLibraryFile = file("$opensslBrewHome/lib/$libName") + staticLibraryFile = file("$openSSLBrewHome/lib/$libName") } else if (targetPlatform.operatingSystem.linux) { + headers.srcDir "$openSSLLinuxInc/include" libName = 'libcrypto.a' - staticLibraryFile = file("$opensslLinuxHome/$libName") + staticLibraryFile = file("$openSSLLinuxLib/$libName") } } else { throw new GradleException("Unknown buildType" + buildType) @@ -319,46 +319,48 @@ subprojects { if (targetPlatform.name == 'win32') { dllName = 'libcryptod.dll' linkName = 'libcryptod.lib' - sharedLibraryFile = file("$opensslHome/win32/bin/debug/$dllName") - sharedLibraryLinkFile = file("$opensslHome/win32/bin/debug/$linkName") + sharedLibraryFile = file("$openSSLWinHome/win32/bin/debug/$dllName") + sharedLibraryLinkFile = file("$openSSLWinHome/win32/bin/debug/$linkName") } else if (targetPlatform.name == 'win64') { dllName = 'libcryptod.dll' linkName = 'libcryptod.lib' - sharedLibraryFile = file("$opensslHome/win64/bin/debug/$dllName") - sharedLibraryLinkFile = file("$opensslHome/win64/bin/debug/$linkName") + sharedLibraryFile = file("$openSSLWinHome/win64/bin/debug/$dllName") + sharedLibraryLinkFile = file("$openSSLWinHome/win64/bin/debug/$linkName") } else if (targetPlatform.operatingSystem.macOsX) { dllName = 'libcryptod.dylib' linkName = 'libcryptod.dylib' - sharedLibraryFile = file("$opensslBrewHome/lib/$dllName") - sharedLibraryLinkFile = file("$opensslBrewHome/lib/$linkName") + sharedLibraryFile = file("$openSSLBrewHome/lib/$dllName") + sharedLibraryLinkFile = file("$openSSLBrewHome/lib/$linkName") } else if (targetPlatform.operatingSystem.linux) { - dllName = 'libcryptod.so' - linkName = 'libcryptod.so' - sharedLibraryFile = file("$opensslLinuxHome/$dllName") - sharedLibraryLinkFile = file("$opensslLinuxHome/$linkName") + headers.srcDir "$openSSLLinuxInc/include" + dllName = 'libcrypto.so' + linkName = 'libcrypto.a' + sharedLibraryFile = file("$openSSLLinuxLib/$dllName") + sharedLibraryLinkFile = file("$openSSLLinuxLib/$linkName") } } else if (buildType == buildTypes.release) { if (targetPlatform.name == 'win32') { dllName = 'libcrypto.dll' linkName = 'libcrypto.lib' - sharedLibraryFile = file("$opensslHome/win32/bin/release/$dllName") - sharedLibraryLinkFile = file("$opensslHome/win32/bin/release/$linkName") + sharedLibraryFile = file("$openSSLWinHome/win32/bin/release/$dllName") + sharedLibraryLinkFile = file("$openSSLWinHome/win32/bin/release/$linkName") } else if (targetPlatform.name == 'win64') { dllName = 'libcrypto.dll' linkName = 'libcrypto.lib' - sharedLibraryFile = file("$opensslHome/win64/bin/release/$dllName") - sharedLibraryLinkFile = file("$opensslHome/win64/bin/release/$linkName") + sharedLibraryFile = file("$openSSLWinHome/win64/bin/release/$dllName") + sharedLibraryLinkFile = file("$openSSLWinHome/win64/bin/release/$linkName") } else if (targetPlatform.operatingSystem.macOsX) { dllName = 'libcrypto.dylib' linkName = 'libcrypto.dylib' - sharedLibraryFile = file("$opensslBrewHome/lib/$dllName") - sharedLibraryLinkFile = file("$opensslBrewHome/lib/$linkName") + sharedLibraryFile = file("$openSSLBrewHome/lib/$dllName") + sharedLibraryLinkFile = file("$openSSLBrewHome/lib/$linkName") } else if (targetPlatform.operatingSystem.linux) { + headers.srcDir "$openSSLLinuxInc/include" dllName = 'libcrypto.so' - linkName = 'libcrypto.so' - sharedLibraryFile = file("$opensslLinuxHome/$dllName") - sharedLibraryLinkFile = file("$opensslLinuxHome/$linkName") + linkName = 'libcrypto.a' + sharedLibraryFile = file("$openSSLLinuxLib/$dllName") + sharedLibraryLinkFile = file("$openSSLLinuxLib/$linkName") } } else { throw new GradleException("Unknown buildType" + buildType) @@ -366,38 +368,41 @@ subprojects { } } ssl { - headers.srcDir "$opensslHome/include" binaries.withType(StaticLibraryBinary) { def libName if (buildType == buildTypes.debug) { if (targetPlatform.name == 'win32') { + headers.srcDir "$openSSLWinHome/include" libName = 'libssld.lib' - staticLibraryFile = file("$opensslHome/win32/lib/debug/$libName") + staticLibraryFile = file("$openSSLWinHome/win32/lib/debug/$libName") } else if (targetPlatform.name == 'win64') { + headers.srcDir "$openSSLWinHome/include" libName = 'libssld.lib' - staticLibraryFile = file("$opensslHome/win64/lib/debug/$libName") + staticLibraryFile = file("$openSSLWinHome/win64/lib/debug/$libName") } else if (targetPlatform.operatingSystem.macOsX) { libName = 'libssld.a' - staticLibraryFile = file("$opensslBrewHome/lib/$libName") + staticLibraryFile = file("$openSSLBrewHome/lib/$libName") } else if (targetPlatform.operatingSystem.linux) { - libName = 'libssld.a' - staticLibraryFile = file("$opensslLinuxHome/$libName") + headers.srcDir "$openSSLLinuxInc/include" + libName = 'libssl.a' + staticLibraryFile = file("$openSSLLinuxLib/$libName") } } else if (buildType == buildTypes.release) { if (targetPlatform.name == 'win32') { libName = 'libssl.lib' - staticLibraryFile = file("$opensslHome/win32/lib/release/$libName") + staticLibraryFile = file("$openSSLWinHome/win32/lib/release/$libName") } else if (targetPlatform.name == 'win64') { libName = 'libssl.lib' - staticLibraryFile = file("$opensslHome/win64/lib/release/$libName") + staticLibraryFile = file("$openSSLWinHome/win64/lib/release/$libName") } else if (targetPlatform.operatingSystem.macOsX) { libName = 'libssl.a' - staticLibraryFile = file("$opensslBrewHome/lib/$libName") + staticLibraryFile = file("$openSSLBrewHome/lib/$libName") } else if (targetPlatform.operatingSystem.linux) { + headers.srcDir "$openSSLLinuxInc/include" libName = 'libssl.a' - staticLibraryFile = file("$opensslLinuxHome/$libName") + staticLibraryFile = file("$openSSLLinuxLib/$libName") } } else { throw new GradleException("Unknown buildType" + buildType) @@ -410,45 +415,47 @@ subprojects { if (targetPlatform.name == 'win32') { dllName = 'libssld.dll' linkName = 'libssld.lib' - sharedLibraryFile = file("$opensslHome/win32/bin/debug/$dllName") - sharedLibraryLinkFile = file("$opensslHome/win32/bin/debug/$linkName") + sharedLibraryFile = file("$openSSLWinHome/win32/bin/debug/$dllName") + sharedLibraryLinkFile = file("$openSSLWinHome/win32/bin/debug/$linkName") } else if (targetPlatform.name == 'win64') { dllName = 'libssld.dll' linkName = 'libssld.lib' - sharedLibraryFile = file("$opensslHome/win64/bin/debug/$dllName") - sharedLibraryLinkFile = file("$opensslHome/win64/bin/debug/$linkName") + sharedLibraryFile = file("$openSSLWinHome/win64/bin/debug/$dllName") + sharedLibraryLinkFile = file("$openSSLWinHome/win64/bin/debug/$linkName") } else if (targetPlatform.operatingSystem.macOsX) { dllName = 'libssld.dylib' linkName = 'libssld.dylib' - sharedLibraryFile = file("$opensslBrewHome/lib/$dllName") - sharedLibraryLinkFile = file("$opensslBrewHome/lib/$linkName") + sharedLibraryFile = file("$openSSLBrewHome/lib/$dllName") + sharedLibraryLinkFile = file("$openSSLBrewHome/lib/$linkName") } else if (targetPlatform.operatingSystem.linux) { - dllName = 'libssld.so' - linkName = 'libssld.so' - sharedLibraryFile = file("$opensslLinuxHome/$dllName") - sharedLibraryLinkFile = file("$opensslLinuxHome/$linkName") + headers.srcDir "$openSSLLinuxInc/include" + dllName = 'libssl.so' + linkName = 'libssl.a' + sharedLibraryFile = file("$openSSLLinuxLib/$dllName") + sharedLibraryLinkFile = file("$openSSLLinuxLib/$linkName") } } else if (buildType == buildTypes.release) { if (targetPlatform.name == 'win32') { dllName = 'libssl.dll' linkName = 'libssl.lib' - sharedLibraryFile = file("$opensslHome/win32/bin/release/$dllName") - sharedLibraryLinkFile = file("$opensslHome/win32/bin/release/$linkName") + sharedLibraryFile = file("$openSSLWinHome/win32/bin/release/$dllName") + sharedLibraryLinkFile = file("$openSSLWinHome/win32/bin/release/$linkName") } else if (targetPlatform.name == 'win64') { dllName = 'libssl.dll' linkName = 'libssl.lib' - sharedLibraryFile = file("$opensslHome/win64/bin/release/$dllName") - sharedLibraryLinkFile = file("$opensslHome/win64/bin/release/$linkName") + sharedLibraryFile = file("$openSSLWinHome/win64/bin/release/$dllName") + sharedLibraryLinkFile = file("$openSSLWinHome/win64/bin/release/$linkName") } else if (targetPlatform.operatingSystem.macOsX) { dllName = 'libssl.dylib' linkName = 'libssl.dylib' - sharedLibraryFile = file("$opensslBrewHome/lib/$dllName") - sharedLibraryLinkFile = file("$opensslBrewHome/lib/$linkName") + sharedLibraryFile = file("$openSSLBrewHome/lib/$dllName") + sharedLibraryLinkFile = file("$openSSLBrewHome/lib/$linkName") } else if (targetPlatform.operatingSystem.linux) { + headers.srcDir "$openSSLLinuxInc/include" dllName = 'libssl.so' - linkName = 'libssl.so' - sharedLibraryFile = file("$opensslLinuxHome/$dllName") - sharedLibraryLinkFile = file("$opensslLinuxHome/$linkName") + linkName = 'libssl.a' + sharedLibraryFile = file("$openSSLLinuxLib/$dllName") + sharedLibraryLinkFile = file("$openSSLLinuxLib/$linkName") } } else { throw new GradleException("Unknown buildType" + buildType) @@ -459,8 +466,8 @@ subprojects { } components { withType(NativeComponentSpec) { - targetPlatform "win32" - targetPlatform "win64" + // targetPlatform "win32" + // targetPlatform "win64" targetPlatform "linux32" targetPlatform "linux64" targetPlatform "macos" @@ -724,34 +731,61 @@ subprojects { environment "Path", "$PATH" - String CPPUNIT_IGNORE; - CPPUNIT_IGNORE = 'class CppUnit::TestCaller.testTimeSync'; - CPPUNIT_IGNORE+=', class CppUnit::TestCaller.testEchoIPv4'; - CPPUNIT_IGNORE+=', class CppUnit::TestCaller.testSendToReceiveFromIPv4'; - CPPUNIT_IGNORE+=', class CppUnit::TestCaller.testPing'; - CPPUNIT_IGNORE+=', class CppUnit::TestCaller.testBigPing'; - CPPUNIT_IGNORE+=', class CppUnit::TestCaller.testProxy'; - CPPUNIT_IGNORE+=', class CppUnit::TestCaller.testProxy'; - CPPUNIT_IGNORE+=', class CppUnit::TestCaller.testReuseSocket'; + String CPPUNIT_IGNORE = ""; + if (name.contains('Win32') || name.contains('Win64')) { + CPPUNIT_IGNORE =' class CppUnit::TestCaller.testTimeSync'; + CPPUNIT_IGNORE+=' class CppUnit::TestCaller.testEchoIPv4'; + CPPUNIT_IGNORE+=' class CppUnit::TestCaller.testSendToReceiveFromIPv4'; + CPPUNIT_IGNORE+=' class CppUnit::TestCaller.testPing'; + CPPUNIT_IGNORE+=' class CppUnit::TestCaller.testBigPing'; + CPPUNIT_IGNORE+=' class CppUnit::TestCaller.testProxy'; + CPPUNIT_IGNORE+=' class CppUnit::TestCaller.testProxy'; + CPPUNIT_IGNORE+=' class CppUnit::TestCaller.testReuseSocket'; - //FIXME Those tests below should work - CPPUNIT_IGNORE+=', class CppUnit::TestCaller.testLaunch'; - CPPUNIT_IGNORE+=', class CppUnit::TestCaller.testLaunchRedirectIn'; - CPPUNIT_IGNORE+=', class CppUnit::TestCaller.testLaunchRedirectOut'; - CPPUNIT_IGNORE+=', class CppUnit::TestCaller.testLaunchEnv'; - CPPUNIT_IGNORE+=', class CppUnit::TestCaller.testLaunchArgs'; - CPPUNIT_IGNORE+=', class CppUnit::TestCaller.testIsRunning'; - CPPUNIT_IGNORE+=', class CppUnit::TestCaller.testIsRunningAllowsForTermination'; + //FIXME Those tests below should work + CPPUNIT_IGNORE+=' class CppUnit::TestCaller.testLaunch'; + CPPUNIT_IGNORE+=' class CppUnit::TestCaller.testLaunchRedirectIn'; + CPPUNIT_IGNORE+=' class CppUnit::TestCaller.testLaunchRedirectOut'; + CPPUNIT_IGNORE+=' class CppUnit::TestCaller.testLaunchEnv'; + CPPUNIT_IGNORE+=' class CppUnit::TestCaller.testLaunchArgs'; + CPPUNIT_IGNORE+=' class CppUnit::TestCaller.testIsRunning'; + CPPUNIT_IGNORE+=' class CppUnit::TestCaller.testIsRunningAllowsForTermination'; + + //FIXME won't work until SharedLibraries be properly generated + CPPUNIT_IGNORE+=' class CppUnit::TestCaller.testSharedLibrary1'; + CPPUNIT_IGNORE+=' class CppUnit::TestCaller.testSharedLibrary2'; + CPPUNIT_IGNORE+=' class CppUnit::TestCaller.testSharedLibrary3'; + CPPUNIT_IGNORE+=' class CppUnit::TestCaller.testClassLoader2'; + CPPUNIT_IGNORE+=' class CppUnit::TestCaller.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+=', class CppUnit::TestCaller.testSharedLibrary1'; - CPPUNIT_IGNORE+=', class CppUnit::TestCaller.testSharedLibrary2'; - CPPUNIT_IGNORE+=', class CppUnit::TestCaller.testSharedLibrary3'; - CPPUNIT_IGNORE+=', class CppUnit::TestCaller.testClassLoader2'; - CPPUNIT_IGNORE+=', class CppUnit::TestCaller.testClassLoader3'; - - environment "CPPUNIT_IGNORE", "\"$CPPUNIT_IGNORE\"" + //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 "POCO_BASE", "$rootDir" args test diff --git a/gradle.properties b/gradle.properties index ae4adbdda..0bee6ef20 100644 --- a/gradle.properties +++ b/gradle.properties @@ -44,3 +44,7 @@ test=-print LD_LIBRARY_PATH= 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') diff --git a/settings.gradle b/settings.gradle index 6877f711d..db81fb500 100644 --- a/settings.gradle +++ b/settings.gradle @@ -8,17 +8,15 @@ include ':XML' include ':JSON' include ':Util' include ':Net' -include ':Crypto' -include ':NetSSL_OpenSSL' +//include ':Crypto' +//include ':NetSSL_OpenSSL' if (os.windows) { include ':NetSSL_Win' } -include ':Data' -if (os.windows) { - include ':Data:ODBC' - include ':Data:SQLite' - include ':Data:MySQL' -} +//include ':Data' +//include ':Data:ODBC' +//include ':Data:SQLite' +include ':Data:MySQL' include ':Zip' include ':PageCompiler' include ':PageCompiler:File2Page' @@ -35,28 +33,24 @@ include ':XML:testsuite' include ':JSON:testsuite' include ':Util:testsuite' include ':Net:testsuite' -include ':Crypto:testsuite' -include ':NetSSL_OpenSSL:testsuite' +//include ':Crypto:testsuite' +//include ':NetSSL_OpenSSL:testsuite' if (os.windows) { include ':NetSSL_Win:testsuite' } -include ':Data:testsuite' -if (os.windows) { - include ':Data:ODBC:testsuite' - include ':Data:SQLite:testsuite' - include ':Data:MySQL:testsuite' -} -//include ':MongoDB:testsuite' +//include ':Data:testsuite' +//include ':Data:ODBC:testsuite' +//include ':Data:SQLite:testsuite' +//include ':Data:MySQL:testsuite' +include ':MongoDB:testsuite' include ':Redis:testsuite' include ':CppParser:testsuite' include ':Zip:testsuite' include ':Encodings:samples' include ':Foundation:samples' -if (os.windows) { - include ':Data:samples' -} -include ':NetSSL_OpenSSL:samples' +//include ':Data:samples' +//include ':NetSSL_OpenSSL:samples' if (os.windows) { include ':NetSSL_Win:samples' }