diff options
| -rw-r--r-- | coin/platform_configs/default.txt | 30 | ||||
| -rw-r--r-- | coin/platform_configs/qt5.txt | 44 | ||||
| -rwxr-xr-x | coin/provisioning/common/unix/install-openssl.sh | 6 | ||||
| -rw-r--r-- | coin/provisioning/qtci-windows-7-x86/09-openssl.ps1 | 67 |
4 files changed, 61 insertions, 86 deletions
diff --git a/coin/platform_configs/default.txt b/coin/platform_configs/default.txt index 6d578eda..6152eab0 100644 --- a/coin/platform_configs/default.txt +++ b/coin/platform_configs/default.txt @@ -2,27 +2,27 @@ Template Target OS Target arch Compiler ----------------------------------- ------------------- ----------- ----------- --------------- ------------------------------------ ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- qtci-windows-10-x86_64-14 MSVC2015 -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -developer-build -release -angle -qtnamespace TestNamespace -qtlibinfix TestInfix -nomake tests -openssl -I %OPENSSL_INCLUDE_x64% -L %OPENSSL_LIB_x64% -plugin-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x64% -L %MYSQL_LIB_x64% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x64% -L %POSTGRESQL_LIB_x64% qtci-windows-7-x86-3 Mingw73 -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -developer-build -release -opengl dynamic -nomake examples -nomake tests -openssl -I %OPENSSL_INCLUDE_x86% -L %OPENSSL_LIB_x86% -plugin-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x86% -L %MYSQL_LIB_x86% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x86% -L %POSTGRESQL_LIB_x86% -platform win32-g++ -qtci-windows-10-x86_64-14 x86 MSVC2017 Packaging -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -force-debug-info -opengl dynamic -nomake examples -nomake tests -openssl -I %OPENSSL_INCLUDE_x86% -L %OPENSSL_LIB_x86% -plugin-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x86% -L %MYSQL_LIB_x86% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x86% -L %POSTGRESQL_LIB_x86% -qtci-windows-10-x86_64-14 MSVC2015 Packaging -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -force-debug-info -opengl dynamic -nomake examples -nomake tests -openssl -I %OPENSSL_INCLUDE_x64% -L %OPENSSL_LIB_x64% -plugin-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x64% -L %MYSQL_LIB_x64% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x64% -L %POSTGRESQL_LIB_x64% -qtci-windows-10-x86_64-14 WinRT_10 x86 MSVC2015 Packaging DisableTests -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -force-debug-info -nomake examples -nomake tests -platform win32-msvc2015 -xplatform winrt-x86-msvc2015 -qtci-windows-10-x86_64-14 WinRT_10 armv7 MSVC2015 Packaging DisableTests -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -force-debug-info -nomake examples -nomake tests -platform win32-msvc2015 -xplatform winrt-arm-msvc2015 -qtci-windows-10-x86_64-14 MSVC2017 Packaging -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -force-debug-info -opengl dynamic -nomake examples -nomake tests -openssl -I %OPENSSL_INCLUDE_x64% -L %OPENSSL_LIB_x64% -plugin-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x64% -L %MYSQL_LIB_x64% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x64% -L %POSTGRESQL_LIB_x64% -qtci-linux-Ubuntu-18.04-x86_64 GCC -opensource -confirm-license -verbose -prefix /home/qt/work/install -no-widgets -force-debug-info -nomake examples -nomake tests -R . -openssl -I {{.Env.OPENSSL_HOME}} -qtci-linux-Ubuntu-18.04-x86_64 GCC OutOfSourceBuild Documentation -opensource -confirm-license -verbose -prefix /home/qt/work/install -developer-build -qtlibinfix TestInfix -qtnamespace TestNamespace -nomake tests -R . -openssl -I {{.Env.OPENSSL_HOME}} -qtci-linux-openSUSE-15.0-x86_64 GCC -opensource -confirm-license -verbose -prefix /home/qt/work/install -developer-build -no-pch -openssl -nomake examples -nomake tests -R . -I {{.Env.OPENSSL_HOME}} -qtci-linux-openSUSE-15.0-x86_64 ICC_18 DisableTests -opensource -confirm-license -verbose -prefix /home/qt/work/install -developer-build -no-pch -system-sqlite -nomake examples -nomake tests -R . -platform linux-icc-64 -openssl -I {{.Env.OPENSSL_HOME}} -qtci-linux-openSUSE-15.0-x86_64 WebAssembly GCC Packaging DisableTests -opensource -confirm-license -verbose -prefix /home/qt/work/install -developer-build -no-pch -nomake examples -nomake tests -xplatform wasm-emscripten -developer-build -release -static -no-feature-thread -no-dbus -no-headersclean -no-ssl -no-warnings-are-errors -qtci-linux-RHEL-7.6-x86_64 GCC Packaging -opensource -confirm-license -verbose -prefix /home/qt/work/install -release -no-use-gold-linker -force-debug-info -separate-debug-info -nomake examples -nomake tests -plugin-sql-mysql -plugin-sql-psql -plugin-sql-sqlite -qt-libjpeg -qt-libpng -qt-xcb -no-libudev -sysconfdir /etc/xdg -qt-pcre -qt-harfbuzz -R . -openssl -I {{.Env.OPENSSL_HOME}} -qtci-macos-10.13-x86_64-2 Clang Packaging -opensource -confirm-license -verbose -prefix /Users/qt/work/install -debug-and-release -release -nomake examples -nomake tests -plugin-sql-mysql -plugin-sql-psql -plugin-sql-sqlite -xplatform macx-clang -separate-debug-info -sdk macosx -device-option QMAKE_APPLE_DEVICE_ARCHS=x86_64 -sysconfdir /Library/Preferences/Qt -I/usr/local/opt/openssl/include +qtci-windows-10-x86_64-14 x86 MSVC2017 Packaging -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -force-debug-info -opengl dynamic -nomake examples -nomake tests -openssl -I %OPENSSL_INCLUDE_x86% -L %OPENSSL_LIB_x86% -no-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x86% -L %POSTGRESQL_LIB_x86% +qtci-windows-10-x86_64-14 MSVC2015 Packaging -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -force-debug-info -opengl dynamic -nomake examples -nomake tests -openssl -I %OPENSSL_INCLUDE_x64% -L %OPENSSL_LIB_x64% -no-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x64% -L %POSTGRESQL_LIB_x64% +qtci-windows-10-x86_64-14 WinRT_10 x86 MSVC2015 Packaging DisableTests -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -force-debug-info -nomake examples -nomake tests -no-sql-mysql -platform win32-msvc2015 -xplatform winrt-x86-msvc2015 +qtci-windows-10-x86_64-14 WinRT_10 armv7 MSVC2015 Packaging DisableTests -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -force-debug-info -nomake examples -nomake tests -no-sql-mysql -platform win32-msvc2015 -xplatform winrt-arm-msvc2015 +qtci-windows-10-x86_64-14 MSVC2017 Packaging -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -force-debug-info -opengl dynamic -nomake examples -nomake tests -openssl -I %OPENSSL_INCLUDE_x64% -L %OPENSSL_LIB_x64% -no-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x64% -L %POSTGRESQL_LIB_x64% +qtci-linux-Ubuntu-18.04-x86_64 GCC -opensource -confirm-license -verbose -prefix /home/qt/work/install -no-widgets -force-debug-info -nomake examples -nomake tests -R . -openssl -I {{.Env.OPENSSL_HOME}}/include -L {{.Env.OPENSSL_HOME}}/lib +qtci-linux-Ubuntu-18.04-x86_64 GCC OutOfSourceBuild Documentation -opensource -confirm-license -verbose -prefix /home/qt/work/install -developer-build -qtlibinfix TestInfix -qtnamespace TestNamespace -nomake tests -R . -openssl -I {{.Env.OPENSSL_HOME}}/include -L {{.Env.OPENSSL_HOME}}/lib +qtci-linux-openSUSE-15.0-x86_64 GCC -opensource -confirm-license -verbose -prefix /home/qt/work/install -developer-build -no-pch -openssl -nomake examples -nomake tests -R . -I {{.Env.OPENSSL_HOME}}/include -L {{.Env.OPENSSL_HOME}}/lib +qtci-linux-openSUSE-15.0-x86_64 ICC_18 DisableTests -opensource -confirm-license -verbose -prefix /home/qt/work/install -developer-build -no-pch -system-sqlite -nomake examples -nomake tests -R . -platform linux-icc-64 -openssl -I {{.Env.OPENSSL_HOME}}/include -L {{.Env.OPENSSL_HOME}}/lib +qtci-linux-openSUSE-15.0-x86_64 WebAssembly GCC Packaging DisableTests -opensource -confirm-license -verbose -prefix /home/qt/work/install -developer-build -no-pch -nomake examples -nomake tests -xplatform wasm-emscripten -developer-build -release -static -no-feature-thread -no-dbus -no-headersclean -no-ssl -no-warnings-are-errors -no-sql-mysql +qtci-linux-RHEL-7.6-x86_64 GCC Packaging -opensource -confirm-license -verbose -prefix /home/qt/work/install -release -no-use-gold-linker -force-debug-info -separate-debug-info -nomake examples -nomake tests -no-sql-mysql -plugin-sql-psql -plugin-sql-sqlite -qt-libjpeg -qt-libpng -qt-xcb -no-libudev -sysconfdir /etc/xdg -qt-pcre -qt-harfbuzz -R . -openssl -I {{.Env.OPENSSL_HOME}}/include -L {{.Env.OPENSSL_HOME}}/lib +qtci-macos-10.13-x86_64-2 Clang Packaging -opensource -confirm-license -verbose -prefix /Users/qt/work/install -debug-and-release -release -nomake examples -nomake tests -no-sql-mysql -plugin-sql-psql -plugin-sql-sqlite -xplatform macx-clang -separate-debug-info -sdk macosx -device-option QMAKE_APPLE_DEVICE_ARCHS=x86_64 -sysconfdir /Library/Preferences/Qt -I/usr/local/opt/openssl/include qtci-macos-10.12-x86_64-9 Clang -opensource -confirm-license -verbose -prefix /Users/qt/work/install -developer-build -no-framework -release -qtnamespace TestNamespace -no-pch -nomake examples -nomake tests -xplatform macx-clang -sdk macosx -device-option QMAKE_APPLE_DEVICE_ARCHS=x86_64 -I/usr/local/opt/openssl/include qtci-macos-10.13-x86_64-2 IOS_ANY multi Clang Packaging DisableTests -opensource -confirm-license -verbose -prefix /Users/qt/work/install -debug-and-release -static -no-icu -nomake examples -nomake tests -xplatform macx-ios-clang -no-sql-mysql -no-sql-psql -plugin-sql-sqlite qtci-macos-10.13-x86_64-2 TvOS_ANY multi Clang DisableTests -opensource -confirm-license -verbose -prefix /Users/qt/work/install -debug-and-release -nomake examples -nomake tests -xplatform macx-tvos-clang -no-sql-mysql -no-sql-psql -plugin-sql-sqlite qtci-macos-10.13-x86_64-2 WatchOS_ANY multi Clang DisableTests -opensource -confirm-license -verbose -prefix /Users/qt/work/install -debug-and-release -nomake examples -nomake tests -xplatform macx-watchos-clang -no-sql-mysql -no-sql-psql -plugin-sql-sqlite -qtci-linux-RHEL-7.6-x86_64 Android_ANY armv7 Clang Clang Packaging DisableTests -opensource -confirm-license -verbose -prefix /home/qt/work/install -release -opengl es2 -no-use-gold-linker -nomake examples -nomake tests -xplatform android-clang -android-sdk /opt/android/sdk -android-ndk /opt/android/android-ndk-r19c -no-dbus -sysconfdir /etc/xdg -openssl -I {{.Env.OPENSSL_ANDROID_HOME}}/include -android-ndk-host linux-x86_64 -no-qpa-platform-guard -android-arch armeabi-v7a -qtci-linux-RHEL-7.6-x86_64 Android_ANY arm64 Clang Clang Packaging DisableTests -opensource -confirm-license -verbose -prefix /home/qt/work/install -release -opengl es2 -no-use-gold-linker -nomake examples -nomake tests -xplatform android-clang -android-sdk /opt/android/sdk -android-ndk /opt/android/android-ndk-r19c -no-dbus -sysconfdir /etc/xdg -openssl -I {{.Env.OPENSSL_ANDROID_HOME}}/include -android-ndk-host linux-x86_64 -no-qpa-platform-guard -android-arch arm64-v8a +qtci-linux-RHEL-7.6-x86_64 Android_ANY armv7 Clang Clang Packaging DisableTests -opensource -confirm-license -verbose -prefix /home/qt/work/install -release -opengl es2 -no-use-gold-linker -nomake examples -nomake tests -xplatform android-clang -android-sdk /opt/android/sdk -android-ndk /opt/android/android-ndk-r19c -no-dbus -no-sql-mysql -sysconfdir /etc/xdg -openssl -I {{.Env.OPENSSL_ANDROID_HOME}}/include -android-ndk-host linux-x86_64 -no-qpa-platform-guard -android-arch armeabi-v7a +qtci-linux-RHEL-7.6-x86_64 Android_ANY arm64 Clang Clang Packaging DisableTests -opensource -confirm-license -verbose -prefix /home/qt/work/install -release -opengl es2 -no-use-gold-linker -nomake examples -nomake tests -xplatform android-clang -android-sdk /opt/android/sdk -android-ndk /opt/android/android-ndk-r19c -no-dbus -no-sql-mysql -sysconfdir /etc/xdg -openssl -I {{.Env.OPENSSL_ANDROID_HOME}}/include -android-ndk-host linux-x86_64 -no-qpa-platform-guard -android-arch arm64-v8a qtci-linux-Ubuntu-18.04-x86_64 QEMU armv7 GCC -opensource -confirm-license -verbose -prefix /home/qt/work/install -release -nomake examples -nomake tests -R . -openssl -device linux-imx7-g++ -device-option CROSS_COMPILE=/opt/yocto-armv7/sysroots/x86_64-pokysdk-linux/usr/bin/arm-poky-linux-gnueabi/arm-poky-linux-gnueabi- -device-option DISTRO_OPTS="hard-float boot2qt" -sysroot /opt/yocto-armv7/sysroots/armv7ahf-neon-poky-linux-gnueabi -extprefix /home/qt/work/install -mysql_config /opt/yocto-armv7/sysroots/armv7ahf-neon-poky-linux-gnueabi/usr/bin/mysql_config -psql_config /dev/null -tslib -no-xcb qtci-linux-Ubuntu-18.04-x86_64 QEMU arm64 GCC -opensource -confirm-license -verbose -prefix /home/qt/work/install -release -nomake examples -nomake tests -R . -openssl -device linux-generic-g++ -device-option CROSS_COMPILE=/opt/yocto-arm64/sysroots/x86_64-pokysdk-linux/usr/bin/aarch64-poky-linux/aarch64-poky-linux- -device-option DISTRO_OPTS=boot2qt -sysroot /opt/yocto-arm64/sysroots/aarch64-poky-linux -extprefix /home/qt/work/install -mysql_config /opt/yocto-arm64/sysroots/aarch64-poky-linux/usr/bin/mysql_config -psql_config /dev/null -tslib -no-xcb qtci-linux-Ubuntu-18.04-x86_64 QEMU mips64 GCC DisableTests -opensource -confirm-license -verbose -prefix /home/qt/work/install -release -nomake examples -nomake tests -R . -openssl -device linux-generic-g++ -device-option CROSS_COMPILE=/opt/yocto-mips64/sysroots/x86_64-pokysdk-linux/usr/bin/mips64-poky-linux/mips64-poky-linux- -device-option DISTRO_OPTS=boot2qt -sysroot /opt/yocto-mips64/sysroots/mips64-poky-linux -extprefix /home/qt/work/install -mysql_config /opt/yocto-mips64/sysroots/mips64-poky-linux/usr/bin/mysql_config -psql_config /dev/null -tslib -no-xcb qtci-linux-Ubuntu-18.04-x86_64 GCC TestOnly LicenseCheck qtci-linux-RHEL-7.6-x86_64 INTEGRITY_11_04 armv7 GCC DisableTests -opensource -confirm-license -verbose -prefix /home/qt/work/install -release -opengl es2 -no-use-gold-linker -nomake examples -xplatform integrity-armv7-imx6 -nomake tests -qtci-linux-RHEL-7.6-x86_64 QNX_700 armv7 GCC Packaging DisableTests -opensource -confirm-license -verbose -prefix /home/qt/work/install -release -opengl es2 -no-use-gold-linker -nomake examples -nomake tests -qpa qnx -xplatform qnx-armle-v7-qcc +qtci-linux-RHEL-7.6-x86_64 QNX_700 armv7 GCC Packaging DisableTests -opensource -confirm-license -verbose -prefix /home/qt/work/install -release -opengl es2 -no-use-gold-linker -nomake examples -nomake tests -no-sql-mysql -qpa qnx -xplatform qnx-armle-v7-qcc diff --git a/coin/platform_configs/qt5.txt b/coin/platform_configs/qt5.txt index 107be570..dfa6a2e3 100644 --- a/coin/platform_configs/qt5.txt +++ b/coin/platform_configs/qt5.txt @@ -1,24 +1,24 @@ Template Target OS Target arch Compiler Target Compiler Features Configure arguments ---------------------------- ------------------- ----------- ----------- --------------- -------------------------- -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- -qtci-windows-10-x86_64-14 WinRT_10 MSVC2015 Packaging DisableTests -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -force-debug-info -nomake examples -nomake tests -platform win32-msvc2015 -xplatform winrt-x64-msvc2015 -qtci-windows-10-x86_64-14 WinRT_10 x86 MSVC2017 Packaging DisableTests -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -force-debug-info -nomake examples -nomake tests -platform win32-msvc2017 -xplatform winrt-x86-msvc2017 -qtci-windows-7-x86-3 Mingw73 Packaging DisableTests -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -opengl dynamic -nomake examples -nomake tests -openssl -I %OPENSSL_INCLUDE_x86% -L %OPENSSL_LIB_x86% -plugin-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x86% -L %MYSQL_LIB_x86% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x86% -L %POSTGRESQL_LIB_x86% -platform win32-g++ -qtci-windows-10-x86_64-14 Mingw73 Packaging DisableTests -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -opengl dynamic -nomake examples -nomake tests -openssl -I %OPENSSL_INCLUDE_x64% -L %OPENSSL_LIB_x64% -plugin-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x64% -L %MYSQL_LIB_x64% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x64% -L %POSTGRESQL_LIB_x64% -platform win32-g++ -qtci-windows-10-x86_64-14 WinRT_10 armv7 MSVC2017 Packaging DisableTests -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -force-debug-info -nomake examples -nomake tests -platform win32-msvc2017 -xplatform winrt-arm-msvc2017 -qtci-windows-10-x86_64-14 WinRT_10 MSVC2017 Packaging DisableTests -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -force-debug-info -nomake examples -nomake tests -platform win32-msvc2017 -xplatform winrt-x64-msvc2017 -qtci-linux-RHEL-7.6-x86_64 Android_ANY x86 GCC Clang Packaging DisableTests -opensource -confirm-license -verbose -prefix /home/qt/work/install -release -opengl es2 -no-use-gold-linker -nomake examples -nomake tests -xplatform android-clang -android-sdk /opt/android/sdk -android-ndk /opt/android/android-ndk-r19c -no-dbus -sysconfdir /etc/xdg -openssl -I {{.Env.OPENSSL_ANDROID_HOME}}/include -android-ndk-host linux-x86_64 -no-qpa-platform-guard -android-arch x86 -qtci-linux-RHEL-7.6-x86_64 Android_ANY x86_64 GCC Clang Packaging DisableTests -opensource -confirm-license -verbose -prefix /home/qt/work/install -release -opengl es2 -no-use-gold-linker -nomake examples -nomake tests -xplatform android-clang -android-sdk /opt/android/sdk -android-ndk /opt/android/android-ndk-r19c -no-dbus -sysconfdir /etc/xdg -openssl -I {{.Env.OPENSSL_ANDROID_HOME}}/include -android-ndk-host linux-x86_64 -no-qpa-platform-guard -android-arch x86_64 -qtci-windows-10-x86_64-14 Android_ANY armv7 Mingw73 Clang Packaging DisableTests -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -opengl es2 -nomake examples -nomake tests -xplatform android-clang -android-sdk C:\Utils\Android -android-ndk c:\Utils\Android\android-ndk-r19c -no-dbus -sysconfdir /etc/xdg -openssl -I c:\utils\openssl-android-master\include -android-arch armeabi-v7a -qtci-windows-10-x86_64-14 Android_ANY x86 Mingw73 Clang Packaging DisableTests -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -opengl es2 -nomake examples -nomake tests -xplatform android-clang -android-sdk C:\Utils\Android -android-ndk c:\Utils\Android\android-ndk-r19c -no-dbus -sysconfdir /etc/xdg -openssl -I c:\utils\openssl-android-master\include -android-arch x86 -qtci-windows-10-x86_64-14 Android_ANY arm64 Mingw73 Clang Packaging DisableTests -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -opengl es2 -nomake examples -nomake tests -xplatform android-clang -android-sdk C:\Utils\Android -android-ndk c:\Utils\Android\android-ndk-r19c -no-dbus -sysconfdir /etc/xdg -openssl -I c:\utils\openssl-android-master\include -android-arch arm64-v8a -qtci-windows-10-x86_64-14 Android_ANY x86_64 Mingw73 Clang Packaging DisableTests -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -opengl es2 -nomake examples -nomake tests -xplatform android-clang -android-sdk C:\Utils\Android -android-ndk c:\Utils\Android\android-ndk-r19c -no-dbus -sysconfdir /etc/xdg -openssl -I c:\utils\openssl-android-master\include -android-arch x86_64 -qtci-macos-10.13-x86_64-2 Android_ANY armv7 Clang Clang Packaging DisableTests -opensource -confirm-license -verbose -prefix /Users/qt/work/install -release -opengl es2 -nomake examples -nomake tests -xplatform android-clang -android-sdk /opt/android/sdk -android-ndk /opt/android/android-ndk-r19c -no-dbus -sysconfdir /etc/xdg -openssl -I /usr/local/opt/openssl/include -android-ndk-host darwin-x86_64 -no-qpa-platform-guard -android-arch armeabi-v7a -qtci-macos-10.13-x86_64-2 Android_ANY arm64 Clang Clang Packaging DisableTests -opensource -confirm-license -verbose -prefix /Users/qt/work/install -release -opengl es2 -nomake examples -nomake tests -xplatform android-clang -android-sdk /opt/android/sdk -android-ndk /opt/android/android-ndk-r19c -no-dbus -sysconfdir /etc/xdg -openssl -I /usr/local/opt/openssl/include -android-ndk-host darwin-x86_64 -no-qpa-platform-guard -android-arch arm64-v8a -qtci-macos-10.13-x86_64-2 Android_ANY x86 Clang Clang Packaging DisableTests -opensource -confirm-license -verbose -prefix /Users/qt/work/install -release -opengl es2 -nomake examples -nomake tests -xplatform android-clang -android-sdk /opt/android/sdk -android-ndk /opt/android/android-ndk-r19c -no-dbus -sysconfdir /etc/xdg -openssl -I /usr/local/opt/openssl/include -android-ndk-host darwin-x86_64 -no-qpa-platform-guard -android-arch x86 -qtci-macos-10.13-x86_64-2 Android_ANY x86_64 Clang Clang Packaging DisableTests -opensource -confirm-license -verbose -prefix /Users/qt/work/install -release -opengl es2 -nomake examples -nomake tests -xplatform android-clang -android-sdk /opt/android/sdk -android-ndk /opt/android/android-ndk-r19c -no-dbus -sysconfdir /etc/xdg -openssl -I /usr/local/opt/openssl/include -android-ndk-host darwin-x86_64 -no-qpa-platform-guard -android-arch x86_64 +--------------------------- ------------------- ----------- ----------- --------------- -------------------------- ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ +qtci-windows-10-x86_64-14 WinRT_10 MSVC2015 Packaging DisableTests -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -force-debug-info -nomake examples -nomake tests -no-sql-mysql -platform win32-msvc2015 -xplatform winrt-x64-msvc2015 +qtci-windows-10-x86_64-14 WinRT_10 x86 MSVC2017 Packaging DisableTests -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -force-debug-info -nomake examples -nomake tests -no-sql-mysql -platform win32-msvc2017 -xplatform winrt-x86-msvc2017 +qtci-windows-7-x86-3 Mingw73 Packaging DisableTests -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -opengl dynamic -nomake examples -nomake tests -openssl -I %OPENSSL_INCLUDE_x86% -L %OPENSSL_LIB_x86% -no-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x86% -L %POSTGRESQL_LIB_x86% -platform win32-g++ +qtci-windows-10-x86_64-14 Mingw73 Packaging DisableTests -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -opengl dynamic -nomake examples -nomake tests -openssl -I %OPENSSL_INCLUDE_x64% -L %OPENSSL_LIB_x64% -no-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x64% -L %POSTGRESQL_LIB_x64% -platform win32-g++ +qtci-windows-10-x86_64-14 WinRT_10 armv7 MSVC2017 Packaging DisableTests -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -force-debug-info -nomake examples -nomake tests -no-sql-mysql -platform win32-msvc2017 -xplatform winrt-arm-msvc2017 +qtci-windows-10-x86_64-14 WinRT_10 MSVC2017 Packaging DisableTests -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -force-debug-info -nomake examples -nomake tests -no-sql-mysql -platform win32-msvc2017 -xplatform winrt-x64-msvc2017 +qtci-linux-RHEL-7.6-x86_64 Android_ANY x86 GCC Clang Packaging DisableTests -opensource -confirm-license -verbose -prefix /home/qt/work/install -release -opengl es2 -no-use-gold-linker -nomake examples -nomake tests -xplatform android-clang -android-sdk /opt/android/sdk -android-ndk /opt/android/android-ndk-r19c -no-dbus -no-sql-mysql -sysconfdir /etc/xdg -openssl -I {{.Env.OPENSSL_ANDROID_HOME}}/include -android-ndk-host linux-x86_64 -no-qpa-platform-guard -android-arch x86 +qtci-linux-RHEL-7.6-x86_64 Android_ANY x86_64 GCC Clang Packaging DisableTests -opensource -confirm-license -verbose -prefix /home/qt/work/install -release -opengl es2 -no-use-gold-linker -nomake examples -nomake tests -xplatform android-clang -android-sdk /opt/android/sdk -android-ndk /opt/android/android-ndk-r19c -no-dbus -no-sql-mysql -sysconfdir /etc/xdg -openssl -I {{.Env.OPENSSL_ANDROID_HOME}}/include -android-ndk-host linux-x86_64 -no-qpa-platform-guard -android-arch x86_64 +qtci-windows-10-x86_64-14 Android_ANY armv7 Mingw73 Clang Packaging DisableTests -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -opengl es2 -nomake examples -nomake tests -xplatform android-clang -android-sdk C:\Utils\Android -android-ndk c:\Utils\Android\android-ndk-r19c -no-dbus -no-sql-mysql -sysconfdir /etc/xdg -openssl -I c:\utils\openssl-android-master\include -android-arch armeabi-v7a +qtci-windows-10-x86_64-14 Android_ANY x86 Mingw73 Clang Packaging DisableTests -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -opengl es2 -nomake examples -nomake tests -xplatform android-clang -android-sdk C:\Utils\Android -android-ndk c:\Utils\Android\android-ndk-r19c -no-dbus -no-sql-mysql -sysconfdir /etc/xdg -openssl -I c:\utils\openssl-android-master\include -android-arch x86 +qtci-windows-10-x86_64-14 Android_ANY arm64 Mingw73 Clang Packaging DisableTests -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -opengl es2 -nomake examples -nomake tests -xplatform android-clang -android-sdk C:\Utils\Android -android-ndk c:\Utils\Android\android-ndk-r19c -no-dbus -no-sql-mysql -sysconfdir /etc/xdg -openssl -I c:\utils\openssl-android-master\include -android-arch arm64-v8a +qtci-windows-10-x86_64-14 Android_ANY x86_64 Mingw73 Clang Packaging DisableTests -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -opengl es2 -nomake examples -nomake tests -xplatform android-clang -android-sdk C:\Utils\Android -android-ndk c:\Utils\Android\android-ndk-r19c -no-dbus -no-sql-mysql -sysconfdir /etc/xdg -openssl -I c:\utils\openssl-android-master\include -android-arch x86_64 +qtci-macos-10.13-x86_64-2 Android_ANY armv7 Clang Clang Packaging DisableTests -opensource -confirm-license -verbose -prefix /Users/qt/work/install -release -opengl es2 -nomake examples -nomake tests -xplatform android-clang -android-sdk /opt/android/sdk -android-ndk /opt/android/android-ndk-r19c -no-dbus -no-sql-mysql -sysconfdir /etc/xdg -openssl -I /usr/local/opt/openssl/include -android-ndk-host darwin-x86_64 -no-qpa-platform-guard -android-arch armeabi-v7a +qtci-macos-10.13-x86_64-2 Android_ANY arm64 Clang Clang Packaging DisableTests -opensource -confirm-license -verbose -prefix /Users/qt/work/install -release -opengl es2 -nomake examples -nomake tests -xplatform android-clang -android-sdk /opt/android/sdk -android-ndk /opt/android/android-ndk-r19c -no-dbus -no-sql-mysql -sysconfdir /etc/xdg -openssl -I /usr/local/opt/openssl/include -android-ndk-host darwin-x86_64 -no-qpa-platform-guard -android-arch arm64-v8a +qtci-macos-10.13-x86_64-2 Android_ANY x86 Clang Clang Packaging DisableTests -opensource -confirm-license -verbose -prefix /Users/qt/work/install -release -opengl es2 -nomake examples -nomake tests -xplatform android-clang -android-sdk /opt/android/sdk -android-ndk /opt/android/android-ndk-r19c -no-dbus -no-sql-mysql -sysconfdir /etc/xdg -openssl -I /usr/local/opt/openssl/include -android-ndk-host darwin-x86_64 -no-qpa-platform-guard -android-arch x86 +qtci-macos-10.13-x86_64-2 Android_ANY x86_64 Clang Clang Packaging DisableTests -opensource -confirm-license -verbose -prefix /Users/qt/work/install -release -opengl es2 -nomake examples -nomake tests -xplatform android-clang -android-sdk /opt/android/sdk -android-ndk /opt/android/android-ndk-r19c -no-dbus -no-sql-mysql -sysconfdir /etc/xdg -openssl -I /usr/local/opt/openssl/include -android-ndk-host darwin-x86_64 -no-qpa-platform-guard -android-arch x86_64 qtci-macos-10.13-x86_64-2 QNX_700 x86 GCC DisableTests -opensource -confirm-license -verbose -prefix /Users/qt/work/install -release -opengl es2 -no-use-gold-linker -nomake examples -nomake tests -qpa qnx -xplatform qnx-x86-qcc -qtci-windows-10-x86_64-14 QNX_700 armv7 Mingw73 Packaging DisableTests -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -opengl es2 -nomake examples -nomake tests -xplatform qnx-armle-v7-qcc -qtci-windows-10-x86_64-14 QNX_700 armv8 Mingw73 Packaging DisableTests -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -opengl es2 -nomake examples -nomake tests -xplatform qnx-aarch64le-qcc -qtci-windows-10-x86_64-14 QNX_700 x86_64 Mingw73 Packaging DisableTests -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -opengl es2 -nomake examples -nomake tests -xplatform qnx-x86-64-qcc -qtci-linux-RHEL-7.6-x86_64 QNX_700 armv8 GCC Packaging DisableTests -opensource -confirm-license -verbose -prefix /home/qt/work/install -release -opengl es2 -no-use-gold-linker -nomake examples -nomake tests -qpa qnx -xplatform qnx-aarch64le-qcc -qtci-linux-RHEL-7.6-x86_64 QNX_700 x86_64 GCC Packaging DisableTests -opensource -confirm-license -verbose -prefix /home/qt/work/install -release -opengl es2 -no-use-gold-linker -nomake examples -nomake tests -qpa qnx -xplatform qnx-x86-64-qcc +qtci-windows-10-x86_64-14 QNX_700 armv7 Mingw73 Packaging DisableTests -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -opengl es2 -nomake examples -nomake tests -no-sql-mysql -xplatform qnx-armle-v7-qcc +qtci-windows-10-x86_64-14 QNX_700 armv8 Mingw73 Packaging DisableTests -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -opengl es2 -nomake examples -nomake tests -no-sql-mysql -xplatform qnx-aarch64le-qcc +qtci-windows-10-x86_64-14 QNX_700 x86_64 Mingw73 Packaging DisableTests -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -opengl es2 -nomake examples -nomake tests -no-sql-mysql -xplatform qnx-x86-64-qcc +qtci-linux-RHEL-7.6-x86_64 QNX_700 armv8 GCC Packaging DisableTests -opensource -confirm-license -verbose -prefix /home/qt/work/install -release -opengl es2 -no-use-gold-linker -nomake examples -nomake tests -no-sql-mysql -qpa qnx -xplatform qnx-aarch64le-qcc +qtci-linux-RHEL-7.6-x86_64 QNX_700 x86_64 GCC Packaging DisableTests -opensource -confirm-license -verbose -prefix /home/qt/work/install -release -opengl es2 -no-use-gold-linker -nomake examples -nomake tests -no-sql-mysql -qpa qnx -xplatform qnx-x86-64-qcc diff --git a/coin/provisioning/common/unix/install-openssl.sh b/coin/provisioning/common/unix/install-openssl.sh index afc1509e..01a20935 100755 --- a/coin/provisioning/common/unix/install-openssl.sh +++ b/coin/provisioning/common/unix/install-openssl.sh @@ -59,6 +59,12 @@ if [[ "$os" == "linux" ]]; then ./Configure --prefix="$opensslHome" shared no-ssl3-method enable-ec_nistp_64_gcc_128 linux-x86_64 "-Wa,--noexecstack" make && make install_sw install_ssldirs SetEnvVar "OPENSSL_HOME" "$opensslHome" + if uname -a |grep -q "Ubuntu"; then + echo "export LD_LIBRARY_PATH=$opensslHome/lib:$LD_LIBRARY_PATH" >> ~/.bash_profile + else + echo "export LD_LIBRARY_PATH=$opensslHome/lib:$LD_LIBRARY_PATH" >> ~/.bashrc + fi + elif [ "$os" == "macos" ]; then # Below target location has been hard coded into Coin. # QTQAINFRA-1195 diff --git a/coin/provisioning/qtci-windows-7-x86/09-openssl.ps1 b/coin/provisioning/qtci-windows-7-x86/09-openssl.ps1 index ae867cdc..f90938c4 100644 --- a/coin/provisioning/qtci-windows-7-x86/09-openssl.ps1 +++ b/coin/provisioning/qtci-windows-7-x86/09-openssl.ps1 @@ -33,62 +33,31 @@ . "$PSScriptRoot\..\common\windows\helpers.ps1" -# This script installs OpenSSL $version. -# Both x86 and x64 versions needed when x86 integrations are done on x64 machine +# This script will install OpenSSL prebuild version. Currently this pre-build version is only needed for Windows 7. +# Version was build using Windows 7 x86 and MSVC2010 -$version = "1_0_2p" -$packagex64 = "C:\Windows\Temp\Win64OpenSSL-$version.exe" -$packagex86 = "C:\Windows\Temp\Win32OpenSSL-$version.exe" +# Used build commands below: +# call "C:\Program Files\Microsoft Visual Studio 10.0\VC\vcvarsall.bat" x86 +# perl Configure no-asm VC-WIN32 --prefix=C:\openssl\ --openssldir=C:\openssl\ +# nmake +# nmake install -if (Is64BitWinHost) { - # Install x64 bit version - $architecture = "x64" - $installFolder = "C:\openssl" - $externalUrl = "https://slproweb.com/download/Win64OpenSSL-$version.exe" - $internalUrl = "\\ci-files01-hki.intra.qt.io\provisioning\openssl\Win64OpenSSL-$version.exe" - $sha1 = "ec8b4111afb86ffc81837a30667aa076afe9d1e6" +$version = "1.1.1b" +$zip = Get-DownloadLocation ("openssl-$version.7z") +$sha1 = "7afba53ab984cecb54a1915c135cbb2a20c6b576" +$url = "http://ci-files01-hki.intra.qt.io/input/openssl/openssl_${version}_prebuild_x86.7z" - Write-Host "Fetching from URL ..." - Download $externalUrl $internalUrl $packagex64 - Verify-Checksum $packagex64 $sha1 - Write-Host "Installing $packagex64 ..." - Run-Executable "$packagex64" "/SP- /SILENT /LOG /SUPPRESSMSGBOXES /NORESTART /DIR=$installFolder" +Download $url $url $zip +Verify-Checksum $zip $sha1 +$installFolder = "C:\openssl" - Write-Host "Remove downloaded $packagex64 ..." - Remove-Item -Path $packagex64 +Extract-7Zip $zip "C:\" +Remove-Item -Path $zip - Set-EnvironmentVariable "OPENSSL_CONF_x64" "$installFolder\bin\openssl.cfg" - Set-EnvironmentVariable "OPENSSL_INCLUDE_x64" "$installFolder\include" - Set-EnvironmentVariable "OPENSSL_LIB_x64" "$installFolder\lib" -} - -# Install x86 bit version -$architecture = "x86" - -if (Is64BitWinHost) { - $installFolder = "C:\openssl$architecture" -} else { - $installFolder = "C:\openssl" -} - -$externalUrl = "https://slproweb.com/download/Win32OpenSSL-$version.exe" -$internalUrl = "\\ci-files01-hki.intra.qt.io\provisioning\openssl\Win32OpenSSL-$version.exe" -$sha1 = "753d6b2cb8b6c808f6212bd21b6e6e7822a4e236" - -Write-Host "Fetching from URL ..." -Download $externalUrl $internalUrl $packagex86 -Verify-Checksum $packagex86 $sha1 -Write-Host "Installing $packagex86 ..." -Run-Executable "$packagex86" "/SP- /SILENT /LOG /SUPPRESSMSGBOXES /NORESTART /DIR=$installFolder" - -Write-Host "Remove downloaded $packagex86 ..." -Remove-Item -Path $packagex86 - -Set-EnvironmentVariable "OPENSSL_CONF_x86" "$installFolder\bin\openssl.cfg" +Set-EnvironmentVariable "OPENSSL_CONF_x86" "$installFolder\openssl.cnf" Set-EnvironmentVariable "OPENSSL_INCLUDE_x86" "$installFolder\include" Set-EnvironmentVariable "OPENSSL_LIB_x86" "$installFolder\lib" +Prepend-Path "$installFolder\bin" -# Store version information to ~/versions.txt, which is used to print version information to provision log. Write-Output "OpenSSL = $version" >> ~/versions.txt - |