aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSimo Fält <simo.falt@qt.io>2020-12-31 09:59:59 +0200
committerQt Cherry-pick Bot <cherrypick_bot@qt-project.org>2021-01-22 09:46:53 +0000
commit829460991aca9420daf2702dfb995812a42971eb (patch)
tree5f88e40500b6ab6458522e4ff3e1e5a77e5f0a03
parentdb9e8e575538c627f9808592e895a9c544d16c4e (diff)
Revert "Qt CI: Install libCLang 10.0"
LibClang with dynamic libs is now provisioned with Qt5 scripts. So this is no longer needed. This reverts commit cbe5ac758c59f4d16b64704a1c5a3ddf88f3f85b. Change-Id: I1ca354e14231d677a72fc4d8391a705e70d28f35 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> (cherry picked from commit 5676675320bd41a9c321e9259962ced923f69757) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
-rw-r--r--build_scripts/coin_utils.py65
-rw-r--r--coin_build_instructions.py3
-rw-r--r--coin_test_instructions.py2
3 files changed, 0 insertions, 70 deletions
diff --git a/build_scripts/coin_utils.py b/build_scripts/coin_utils.py
deleted file mode 100644
index 2a7215cfb..000000000
--- a/build_scripts/coin_utils.py
+++ /dev/null
@@ -1,65 +0,0 @@
-#############################################################################
-##
-## Copyright (C) 2020 The Qt Company Ltd.
-## Contact: https://www.qt.io/licensing/
-##
-## This file is part of Qt for Python.
-##
-## $QT_BEGIN_LICENSE:LGPL$
-## Commercial License Usage
-## Licensees holding valid commercial Qt licenses may use this file in
-## accordance with the commercial license agreement provided with the
-## Software or, alternatively, in accordance with the terms contained in
-## a written agreement between you and The Qt Company. For licensing terms
-## and conditions see https://www.qt.io/terms-conditions. For further
-## information use the contact form at https://www.qt.io/contact-us.
-##
-## GNU Lesser General Public License Usage
-## Alternatively, this file may be used under the terms of the GNU Lesser
-## General Public License version 3 as published by the Free Software
-## Foundation and appearing in the file LICENSE.LGPL3 included in the
-## packaging of this file. Please review the following information to
-## ensure the GNU Lesser General Public License version 3 requirements
-## will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
-##
-## GNU General Public License Usage
-## Alternatively, this file may be used under the terms of the GNU
-## General Public License version 2.0 or (at your option) the GNU General
-## Public license version 3 or any later version approved by the KDE Free
-## Qt Foundation. The licenses are as published by the Free Software
-## Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
-## included in the packaging of this file. Please review the following
-## information to ensure the GNU General Public License requirements will
-## be met: https://www.gnu.org/licenses/gpl-2.0.html and
-## https://www.gnu.org/licenses/gpl-3.0.html.
-##
-## $QT_END_LICENSE$
-##
-#############################################################################
-
-from .utils import download_and_extract_7z
-import sys
-import os
-
-# This is a temp hack for 6.0.0 release
-# The Qt6 repo is missing correct provisioning of libClang, so we need to
-# install it by ourselves
-def installLibClang(CI_HOST_OS):
- home = os.path.expanduser("~")
- file = "https://download.qt.io/development_releases/prebuilt/libclang/libclang-release_100-based-mac.7z"
- target = os.path.join(home, "libclang-dynlibs-10.0")
- if sys.platform == "win32":
- file = "https://download.qt.io/development_releases/prebuilt/libclang/libclang-release_100-based-windows-vs2019_64.7z"
- if CI_HOST_OS == "Linux":
- file = "https://download.qt.io/development_releases/prebuilt/libclang/libclang-release_100-based-linux-Rhel7.6-gcc5.3-x86_64.7z"
- try:
- download_and_extract_7z(file, target)
- except RuntimeError as e:
- print("Exception occurred: {}".format(e))
- # It seems on MacOS we keep getting
- # [Errno socket error] [SSL: CERTIFICATE_VERIFY_FAILED] certificate verify failed
- # with https, re-try from other server with http
- file = file.replace("s://download","://master")
- print("One more try from url: {}".format(file))
- download_and_extract_7z(file, target)
- os.environ['LLVM_INSTALL_DIR'] = os.path.join(target, "libclang")
diff --git a/coin_build_instructions.py b/coin_build_instructions.py
index c93e56f44..5281f278d 100644
--- a/coin_build_instructions.py
+++ b/coin_build_instructions.py
@@ -44,8 +44,6 @@ from build_scripts.utils import run_instruction
from build_scripts.utils import rmtree
from build_scripts.utils import get_python_dict
from build_scripts.utils import get_ci_qmake_path
-from build_scripts.coin_utils import installLibClang
-
import os
import datetime
import calendar
@@ -173,7 +171,6 @@ if __name__ == "__main__":
for env_var in ['CC', 'CXX']:
if os.environ.get(env_var):
del os.environ[env_var]
- installLibClang(CI_HOST_OS)
if CI_TEST_PHASE in ["ALL", "BUILD"]:
call_setup("3","BUILD")
diff --git a/coin_test_instructions.py b/coin_test_instructions.py
index 73e71ca47..6bda5b185 100644
--- a/coin_test_instructions.py
+++ b/coin_test_instructions.py
@@ -43,7 +43,6 @@ from build_scripts.utils import get_qtci_virtualEnv
from build_scripts.utils import run_instruction
from build_scripts.utils import rmtree
from build_scripts.utils import get_ci_qmake_path
-from build_scripts.coin_utils import installLibClang
import os
import site
import sys
@@ -107,7 +106,6 @@ def run_test_instructions():
for env_var in ['CC', 'CXX']:
if os.environ.get(env_var):
del os.environ[env_var]
- installLibClang(CI_HOST_OS)
os.chdir(CI_ENV_AGENT_DIR)
testRun = 0