mirror of
git://code.qt.io/qt/qt5.git
synced 2025-12-21 07:28:21 +08:00
Compare commits
6 Commits
e171387d4c
...
189740e5e1
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
189740e5e1 | ||
|
|
7b36e50c64 | ||
|
|
f1d54f955c | ||
|
|
ec20fd6cab | ||
|
|
c3f0773ed2 | ||
|
|
b8b7c30b2a |
@@ -421,3 +421,19 @@ function(qt_ir_get_option_as_cmake_flag_option cli_name cmake_option_name out_va
|
||||
endif()
|
||||
set(${out_var} "${cmake_option}" PARENT_SCOPE)
|
||||
endfunction()
|
||||
|
||||
# Get the value of a command line option as existing absolute path.
|
||||
# Yield error if the path does not exist.
|
||||
# Convert to absolute path if necessary.
|
||||
function(qt_ir_get_option_as_existing_absolute_path name value)
|
||||
qt_ir_get_option_value("${name}" path)
|
||||
if(NOT "${path}" STREQUAL "")
|
||||
if(NOT EXISTS "${path}")
|
||||
qt_ir_add_error("The path '${path}' passed with -${name} does not exist.")
|
||||
endif()
|
||||
if(NOT IS_ABSOLUTE "${path}")
|
||||
get_filename_component(path "${path}" ABSOLUTE)
|
||||
endif()
|
||||
endif()
|
||||
set("${value}" "${path}" PARENT_SCOPE)
|
||||
endfunction()
|
||||
|
||||
@@ -295,7 +295,7 @@ function(qt_ir_run_after_args_parsed top_level_src_path out_var_exit_reason)
|
||||
"${working_directory}")
|
||||
|
||||
# Get some additional options to pass down.
|
||||
qt_ir_get_option_value(alternates alternates)
|
||||
qt_ir_get_option_as_existing_absolute_path(alternates alternates)
|
||||
qt_ir_get_option_as_cmake_flag_option(branch "CHECKOUT_BRANCH" checkout_branch_option)
|
||||
|
||||
# The prefix for the cmake-style 'dictionary' that will be used by various functions.
|
||||
|
||||
@@ -26,14 +26,3 @@ Configurations:
|
||||
'CMAKE_ARGS=-DOpenGL_GL_PREFERENCE=LEGACY',
|
||||
'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR}} -DINPUT_headersclean=ON'
|
||||
]
|
||||
# Test clang-20 on Ubuntu 24.04 ARM64 Wayland
|
||||
-
|
||||
Id: 'ubuntu-24.04-arm64-clang20-cxx23'
|
||||
Template: 'qtci-linux-Ubuntu-24.04-aarch64-52'
|
||||
Compiler: 'Clang'
|
||||
Features: ['Sccache', 'UseConfigure', 'DoNotRunTests']
|
||||
Configure arguments: '-developer-build -nomake examples -release -force-debug-info -headersclean -separate-debug-info -qt-pcre -no-libudev -bundled-xcb-xinput -c++std c++23'
|
||||
Environment variables: [
|
||||
'COMMON_CMAKE_ARGS=-DCMAKE_C_COMPILER=clang-20 -DCMAKE_CXX_COMPILER=clang++-20',
|
||||
'CMAKE_ARGS=-DQT_FEATURE_stdlib_libcpp=ON'
|
||||
]
|
||||
|
||||
34
coin/provisioning/common/macos/python-arm.sh
Executable file
34
coin/provisioning/common/macos/python-arm.sh
Executable file
@@ -0,0 +1,34 @@
|
||||
#!/usr/bin/env bash
|
||||
# Copyright (C) 2025 The Qt Company Ltd.
|
||||
# Copyright (C) 2017 Pelagicore AG
|
||||
# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
|
||||
|
||||
# This script installs python3 on macOS ARM hosts.
|
||||
|
||||
# shellcheck source=../unix/SetEnvVar.sh
|
||||
source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh"
|
||||
|
||||
# Use 3.12 as a default python
|
||||
# Note: Make sure that it's a version where dependencies are stored in CI-files.
|
||||
python_ver="3.12.11"
|
||||
|
||||
export PYTHON_BUILD_MIRROR_URL="https://ci-files01-hki.ci.qt.io/input/python/"
|
||||
export PYTHON_BUILD_MIRROR_URL_SKIP_CHECKSUM=1
|
||||
pyenv install "$python_ver"
|
||||
|
||||
/Users/qt/.pyenv/versions/$python_ver/bin/pip3 install --user virtualenv wheel html5lib
|
||||
/Users/qt/.pyenv/versions/$python_ver/bin/pip3 install --user -r ${BASH_SOURCE%/*}/../shared/requirements.txt
|
||||
|
||||
SetEnvVar "PYTHON3_PATH" "/Users/qt/.pyenv/versions/$python_ver/bin/"
|
||||
SetEnvVar "PIP3_PATH" "/Users/qt/.pyenv/versions/$python_ver/bin/"
|
||||
SetEnvVar "PATH" "\$PYTHON3_PATH:\$PATH"
|
||||
|
||||
# Provisioning during installation says:
|
||||
# 'The script sbom2doc is installed in '$HOME/.local/bin' which is not on PATH.'
|
||||
# hence the explicit assignment to SBOM_PYTHON_APPS_PATH.
|
||||
SetEnvVar "SBOM_PYTHON_APPS_PATH" "/Users/qt/.local/bin"
|
||||
|
||||
# Set SBOM_PYTHON_INTERP_PATH to Python3 instance which was used to install SBOM packages from requirements
|
||||
SetEnvVar "SBOM_PYTHON_INTERP_PATH" "/Users/qt/.pyenv/versions/$python_ver/bin/python3"
|
||||
|
||||
echo "python3 = $python_ver" >> ~/versions.txt
|
||||
@@ -14,4 +14,11 @@ curl -L https://apt.llvm.org/llvm-snapshot.gpg.key | sudo apt-key add -
|
||||
sudo apt-add-repository 'deb http://apt.llvm.org/noble/ llvm-toolchain-noble-20 main'
|
||||
|
||||
sudo apt update
|
||||
sudo apt -y install clang-20 lldb-20 lld-20 libc++-20-dev
|
||||
sudo apt -y install clang-20 lldb-20 lld-20
|
||||
|
||||
# note: installing the libc++ development files conflicts with libgstreamer1.0-dev
|
||||
# * installing libunwind-20-dev from apt.llvm.org (as dependency of libc++-20-dev) will
|
||||
# uninstall libgstreamer1.0-dev
|
||||
# * installing libunwind-20-dev from the Ubuntu repository will break gstreamer's pkg-config
|
||||
# integration: https://bugs.launchpad.net/ubuntu/+source/llvm-toolchain-20/+bug/2134518
|
||||
# sudo apt -y libc++-20-dev
|
||||
|
||||
@@ -3,18 +3,7 @@
|
||||
# Copyright (C) 2017 Pelagicore AG
|
||||
# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
|
||||
|
||||
# This script installs python3
|
||||
set -euox pipefail
|
||||
|
||||
# shellcheck source=../common/unix/SetEnvVar.sh
|
||||
source "${BASH_SOURCE%/*}/../common/unix/SetEnvVar.sh"
|
||||
|
||||
pyenv install 3.9.7
|
||||
|
||||
/Users/qt/.pyenv/versions/3.9.7/bin/pip3 install --user virtualenv wheel html5lib
|
||||
|
||||
SetEnvVar "PYTHON3_PATH" "/Users/qt/.pyenv/versions/3.9.7/bin/"
|
||||
SetEnvVar "PIP3_PATH" "/Users/qt/.pyenv/versions/3.9.7/bin/"
|
||||
# Use 3.9 as a default python
|
||||
SetEnvVar "PATH" "\$PYTHON3_PATH:\$PATH"
|
||||
|
||||
echo "python3 = 3.9.7" >> ~/versions.txt
|
||||
# shellcheck source=../common/macos/python-arm.sh
|
||||
source "${BASH_SOURCE%/*}/../common/macos/python-arm.sh"
|
||||
|
||||
@@ -3,27 +3,7 @@
|
||||
# Copyright (C) 2017 Pelagicore AG
|
||||
# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
|
||||
|
||||
# This script installs python3
|
||||
set -euox pipefail
|
||||
|
||||
# shellcheck source=../common/unix/SetEnvVar.sh
|
||||
source "${BASH_SOURCE%/*}/../common/unix/SetEnvVar.sh"
|
||||
|
||||
pyenv install 3.9.7
|
||||
|
||||
/Users/qt/.pyenv/versions/3.9.7/bin/pip3 install --user virtualenv wheel html5lib
|
||||
/Users/qt/.pyenv/versions/3.9.7/bin/pip3 install --user -r ${BASH_SOURCE%/*}/../common/shared/requirements.txt
|
||||
|
||||
SetEnvVar "PYTHON3_PATH" "/Users/qt/.pyenv/versions/3.9.7/bin/"
|
||||
SetEnvVar "PIP3_PATH" "/Users/qt/.pyenv/versions/3.9.7/bin/"
|
||||
# Use 3.9 as a default python
|
||||
SetEnvVar "PATH" "\$PYTHON3_PATH:\$PATH"
|
||||
|
||||
# Provisioning during installation says:
|
||||
# 'The script sbom2doc is installed in '$HOME/.local/bin' which is not on PATH.'
|
||||
# hence the explicit assignment to SBOM_PYTHON_APPS_PATH.
|
||||
SetEnvVar "SBOM_PYTHON_APPS_PATH" "/Users/qt/.local/bin"
|
||||
|
||||
# Set SBOM_PYTHON_INTERP_PATH to Python3 instance which was used to install SBOM packages from requirements
|
||||
SetEnvVar "SBOM_PYTHON_INTERP_PATH" "/Users/qt/.pyenv/versions/3.9.7/bin/python3"
|
||||
|
||||
echo "python3 = 3.9.7" >> ~/versions.txt
|
||||
# shellcheck source=../common/macos/python-arm.sh
|
||||
source "${BASH_SOURCE%/*}/../common/macos/python-arm.sh"
|
||||
|
||||
@@ -3,27 +3,7 @@
|
||||
# Copyright (C) 2017 Pelagicore AG
|
||||
# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
|
||||
|
||||
# This script installs python3
|
||||
set -euox pipefail
|
||||
|
||||
# shellcheck source=../common/unix/SetEnvVar.sh
|
||||
source "${BASH_SOURCE%/*}/../common/unix/SetEnvVar.sh"
|
||||
|
||||
pyenv install 3.9.7
|
||||
|
||||
/Users/qt/.pyenv/versions/3.9.7/bin/pip3 install --user virtualenv wheel html5lib
|
||||
/Users/qt/.pyenv/versions/3.9.7/bin/pip3 install --user -r ${BASH_SOURCE%/*}/../common/shared/requirements.txt
|
||||
|
||||
SetEnvVar "PYTHON3_PATH" "/Users/qt/.pyenv/versions/3.9.7/bin/"
|
||||
SetEnvVar "PIP3_PATH" "/Users/qt/.pyenv/versions/3.9.7/bin/"
|
||||
# Use 3.9 as a default python
|
||||
SetEnvVar "PATH" "\$PYTHON3_PATH:\$PATH"
|
||||
|
||||
# Provisioning during installation says:
|
||||
# 'The script sbom2doc is installed in '$HOME/.local/bin' which is not on PATH.'
|
||||
# hence the explicit assignment to SBOM_PYTHON_APPS_PATH.
|
||||
SetEnvVar "SBOM_PYTHON_APPS_PATH" "/Users/qt/.local/bin"
|
||||
|
||||
# Set SBOM_PYTHON_INTERP_PATH to Python3 instance which was used to install SBOM packages from requirements
|
||||
SetEnvVar "SBOM_PYTHON_INTERP_PATH" "/Users/qt/.pyenv/versions/3.9.7/bin/python3"
|
||||
|
||||
echo "python3 = 3.9.7" >> ~/versions.txt
|
||||
# shellcheck source=../common/macos/python-arm.sh
|
||||
source "${BASH_SOURCE%/*}/../common/macos/python-arm.sh"
|
||||
|
||||
@@ -3,27 +3,7 @@
|
||||
# Copyright (C) 2017 Pelagicore AG
|
||||
# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
|
||||
|
||||
# This script installs python3
|
||||
set -euox pipefail
|
||||
|
||||
# shellcheck source=../common/unix/SetEnvVar.sh
|
||||
source "${BASH_SOURCE%/*}/../common/unix/SetEnvVar.sh"
|
||||
|
||||
pyenv install 3.9.7
|
||||
|
||||
/Users/qt/.pyenv/versions/3.9.7/bin/pip3 install --user virtualenv wheel html5lib
|
||||
/Users/qt/.pyenv/versions/3.9.7/bin/pip3 install --user -r ${BASH_SOURCE%/*}/../common/shared/requirements.txt
|
||||
|
||||
SetEnvVar "PYTHON3_PATH" "/Users/qt/.pyenv/versions/3.9.7/bin/"
|
||||
SetEnvVar "PIP3_PATH" "/Users/qt/.pyenv/versions/3.9.7/bin/"
|
||||
# Use 3.9 as a default python
|
||||
SetEnvVar "PATH" "\$PYTHON3_PATH:\$PATH"
|
||||
|
||||
# Provisioning during installation says:
|
||||
# 'The script sbom2doc is installed in '$HOME/.local/bin' which is not on PATH.'
|
||||
# hence the explicit assignment to SBOM_PYTHON_APPS_PATH.
|
||||
SetEnvVar "SBOM_PYTHON_APPS_PATH" "/Users/qt/.local/bin"
|
||||
|
||||
# Set SBOM_PYTHON_INTERP_PATH to Python3 instance which was used to install SBOM packages from requirements
|
||||
SetEnvVar "SBOM_PYTHON_INTERP_PATH" "/Users/qt/.pyenv/versions/3.9.7/bin/python3"
|
||||
|
||||
echo "python3 = 3.9.7" >> ~/versions.txt
|
||||
# shellcheck source=../common/macos/python-arm.sh
|
||||
source "${BASH_SOURCE%/*}/../common/macos/python-arm.sh"
|
||||
|
||||
@@ -3,27 +3,7 @@
|
||||
# Copyright (C) 2017 Pelagicore AG
|
||||
# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
|
||||
|
||||
# This script installs python3
|
||||
set -euox pipefail
|
||||
|
||||
# shellcheck source=../common/unix/SetEnvVar.sh
|
||||
source "${BASH_SOURCE%/*}/../common/unix/SetEnvVar.sh"
|
||||
|
||||
pyenv install 3.12.11
|
||||
|
||||
/Users/qt/.pyenv/versions/3.12.11/bin/pip3 install --user virtualenv wheel html5lib
|
||||
/Users/qt/.pyenv/versions/3.12.11/bin/pip3 install --user -r ${BASH_SOURCE%/*}/../common/shared/requirements.txt
|
||||
|
||||
SetEnvVar "PYTHON3_PATH" "/Users/qt/.pyenv/versions/3.12.11/bin/"
|
||||
SetEnvVar "PIP3_PATH" "/Users/qt/.pyenv/versions/3.12.11/bin/"
|
||||
# Use 3.9 as a default python
|
||||
SetEnvVar "PATH" "\$PYTHON3_PATH:\$PATH"
|
||||
|
||||
# Provisioning during installation says:
|
||||
# 'The script sbom2doc is installed in '$HOME/.local/bin' which is not on PATH.'
|
||||
# hence the explicit assignment to SBOM_PYTHON_APPS_PATH.
|
||||
SetEnvVar "SBOM_PYTHON_APPS_PATH" "/Users/qt/.local/bin"
|
||||
|
||||
# Set SBOM_PYTHON_INTERP_PATH to Python3 instance which was used to install SBOM packages from requirements
|
||||
SetEnvVar "SBOM_PYTHON_INTERP_PATH" "/Users/qt/.pyenv/versions/3.12.11/bin/python3"
|
||||
|
||||
echo "python3 = 3.12.11" >> ~/versions.txt
|
||||
# shellcheck source=../common/macos/python-arm.sh
|
||||
source "${BASH_SOURCE%/*}/../common/macos/python-arm.sh"
|
||||
|
||||
@@ -3,27 +3,7 @@
|
||||
# Copyright (C) 2017 Pelagicore AG
|
||||
# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
|
||||
|
||||
# This script installs python3
|
||||
set -euox pipefail
|
||||
|
||||
# shellcheck source=../common/unix/SetEnvVar.sh
|
||||
source "${BASH_SOURCE%/*}/../common/unix/SetEnvVar.sh"
|
||||
|
||||
pyenv install 3.9.7
|
||||
|
||||
/Users/qt/.pyenv/versions/3.9.7/bin/pip3 install --user virtualenv wheel html5lib
|
||||
/Users/qt/.pyenv/versions/3.9.7/bin/pip3 install --user -r ${BASH_SOURCE%/*}/../common/shared/requirements.txt
|
||||
|
||||
SetEnvVar "PYTHON3_PATH" "/Users/qt/.pyenv/versions/3.9.7/bin/"
|
||||
SetEnvVar "PIP3_PATH" "/Users/qt/.pyenv/versions/3.9.7/bin/"
|
||||
# Use 3.9 as a default python
|
||||
SetEnvVar "PATH" "\$PYTHON3_PATH:\$PATH"
|
||||
|
||||
# Provisioning during installation says:
|
||||
# 'The script sbom2doc is installed in '$HOME/.local/bin' which is not on PATH.'
|
||||
# hence the explicit assignment to SBOM_PYTHON_APPS_PATH.
|
||||
SetEnvVar "SBOM_PYTHON_APPS_PATH" "/Users/qt/.local/bin"
|
||||
|
||||
# Set SBOM_PYTHON_INTERP_PATH to Python3 instance which was used to install SBOM packages from requirements
|
||||
SetEnvVar "SBOM_PYTHON_INTERP_PATH" "/Users/qt/.pyenv/versions/3.9.7/bin/python3"
|
||||
|
||||
echo "python3 = 3.9.7" >> ~/versions.txt
|
||||
# shellcheck source=../common/macos/python-arm.sh
|
||||
source "${BASH_SOURCE%/*}/../common/macos/python-arm.sh"
|
||||
|
||||
Reference in New Issue
Block a user