diff options
| author | Ivan Komissarov <abbapoh@gmail.com> | 2021-04-11 18:57:25 +0300 |
|---|---|---|
| committer | Ivan Komissarov <ABBAPOH@gmail.com> | 2021-05-06 08:37:23 +0000 |
| commit | 4206f5d2697729436bd9cfb7bfee869c275283be (patch) | |
| tree | f48c812c5a0b55d86641a826f4ebe58b19c836ea /scripts | |
| parent | b69f1a4fbfbf6fed4ffc42d6191082b6a20af828 (diff) | |
| download | qbs-4206f5d2697729436bd9cfb7bfee869c275283be.tar.gz | |
GitHub actions: Add MinGW build and tests on Windows
Change-Id: I50944a7ad0a1f4f2fc09bcaab43fc88044107ff9
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/install-qt.sh | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/scripts/install-qt.sh b/scripts/install-qt.sh index 9a3595062..fa7600a32 100755 --- a/scripts/install-qt.sh +++ b/scripts/install-qt.sh @@ -256,7 +256,14 @@ function compute_url(){ REMOTE_PATH="${SHORT_VERSION}/${VERSION}/installer_source/${HOST_OS}/qtcreator.7z" echo "${BASE_URL}/${REMOTE_PATH}" return 0 + elif [[ "${COMPONENT}" =~ "mingw" ]]; then + REMOTE_BASE="tools_mingw/qt.tools.${TOOLCHAIN}${VERSION//./}" + REMOTE_PATH="$(${CURL} ${BASE_URL}/${REMOTE_BASE}/ | grep -o -E "[[:alnum:]_.\-]*7z" | grep -v "meta" | head -1)" + if [ ! -z "${REMOTE_PATH}" ]; then + echo "${BASE_URL}/${REMOTE_BASE}/${REMOTE_PATH}" + return 0 + fi else REMOTE_BASES=( # New repository format (>=6.0.0) @@ -364,6 +371,12 @@ for COMPONENT in ${COMPONENTS}; do # Print the directory so that the caller can # adjust the PATH variable. echo $(dirname "${CONF_FILE}") + elif [[ "${COMPONENT}" =~ "mingw" ]]; then + if [[ "${TOOLCHAIN}" =~ "win64_mingw" ]]; then + echo "${UNPACK_DIR}/Tools/mingw${VERSION//./}_64/bin" + elif [[ "${TOOLCHAIN}" =~ "win32_mingw" ]]; then + echo "${UNPACK_DIR}/Tools/mingw${VERSION//./}/bin" + fi elif [[ "${COMPONENT}" =~ "qtcreator" ]]; then if [ "${HOST_OS}" == "mac_x64" ]; then echo "${UNPACK_DIR}/Qt Creator.app/Contents/MacOS" |