diff options
author | Simon Hausmann <simon.hausmann@qt.io> | 2016-12-21 21:38:29 +0100 |
---|---|---|
committer | Simon Hausmann <simon.hausmann@qt.io> | 2016-12-21 21:38:29 +0100 |
commit | 591c6d0446453b303638d86b31199d535b8f481e (patch) | |
tree | 4ec42e7220da5f9d730d6a4e0fa116094c297aa7 /coin/provisioning/qtci-windows-7-x86 | |
parent | 2f9d551948323c86e727d246c34c5f46a3661b8c (diff) | |
parent | 8a60455e61d6a7cd11eb7da02bdf1cae8ff97b8b (diff) |
Merge remote-tracking branch 'origin/5.6' into 5.7
Conflicts:
coin/provisioning/common/02-python.ps1
Change-Id: I6b5f2c464cc350798c7c73fba9e79a3f4f534586
Diffstat (limited to 'coin/provisioning/qtci-windows-7-x86')
-rw-r--r-- | coin/provisioning/qtci-windows-7-x86/04-msys.ps1 | 14 | ||||
-rw-r--r-- | coin/provisioning/qtci-windows-7-x86/android_openssl.ps1 | 32 |
2 files changed, 46 insertions, 0 deletions
diff --git a/coin/provisioning/qtci-windows-7-x86/04-msys.ps1 b/coin/provisioning/qtci-windows-7-x86/04-msys.ps1 new file mode 100644 index 00000000..b75fd2a6 --- /dev/null +++ b/coin/provisioning/qtci-windows-7-x86/04-msys.ps1 @@ -0,0 +1,14 @@ +. "$PSScriptRoot\..\common\helpers.ps1" + +# This script will install msys which is needed for configuring openssl for Android + +$version = "1.0.11" +$url = "http://ci-files01-hki.ci.local/input/windows/msys-$version.7z" + +$zip = "c:\users\qt\downloads\msys-$version.7z" +$sha1 = "22cd76f1263db8c72727a9537228c481ff33c285" +$destination = "C:\msys" + +Download $url $url $zip +Verify-Checksum $zip $sha1 +C:\Utils\sevenzip\7z.exe x $zip -oC:\ diff --git a/coin/provisioning/qtci-windows-7-x86/android_openssl.ps1 b/coin/provisioning/qtci-windows-7-x86/android_openssl.ps1 new file mode 100644 index 00000000..a1b656c6 --- /dev/null +++ b/coin/provisioning/qtci-windows-7-x86/android_openssl.ps1 @@ -0,0 +1,32 @@ +. "$PSScriptRoot\..\common\helpers.ps1" + +# OpenSSL need to be configured from sources for Android build in windows 7 +# Msys need to be installed to target machine +# More info and building instructions can be found from http://doc.qt.io/qt-5/opensslsupport.html + +$version = "1.0.2j" +$zip = "c:\users\qt\downloads\openssl-$version.tar.gz" +$sha1 = "bdfbdb416942f666865fa48fe13c2d0e588df54f" +$destination = "C:\Utils\openssl-android-master" + +Download https://www.openssl.org/source/openssl-$version.tar.gz http://ci-files01-hki.ci.local/input/openssl/openssl-$version.tar.gz $zip +Verify-Checksum $zip $sha1 + +C:\Utils\sevenzip\7z.exe x $zip -oC:\Utils +C:\Utils\sevenzip\7z.exe x C:\Utils\openssl-$version.tar -oC:\Utils +Remove-Item $destination -Force -Recurse +Rename-Item C:\Utils\openssl-$version $destination +Remove-Item $zip +Remove-Item C:\Utils\openssl-$version.tar + +set CC=C:\utils\android-ndk-r10e\toolchains\arm-linux-androideabi-4.9\prebuilt\windows\bin\arm-linux-androideabi-gcc +set AR=C:\utils\android-ndk-r10e\toolchains\arm-linux-androideabi-4.9\prebuilt\windows\bin\arm-linux-androideabi-ar +set ANDROID_DEV=C:\utils\android-ndk-r10e\platforms\android-18\arch-arm\usr +$env:Path = $env:Path + ";C:\msys\1.0\bin" + +echo "Configuring OpenSSL $version for Android..." +cd $destination +C:\msys\1.0\bin\bash.exe -c "perl Configure shared android" + +# Following command is needed when using version 1.1.0. With version 1.1.0 msys is not needed. +# C:\mingw530\bin\mingw32-make.exe include\openssl\opensslconf.h |