aw/valentina
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Path to Python.

Browse Source
This commit is contained in:
Roman Telezhynskyi 2023-02-25 19:57:24 +02:00
parent 346f89850e
commit 4b8cd819e7
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.cirrus.yml
View File

@ -148,7 +148,7 @@ macos_task_template: &MACOS_TASK_TEMPLATE
env: env:
ACCESS_TOKEN: ENCRYPTED[81e0b2381ffb628b73f5c94f834010e6631191e0ad03cdd0850d440fb2737a74b68131d842030f010c1bf73ab4cdc1ae] ACCESS_TOKEN: ENCRYPTED[81e0b2381ffb628b73f5c94f834010e6631191e0ad03cdd0850d440fb2737a74b68131d842030f010c1bf73ab4cdc1ae]
QTDIR: "/opt/homebrew/opt/qt6" QTDIR: "/opt/homebrew/opt/qt6"
PATH: ${HOME}/.local/bin:$QTDIR/bin:${PATH} PATH: $QTDIR/bin:${PATH}
# ^ add user paths # ^ add user paths
PIP_CACHE_DIR: ${HOME}/.cache/pip PIP_CACHE_DIR: ${HOME}/.cache/pip
LDFLAGS: "-L$QTDIR/lib" LDFLAGS: "-L$QTDIR/lib"
@ -164,7 +164,7 @@ macos_task_template: &MACOS_TASK_TEMPLATE
folder: ${PIP_CACHE_DIR} folder: ${PIP_CACHE_DIR}
install_script: install_script:
- echo $PATH - echo $PATH
- export PATH="$HOME/.local/bin:$PATH" - export PATH="$HOME/.local/bin:`python3 -m site --user-base`/bin:$PATH"
- echo $PATH - echo $PATH
- clang --version - clang --version
- find /Applications -maxdepth 1 -type d -name 'Xcode*.app' - find /Applications -maxdepth 1 -type d -name 'Xcode*.app'

14
appveyor.yml
View File

@ -82,7 +82,7 @@ environment:
- job_name: MacOS_12_Qt_6_4 (multibundle) - job_name: MacOS_12_Qt_6_4 (multibundle)
APPVEYOR_BUILD_WORKER_IMAGE: macos-monterey APPVEYOR_BUILD_WORKER_IMAGE: macos-monterey
COMPILER: clang COMPILER: clang
QT: $HOME/Qt/6.4/macos QT: ${HOME}/Qt/6.4/macos
QT_VERSION: Qt6_4 QT_VERSION: Qt6_4
BUILD_SYSTEM: "qbs" BUILD_SYSTEM: "qbs"
ARCH: x64 ARCH: x64
@ -96,7 +96,7 @@ environment:
- job_name: MacOS_12_Qt_6_4 (singlebundle) - job_name: MacOS_12_Qt_6_4 (singlebundle)
APPVEYOR_BUILD_WORKER_IMAGE: macos-monterey APPVEYOR_BUILD_WORKER_IMAGE: macos-monterey
COMPILER: clang COMPILER: clang
QT: $HOME/Qt/6.4/macos QT: ${HOME}/Qt/6.4/macos
QT_VERSION: Qt6_4 QT_VERSION: Qt6_4
BUILD_SYSTEM: "qbs" BUILD_SYSTEM: "qbs"
ARCH: x64 ARCH: x64
@ -110,7 +110,7 @@ environment:
- job_name: MacOS_10_15_Qt_5_15 (qbs, multibundle) - job_name: MacOS_10_15_Qt_5_15 (qbs, multibundle)
APPVEYOR_BUILD_WORKER_IMAGE: macos-catalina APPVEYOR_BUILD_WORKER_IMAGE: macos-catalina
COMPILER: clang COMPILER: clang
QT: $HOME/Qt/5.15/clang_64 QT: ${HOME}/Qt/5.15/clang_64
QT_VERSION: Qt5_15 QT_VERSION: Qt5_15
BUILD_SYSTEM: "qbs" BUILD_SYSTEM: "qbs"
ARCH: x64 ARCH: x64
@ -124,7 +124,7 @@ environment:
- job_name: MacOS_10_15_Qt_5_15 (qbs, singlebundle) - job_name: MacOS_10_15_Qt_5_15 (qbs, singlebundle)
APPVEYOR_BUILD_WORKER_IMAGE: macos-catalina APPVEYOR_BUILD_WORKER_IMAGE: macos-catalina
COMPILER: clang COMPILER: clang
QT: $HOME/Qt/5.15/clang_64 QT: ${HOME}/Qt/5.15/clang_64
QT_VERSION: Qt5_15 QT_VERSION: Qt5_15
BUILD_SYSTEM: "qbs" BUILD_SYSTEM: "qbs"
ARCH: x64 ARCH: x64
@ -222,7 +222,7 @@ environment:
- job_name: MacOS_10_15_Qt_5_15 (make) - job_name: MacOS_10_15_Qt_5_15 (make)
APPVEYOR_BUILD_WORKER_IMAGE: macos-catalina APPVEYOR_BUILD_WORKER_IMAGE: macos-catalina
COMPILER: clang COMPILER: clang
QT: $HOME/Qt/5.15/clang_64 QT: ${HOME}/Qt/5.15/clang_64
QT_VERSION: Qt5_15 QT_VERSION: Qt5_15
BUILD_SYSTEM: "make" BUILD_SYSTEM: "make"
ARCH: x64 ARCH: x64
@ -378,7 +378,7 @@ for:
build_script: build_script:
- conan install . -s os=Windows --build=xerces-c/3.2.4 -pr valentina - conan install . -s os=Windows --build=xerces-c/3.2.4 -pr valentina
- qbs build -f valentina.qbs -d %APPVEYOR_BUILD_FOLDER%\build --command-echo-mode command-line config:release qbs.installRoot:%APPVEYOR_BUILD_FOLDER%\build\install-root\valentina profile:qt6 project.enableConan:true modules.buildconfig.enableCcache:false project.conanProfiles:[valentina] - qbs build -f valentina.qbs -d %APPVEYOR_BUILD_FOLDER%\build --command-echo-mode command-line config:release qbs.installRoot:%APPVEYOR_BUILD_FOLDER%\build\install-root\valentina profile:qt6 project.enableConan:true modules.buildconfig.enableCcache:false project.conanProfiles:valentina
test_script: test_script:
- qbs -p autotest-runner -d %APPVEYOR_BUILD_FOLDER%\build profile:qt6 config:release - qbs -p autotest-runner -d %APPVEYOR_BUILD_FOLDER%\build profile:qt6 config:release
@ -492,7 +492,7 @@ for:
init: init:
- export QTDIR="$QT" - export QTDIR="$QT"
- export PATH="$QTDIR/bin:$HOME/.local/bin:$PATH" - export PATH="$QTDIR/bin:$HOME/.local/bin:`python3 -m site --user-base`/bin:$PATH"
- echo $PATH - echo $PATH
- find /Applications -maxdepth 1 -type d -name 'Xcode*.app' - find /Applications -maxdepth 1 -type d -name 'Xcode*.app'
- sudo xcode-select -p - sudo xcode-select -p