(macos) update qmlfmt to one that supports 5.15 syntax

Author: pestophagous

cookiecutter/init_repo.sh

@@ -21,7 +21,7 @@ git add -f AppImage_staging/.do_not_format
 git add -f dl_third_party/.do_not_format
 git add -f dl_third_party/Qt_desktop/5.15.0/clang_64/extrabin/macos/qmlfmt
 git add -f dl_third_party/Qt_desktop/5.15.0/gcc_64/extrabin/qmlfmt
-# git add -f dl_third_party/Qt_desktop/6.2.2/clang_64/extrabin/macos/qmlfmt # TODO(pestophagous)
+git add -f dl_third_party/Qt_desktop/6.2.2/macos/extrabin/qmlfmt
 git add -f dl_third_party/Qt_desktop/6.2.2/gcc_64/extrabin/qmlfmt
 git add -f dl_third_party/Qt_desktop/5.15.0/ios/mkspecs/qconfig.pri
 git add -f dl_third_party/Qt_desktop/5.15.0/msvc2019_64/mkspecs/qconfig.pri

dl_third_party/Qt_desktop/6.2.2/macos/extrabin/qmlfmt

@@ -29,6 +29,14 @@ else
    qtsvg \
    qttools
 
+  # we still need qt6 in order to execute qmlfmt.
+  bash -x $CUR_GIT_ROOT/tools/ci/install-qt.sh \
+   --directory $DL_FOLDER/Qt_desktop \
+   --version 6.2.2 \
+   qtbase \
+   qtdeclarative \
+   qt5compat
+
 fi
 
 if [ -d $DL_FOLDER/Qt_desktop/5.15.0/ios/bin ]; then

tools/ci/get_qt_libs_mac.sh

@@ -218,10 +218,25 @@ if ! ${FORCE_DOWNLOAD} && [ -f "${HASH_FILEPATH}" ]; then
 fi
 
 if ${INSTALLATION_IS_VALID}; then
-    echo "Already installed. Skipping download."
+    echo "Already installed. Skipping download." >&2
     exit 0
 fi
 
+MIRRORS="\
+    http://download.qt.io \
+    http://ftp.fau.de/qtproject \
+    http://ftp.acc.umu.se/mirror/qt.io/qtproject \
+"
+
+for MIRROR in ${MIRRORS}; do
+    if curl "${MIRROR}/online" -s -f -o /dev/null; then
+        break;
+    else
+        echo "Server ${MIRROR} not availabe. Trying next alternative..." >&2
+        MIRROR=""
+    fi
+done
+
 DOWNLOAD_DIR=`mktemp -d 2>/dev/null || mktemp -d -t 'install-qt'`
 
 #
@@ -230,20 +245,36 @@ DOWNLOAD_DIR=`mktemp -d 2>/dev/null || mktemp -d -t 'install-qt'`
 function compute_url(){
     local COMPONENT=$1
     local CURL="curl -s -L"
-    local BASE_URL="http://download.qt.io/online/qtsdkrepository/${HOST_OS}/${TARGET_PLATFORM}"
+    local BASE_URL="${MIRROR}/online/qtsdkrepository/${HOST_OS}/${TARGET_PLATFORM}"
+    local ANDROID_ARCH=$(echo ${TOOLCHAIN##android_})
 
     if [[ "${COMPONENT}" =~ "qtcreator" ]]; then
 
-        REMOTE_BASE="tools_qtcreator/qt.tools.qtcreator"
-        REMOTE_PATH="$(${CURL} ${BASE_URL}/${REMOTE_BASE}/ | grep -o -E "${VERSION}[0-9\-]*${COMPONENT}\.7z" | tail -1)"
+        if [[ "${HOST_OS}" == "windows_x86" ]]; then
+            # newer QtC versions do not supported x86 version anymore
+            HOST_OS="windows_x64"
+        fi
+
+        SHORT_VERSION=${VERSION%??}
+        BASE_URL="${MIRROR}/official_releases/qtcreator"
+        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)
+            "qt6_${VERSION//./}/qt.qt6.${VERSION//./}.${TOOLCHAIN}"
+            "qt6_${VERSION//./}/qt.qt6.${VERSION//./}.${COMPONENT}.${TOOLCHAIN}"
+            "qt6_${VERSION//./}_${ANDROID_ARCH}/qt.qt6.${VERSION//./}.${TOOLCHAIN}"
+            "qt6_${VERSION//./}_${ANDROID_ARCH}/qt.qt6.${VERSION//./}.${COMPONENT}.${TOOLCHAIN}"
             # New repository format (>=5.9.6)
             "qt5_${VERSION//./}/qt.qt5.${VERSION//./}.${TOOLCHAIN}"
             "qt5_${VERSION//./}/qt.qt5.${VERSION//./}.${COMPONENT}.${TOOLCHAIN}"
@@ -268,16 +299,39 @@ function compute_url(){
     exit 1
 }
 
+function version {
+  echo "$@" | awk -F. '{ printf("%03d%03d%03d\n", $1,$2,$3); }';
+}
+
 mkdir -p ${INSTALL_DIR}
 rm -f "${HASH_FILEPATH}"
 
 for COMPONENT in ${COMPONENTS}; do
 
+    if [[ "${COMPONENT}" =~ "qtcreator" ]] && [[ "${HOST_OS}" != "mac_x64" ]]; then
+        UNPACK_DIR="${INSTALL_DIR}/Tools/QtCreator"
+        mkdir -p ${UNPACK_DIR}
+    else
+        UNPACK_DIR="${INSTALL_DIR}"
+    fi
+
+    if [ "$(version "${VERSION}")" -ge "$(version "6.0.0")" ]; then
+        if [[ "${COMPONENT}" =~ "qtscript" ]] || [[ "${COMPONENT}" =~ "qtscxml" ]] || [[ "${COMPONENT}" =~ "qtx11extras" ]]; then
+            echo "Component ${COMPONENT} was removed in Qt6, skipping" >&2
+            continue
+        fi
+    else
+        if [[ "${COMPONENT}" =~ "qt5compat" ]]; then
+            echo "Component ${COMPONENT} is not present in Qt ${VERSION}, skipping" >&2
+            continue
+        fi
+    fi
+
     URL="$(compute_url ${COMPONENT})"
-    echo "Downloading ${COMPONENT}..." >&2
+    echo "Downloading ${COMPONENT} ${URL}..." >&2
     curl --progress-bar -L -o ${DOWNLOAD_DIR}/package.7z ${URL} >&2
-    7z x -y -o${INSTALL_DIR} ${DOWNLOAD_DIR}/package.7z >/dev/null 2>&1
-    7z l -ba -slt -y ${DOWNLOAD_DIR}/package.7z | tr '\\' '/' | sed -n -e "s|^Path\ =\ |${INSTALL_DIR}/|p" >> "${HASH_FILEPATH}" 2>/dev/null
+    7z x -y -o${UNPACK_DIR} ${DOWNLOAD_DIR}/package.7z >/dev/null 2>&1
+    7z l -ba -slt -y ${DOWNLOAD_DIR}/package.7z | tr '\\' '/' | sed -n -e "s|^Path\ =\ |${UNPACK_DIR}/|p" >> "${HASH_FILEPATH}" 2>/dev/null
     rm -f ${DOWNLOAD_DIR}/package.7z
 
     #
@@ -294,26 +348,47 @@ for COMPONENT in ${COMPONENTS}; do
             SUBDIR="${TOOLCHAIN/win32_/}"
         elif [[ "${TOOLCHAIN}" =~ "any" ]] && [[ "${TARGET_PLATFORM}" == "android" ]]; then
             SUBDIR="android"
+        elif [ "${HOST_OS}" == "mac_x64" ] && [ ! "${VERSION}" \< "6.1.2" ]; then
+            SUBDIR="macos"
         else
             SUBDIR="${TOOLCHAIN}"
         fi
 
-        CONF_FILE="${INSTALL_DIR}/${VERSION}/${SUBDIR}/bin/qt.conf"
-        echo "[Paths]" > ${CONF_FILE}
-        echo "Prefix = .." >> ${CONF_FILE}
+        if [ "${TARGET_PLATFORM}" == "android" ] && [ ! "${VERSION}" \< "6.0.0" ]; then
+            CONF_FILE="${UNPACK_DIR}/${VERSION}/${SUBDIR}/bin/target_qt.conf"
+            sed -i "s|target|../$TOOLCHAIN|g" "${CONF_FILE}"
+            sed -i "/HostPrefix/ s|$|gcc_64|g" "${CONF_FILE}"
+            ANDROID_QMAKE_FILE="${UNPACK_DIR}/${VERSION}/${SUBDIR}/bin/qmake"
+            QMAKE_FILE="${UNPACK_DIR}/${VERSION}/gcc_64/bin/qmake"
+            sed -i "s|\/home\/qt\/work\/install\/bin\/qmake|$QMAKE_FILE|g" "${ANDROID_QMAKE_FILE}"
+        else
+            CONF_FILE="${UNPACK_DIR}/${VERSION}/${SUBDIR}/bin/qt.conf"
+            echo "[Paths]" > ${CONF_FILE}
+            echo "Prefix = .." >> ${CONF_FILE}
+        fi
 
         # Adjust the license to be able to run qmake
         # sed with -i requires intermediate file on Mac OS
-        PRI_FILE="${INSTALL_DIR}/${VERSION}/${SUBDIR}/mkspecs/qconfig.pri"
+        PRI_FILE="${UNPACK_DIR}/${VERSION}/${SUBDIR}/mkspecs/qconfig.pri"
         sed -i.bak 's/Enterprise/OpenSource/g' "${PRI_FILE}"
         sed -i.bak 's/licheck.*//g' "${PRI_FILE}"
         rm "${PRI_FILE}.bak"
 
         # 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//./}_32/bin"
+        fi
     elif [[ "${COMPONENT}" =~ "qtcreator" ]]; then
-        echo "${INSTALL_DIR}/Tools/QtCreator/bin"
+        if [ "${HOST_OS}" == "mac_x64" ]; then
+            echo "${UNPACK_DIR}/Qt Creator.app/Contents/MacOS"
+        else
+            echo "${UNPACK_DIR}/bin"
+        fi
     fi
 
 done

tools/ci/install-qt.sh

@@ -37,7 +37,7 @@ if [[ -n ${MYAPP_TEMPLATE_LEGACY_UBUNTU18-} ]]; then
 fi
 
 if [[ "$OSTYPE" == "darwin"* ]]; then
-  qml_formatter="${DL_FOLDER}/Qt_desktop/${MY_QT_VERSION}/clang_64/extrabin/macos/qmlfmt"
+  qml_formatter="${DL_FOLDER}/Qt_desktop/${MY_QT_VERSION}/macos/extrabin/qmlfmt"
 else
   export LD_LIBRARY_PATH="${DL_FOLDER}/Qt_desktop/${MY_QT_VERSION}/gcc_64/lib"
   qml_formatter="${DL_FOLDER}/Qt_desktop/${MY_QT_VERSION}/gcc_64/extrabin/qmlfmt"