From fddfbcda7546c2bd50274784e623ce85cec69aed Mon Sep 17 00:00:00 2001 From: Alexey Pavlov Date: Mon, 23 Jan 2017 11:19:14 +0300 Subject: [PATCH] qt-creator: Add toolchains by language. --- mingw-w64-qtcreator/PKGBUILD | 2 +- mingw-w64-qtcreator/qt-creator-i686.install | 59 +++++++++++++++++-- mingw-w64-qtcreator/qt-creator-x86_64.install | 59 +++++++++++++++++-- 3 files changed, 109 insertions(+), 11 deletions(-) diff --git a/mingw-w64-qtcreator/PKGBUILD b/mingw-w64-qtcreator/PKGBUILD index 4f85b45963..324936a693 100644 --- a/mingw-w64-qtcreator/PKGBUILD +++ b/mingw-w64-qtcreator/PKGBUILD @@ -7,7 +7,7 @@ pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}" __pre= _base_ver=4.2.0 pkgver=${_base_ver}${_pre} -pkgrel=1 +pkgrel=2 pkgdesc='Cross-platform IDE (mingw-w64)' url='https://www.qt.io/' install=qt-creator-${CARCH}.install diff --git a/mingw-w64-qtcreator/qt-creator-i686.install b/mingw-w64-qtcreator/qt-creator-i686.install index 640ea3fbf9..2732dc32a9 100644 --- a/mingw-w64-qtcreator/qt-creator-i686.install +++ b/mingw-w64-qtcreator/qt-creator-i686.install @@ -21,16 +21,40 @@ post_install() { _msys2_machine=$(/usr/bin/gcc.exe -dumpmachine) if [ "${_msys2_machine}" = "x86_64-pc-msys" ]; then ./sdktool.exe rmTC "--id" "ProjectExplorer.ToolChain.Mingw:M2_MSYS2_x86_64" > /dev/null 2>&1 || true + ./sdktool.exe rmTC "--id" "ProjectExplorer.ToolChain.Mingw:M2_MSYS2_x86_64_C" > /dev/null 2>&1 || true + ./sdktool.exe rmTC "--id" "ProjectExplorer.ToolChain.Mingw:M2_MSYS2_x86_64_CXX" > /dev/null 2>&1 || true + ./sdktool.exe addTC \ - "--id" "ProjectExplorer.ToolChain.Mingw:M2_MSYS2_x86_64" \ + "--id" "ProjectExplorer.ToolChain.Mingw:M2_MSYS2_x86_64_C" \ + "--language" "1" \ + "--name" "MSYS2 64bit (MSYS2)" \ + "--path" "/usr/bin/gcc.exe" \ + "--abi" "x86-windows-msys-pe-64bit" \ + "--supportedAbis" "x86-windows-msys-pe-64bit" + + ./sdktool.exe addTC \ + "--id" "ProjectExplorer.ToolChain.Mingw:M2_MSYS2_x86_64_CXX" \ + "--language" "2" \ "--name" "MSYS2 64bit (MSYS2)" \ "--path" "/usr/bin/g++.exe" \ "--abi" "x86-windows-msys-pe-64bit" \ "--supportedAbis" "x86-windows-msys-pe-64bit" else ./sdktool.exe rmTC "--id" "ProjectExplorer.ToolChain.Mingw:M2_MSYS2_i686" > /dev/null 2>&1 || true + ./sdktool.exe rmTC "--id" "ProjectExplorer.ToolChain.Mingw:M2_MSYS2_i686_C" > /dev/null 2>&1 || true + ./sdktool.exe rmTC "--id" "ProjectExplorer.ToolChain.Mingw:M2_MSYS2_i686_CXX" > /dev/null 2>&1 || true + ./sdktool.exe addTC \ - "--id" "ProjectExplorer.ToolChain.Mingw:M2_MSYS2_i686" \ + "--id" "ProjectExplorer.ToolChain.Mingw:M2_MSYS2_i686_C" \ + "--language" "1" \ + "--name" "MSYS2 32bit (MSYS2)" \ + "--path" "/usr/bin/gcc.exe" \ + "--abi" "x86-windows-msys-pe-32bit" \ + "--supportedAbis" "x86-windows-msys-pe-32bit" + + ./sdktool.exe addTC \ + "--id" "ProjectExplorer.ToolChain.Mingw:M2_MSYS2_i686_CXX" \ + "--language" "2" \ "--name" "MSYS2 32bit (MSYS2)" \ "--path" "/usr/bin/g++.exe" \ "--abi" "x86-windows-msys-pe-32bit" \ @@ -41,16 +65,40 @@ post_install() { # Add MinGW-w64 toolchains. Don't check for existence since # the user may add toolchains after Qt Creator. ./sdktool.exe rmTC "--id" "ProjectExplorer.ToolChain.Mingw:M2_MinGW-w64_x86_64" > /dev/null 2>&1 || true + ./sdktool.exe rmTC "--id" "ProjectExplorer.ToolChain.Mingw:M2_MinGW-w64_x86_64_C" > /dev/null 2>&1 || true + ./sdktool.exe rmTC "--id" "ProjectExplorer.ToolChain.Mingw:M2_MinGW-w64_x86_64_CXX" > /dev/null 2>&1 || true + ./sdktool.exe addTC \ - "--id" "ProjectExplorer.ToolChain.Mingw:M2_MinGW-w64_x86_64" \ + "--id" "ProjectExplorer.ToolChain.Mingw:M2_MinGW-w64_x86_64_C" \ + "--language" "1" \ + "--name" "MinGW-w64 64bit (MSYS2)" \ + "--path" "/mingw64/bin/gcc.exe" \ + "--abi" "x86-windows-msys-pe-64bit" \ + "--supportedAbis" "x86-windows-msys-pe-64bit" + + ./sdktool.exe addTC \ + "--id" "ProjectExplorer.ToolChain.Mingw:M2_MinGW-w64_x86_64_CXX" \ + "--language" "2" \ "--name" "MinGW-w64 64bit (MSYS2)" \ "--path" "/mingw64/bin/g++.exe" \ "--abi" "x86-windows-msys-pe-64bit" \ "--supportedAbis" "x86-windows-msys-pe-64bit" ./sdktool.exe rmTC "--id" "ProjectExplorer.ToolChain.Mingw:M2_MinGW-w64_i686" > /dev/null 2>&1 || true + ./sdktool.exe rmTC "--id" "ProjectExplorer.ToolChain.Mingw:M2_MinGW-w64_i686_C" > /dev/null 2>&1 || true + ./sdktool.exe rmTC "--id" "ProjectExplorer.ToolChain.Mingw:M2_MinGW-w64_i686_CXX" > /dev/null 2>&1 || true + ./sdktool.exe addTC \ - "--id" "ProjectExplorer.ToolChain.Mingw:M2_MinGW-w64_i686" \ + "--id" "ProjectExplorer.ToolChain.Mingw:M2_MinGW-w64_i686_C" \ + "--language" "1" \ + "--name" "MinGW-w64 32bit (MSYS2)" \ + "--path" "/mingw32/bin/gcc.exe" \ + "--abi" "x86-windows-msys-pe-32bit" \ + "--supportedAbis" "x86-windows-msys-pe-32bit" + + ./sdktool.exe addTC \ + "--id" "ProjectExplorer.ToolChain.Mingw:M2_MinGW-w64_i686_CXX" \ + "--language" "2" \ "--name" "MinGW-w64 32bit (MSYS2)" \ "--path" "/mingw32/bin/g++.exe" \ "--abi" "x86-windows-msys-pe-32bit" \ @@ -90,7 +138,8 @@ post_install() { ./sdktool.exe addKit \ "--id" "qt.M2_MinGW-w64${_mingw_variant_idsuffix}${_library_variant_idsuffix}_kit" \ "--name" "Desktop Qt ${_library_variant_suffix} MinGW-w64${_mingw_variant_suffix} (MSYS2)" \ - "--toolchain" "ProjectExplorer.ToolChain.Mingw:M2_MinGW-w64${_mingw_variant_idsuffix}" \ + "--Ctoolchain" "ProjectExplorer.ToolChain.Mingw:M2_MinGW-w64${_mingw_variant_idsuffix}_C" \ + "--Cxxtoolchain" "ProjectExplorer.ToolChain.Mingw:M2_MinGW-w64${_mingw_variant_idsuffix}_CXX" \ "--qt" "qt.M2_MinGW-w64${_mingw_variant_idsuffix}${_library_variant_idsuffix}" \ "--debuggerengine" "1" \ "--debugger" "/${_mingw_variant}/bin/gdb.exe" \ diff --git a/mingw-w64-qtcreator/qt-creator-x86_64.install b/mingw-w64-qtcreator/qt-creator-x86_64.install index 6f84940d40..e1ca5916c0 100644 --- a/mingw-w64-qtcreator/qt-creator-x86_64.install +++ b/mingw-w64-qtcreator/qt-creator-x86_64.install @@ -21,16 +21,40 @@ post_install() { _msys2_machine=$(/usr/bin/gcc.exe -dumpmachine) if [ "${_msys2_machine}" = "x86_64-pc-msys" ]; then ./sdktool.exe rmTC "--id" "ProjectExplorer.ToolChain.Mingw:M2_MSYS2_x86_64" > /dev/null 2>&1 || true + ./sdktool.exe rmTC "--id" "ProjectExplorer.ToolChain.Mingw:M2_MSYS2_x86_64_C" > /dev/null 2>&1 || true + ./sdktool.exe rmTC "--id" "ProjectExplorer.ToolChain.Mingw:M2_MSYS2_x86_64_CXX" > /dev/null 2>&1 || true + ./sdktool.exe addTC \ - "--id" "ProjectExplorer.ToolChain.Mingw:M2_MSYS2_x86_64" \ + "--id" "ProjectExplorer.ToolChain.Mingw:M2_MSYS2_x86_64_C" \ + "--language" "1" \ + "--name" "MSYS2 64bit (MSYS2)" \ + "--path" "/usr/bin/gcc.exe" \ + "--abi" "x86-windows-msys-pe-64bit" \ + "--supportedAbis" "x86-windows-msys-pe-64bit" + + ./sdktool.exe addTC \ + "--id" "ProjectExplorer.ToolChain.Mingw:M2_MSYS2_x86_64_CXX" \ + "--language" "2" \ "--name" "MSYS2 64bit (MSYS2)" \ "--path" "/usr/bin/g++.exe" \ "--abi" "x86-windows-msys-pe-64bit" \ "--supportedAbis" "x86-windows-msys-pe-64bit" else ./sdktool.exe rmTC "--id" "ProjectExplorer.ToolChain.Mingw:M2_MSYS2_i686" > /dev/null 2>&1 || true + ./sdktool.exe rmTC "--id" "ProjectExplorer.ToolChain.Mingw:M2_MSYS2_i686_C" > /dev/null 2>&1 || true + ./sdktool.exe rmTC "--id" "ProjectExplorer.ToolChain.Mingw:M2_MSYS2_i686_CXX" > /dev/null 2>&1 || true + ./sdktool.exe addTC \ - "--id" "ProjectExplorer.ToolChain.Mingw:M2_MSYS2_i686" \ + "--id" "ProjectExplorer.ToolChain.Mingw:M2_MSYS2_i686_C" \ + "--language" "1" \ + "--name" "MSYS2 32bit (MSYS2)" \ + "--path" "/usr/bin/gcc.exe" \ + "--abi" "x86-windows-msys-pe-32bit" \ + "--supportedAbis" "x86-windows-msys-pe-32bit" + + ./sdktool.exe addTC \ + "--id" "ProjectExplorer.ToolChain.Mingw:M2_MSYS2_i686_CXX" \ + "--language" "2" \ "--name" "MSYS2 32bit (MSYS2)" \ "--path" "/usr/bin/g++.exe" \ "--abi" "x86-windows-msys-pe-32bit" \ @@ -41,16 +65,40 @@ post_install() { # Add MinGW-w64 toolchains. Don't check for existence since # the user may add toolchains after Qt Creator. ./sdktool.exe rmTC "--id" "ProjectExplorer.ToolChain.Mingw:M2_MinGW-w64_x86_64" > /dev/null 2>&1 || true + ./sdktool.exe rmTC "--id" "ProjectExplorer.ToolChain.Mingw:M2_MinGW-w64_x86_64_C" > /dev/null 2>&1 || true + ./sdktool.exe rmTC "--id" "ProjectExplorer.ToolChain.Mingw:M2_MinGW-w64_x86_64_CXX" > /dev/null 2>&1 || true + ./sdktool.exe addTC \ - "--id" "ProjectExplorer.ToolChain.Mingw:M2_MinGW-w64_x86_64" \ + "--id" "ProjectExplorer.ToolChain.Mingw:M2_MinGW-w64_x86_64_C" \ + "--language" "1" \ + "--name" "MinGW-w64 64bit (MSYS2)" \ + "--path" "/mingw64/bin/gcc.exe" \ + "--abi" "x86-windows-msys-pe-64bit" \ + "--supportedAbis" "x86-windows-msys-pe-64bit" + + ./sdktool.exe addTC \ + "--id" "ProjectExplorer.ToolChain.Mingw:M2_MinGW-w64_x86_64_CXX" \ + "--language" "2" \ "--name" "MinGW-w64 64bit (MSYS2)" \ "--path" "/mingw64/bin/g++.exe" \ "--abi" "x86-windows-msys-pe-64bit" \ "--supportedAbis" "x86-windows-msys-pe-64bit" ./sdktool.exe rmTC "--id" "ProjectExplorer.ToolChain.Mingw:M2_MinGW-w64_i686" > /dev/null 2>&1 || true + ./sdktool.exe rmTC "--id" "ProjectExplorer.ToolChain.Mingw:M2_MinGW-w64_i686_C" > /dev/null 2>&1 || true + ./sdktool.exe rmTC "--id" "ProjectExplorer.ToolChain.Mingw:M2_MinGW-w64_i686_CXX" > /dev/null 2>&1 || true + ./sdktool.exe addTC \ - "--id" "ProjectExplorer.ToolChain.Mingw:M2_MinGW-w64_i686" \ + "--id" "ProjectExplorer.ToolChain.Mingw:M2_MinGW-w64_i686_C" \ + "--language" "1" \ + "--name" "MinGW-w64 32bit (MSYS2)" \ + "--path" "/mingw32/bin/gcc.exe" \ + "--abi" "x86-windows-msys-pe-32bit" \ + "--supportedAbis" "x86-windows-msys-pe-32bit" + + ./sdktool.exe addTC \ + "--id" "ProjectExplorer.ToolChain.Mingw:M2_MinGW-w64_i686_CXX" \ + "--language" "2" \ "--name" "MinGW-w64 32bit (MSYS2)" \ "--path" "/mingw32/bin/g++.exe" \ "--abi" "x86-windows-msys-pe-32bit" \ @@ -90,7 +138,8 @@ post_install() { ./sdktool.exe addKit \ "--id" "qt.M2_MinGW-w64${_mingw_variant_idsuffix}${_library_variant_idsuffix}_kit" \ "--name" "Desktop Qt ${_library_variant_suffix} MinGW-w64${_mingw_variant_suffix} (MSYS2)" \ - "--toolchain" "ProjectExplorer.ToolChain.Mingw:M2_MinGW-w64${_mingw_variant_idsuffix}" \ + "--Ctoolchain" "ProjectExplorer.ToolChain.Mingw:M2_MinGW-w64${_mingw_variant_idsuffix}_C" \ + "--Cxxtoolchain" "ProjectExplorer.ToolChain.Mingw:M2_MinGW-w64${_mingw_variant_idsuffix}_CXX" \ "--qt" "qt.M2_MinGW-w64${_mingw_variant_idsuffix}${_library_variant_idsuffix}" \ "--debuggerengine" "1" \ "--debugger" "/${_mingw_variant}/bin/gdb.exe" \