Compare commits

...

2 commits

Author SHA1 Message Date
Roman Telezhynskyi ce0abdeb21 Fixes. 2023-02-24 21:32:45 +02:00
Roman Telezhynskyi 78fd3574b6 Conan profile. 2023-02-24 20:54:09 +02:00
2 changed files with 36 additions and 12 deletions

View file

@ -163,14 +163,16 @@ macos_task_template: &MACOS_TASK_TEMPLATE
pip_cache: pip_cache:
folder: ${PIP_CACHE_DIR} folder: ${PIP_CACHE_DIR}
install_script: install_script:
- clang --version
- find /Applications -maxdepth 1 -type d -name 'Xcode*.app'
- sudo xcode-select -p
- brew update > /dev/null - brew update > /dev/null
- brew install qt6 coreutils ccache conan qbs cmake - brew install --force qt6 coreutils ccache conan qbs cmake
- chmod -R 755 /opt/homebrew/opt/qt6/* - chmod -R 755 /opt/homebrew/opt/qt6/*
- python3 --version - python3 --version
- pip3 install --user --upgrade pip dropbox - pip3 install --user --upgrade pip dropbox
- ccache --set-config=sloppiness=pch_defines,time_macros - ccache --set-config=sloppiness=pch_defines,time_macros
- conan --version - conan --version
- clang --version
- qmake --version - qmake --version
- which qmake - which qmake
- qbs --version - qbs --version
@ -183,7 +185,6 @@ macos_task_template: &MACOS_TASK_TEMPLATE
- qbs setup-qt /opt/homebrew/opt/qt6/bin/qmake qt6 - qbs setup-qt /opt/homebrew/opt/qt6/bin/qmake qt6
- qbs-config defaultProfile qt6 - qbs-config defaultProfile qt6
- qbs config profiles.qt6.baseProfile clang - qbs config profiles.qt6.baseProfile clang
- echo qbs build -f valentina.qbs -d $CIRRUS_WORKING_DIR/build --command-echo-mode command-line config:release modules.buildconfig.enableUnitTests:false modules.buildconfig.enableMultiBundle:${MULTI_BUNDLE} qbs.installRoot:$CIRRUS_WORKING_DIR/build/install-root profile:qt6 project.enableConan:true project.minimumMacosVersion:${MACOS_DEPLOYMENT_TARGET}
- qbs build -f valentina.qbs -d $CIRRUS_WORKING_DIR/build --command-echo-mode command-line config:release modules.buildconfig.enableUnitTests:false modules.buildconfig.enableMultiBundle:${MULTI_BUNDLE} qbs.installRoot:$CIRRUS_WORKING_DIR/build/install-root profile:qt6 project.enableConan:true project.minimumMacosVersion:${MACOS_DEPLOYMENT_TARGET} modules.buildconfig.enableCcache:${ENABLE_CCACHE} - qbs build -f valentina.qbs -d $CIRRUS_WORKING_DIR/build --command-echo-mode command-line config:release modules.buildconfig.enableUnitTests:false modules.buildconfig.enableMultiBundle:${MULTI_BUNDLE} qbs.installRoot:$CIRRUS_WORKING_DIR/build/install-root profile:qt6 project.enableConan:true project.minimumMacosVersion:${MACOS_DEPLOYMENT_TARGET} modules.buildconfig.enableCcache:${ENABLE_CCACHE}
- ccache -s - ccache -s
deploy_script: deploy_script:

View file

@ -47,6 +47,7 @@ environment:
QT: Qt\6.4.0\mingw_64 QT: Qt\6.4.0\mingw_64
QT_VERSION: Qt6_4 QT_VERSION: Qt6_4
BUILD_SYSTEM: "qbs" BUILD_SYSTEM: "qbs"
GCC_VERSION: 11.2
MINGW_PATH: C:\Qt\Tools\mingw1120_64\bin MINGW_PATH: C:\Qt\Tools\mingw1120_64\bin
ARCH: x64 ARCH: x64
PYTHON: "C:\\Python311-x64" PYTHON: "C:\\Python311-x64"
@ -59,6 +60,7 @@ environment:
QT: Qt\5.15\mingw81_32 QT: Qt\5.15\mingw81_32
QT_VERSION: Qt5_15 QT_VERSION: Qt5_15
BUILD_SYSTEM: "qbs" BUILD_SYSTEM: "qbs"
GCC_VERSION: 8.1
MINGW_PATH: C:\Qt\Tools\mingw810_32\bin MINGW_PATH: C:\Qt\Tools\mingw810_32\bin
ARCH: x86 ARCH: x86
PYTHON: "C:\\Python311" PYTHON: "C:\\Python311"
@ -73,7 +75,7 @@ environment:
BUILD_SYSTEM: "make" BUILD_SYSTEM: "make"
MINGW_PATH: C:\Qt\Tools\mingw492_32\bin MINGW_PATH: C:\Qt\Tools\mingw492_32\bin
ARCH: x86 ARCH: x86
PYTHON: "C:\\Python311" PYTHON: "C:\\Python38"
PLATFORM: "WindowsXP+" PLATFORM: "WindowsXP+"
DEPLOY: true DEPLOY: true
@ -112,7 +114,7 @@ environment:
QT_VERSION: Qt5_15 QT_VERSION: Qt5_15
BUILD_SYSTEM: "qbs" BUILD_SYSTEM: "qbs"
ARCH: x64 ARCH: x64
XCODE_VERSION: 12.5.1 XCODE_VERSION: 12.3
PLATFORM: "macOS10.13+" PLATFORM: "macOS10.13+"
MACOS_DEPLOYMENT_TARGET: 10.13 MACOS_DEPLOYMENT_TARGET: 10.13
MULTI_BUNDLE: true MULTI_BUNDLE: true
@ -126,7 +128,7 @@ environment:
QT_VERSION: Qt5_15 QT_VERSION: Qt5_15
BUILD_SYSTEM: "qbs" BUILD_SYSTEM: "qbs"
ARCH: x64 ARCH: x64
XCODE_VERSION: 12.5.1 XCODE_VERSION: 12.3
PLATFORM: "macOS10.13+" PLATFORM: "macOS10.13+"
MACOS_DEPLOYMENT_TARGET: 10.13 MACOS_DEPLOYMENT_TARGET: 10.13
MULTI_BUNDLE: false MULTI_BUNDLE: false
@ -175,6 +177,7 @@ environment:
QT: Qt\5.15\mingw81_64 QT: Qt\5.15\mingw81_64
QT_VERSION: Qt5_15 QT_VERSION: Qt5_15
BUILD_SYSTEM: "qbs" BUILD_SYSTEM: "qbs"
GCC_VERSION: 8.1
MINGW_PATH: C:\Qt\Tools\mingw810_64\bin MINGW_PATH: C:\Qt\Tools\mingw810_64\bin
ARCH: x64 ARCH: x64
PYTHON: "C:\\Python311-x64" PYTHON: "C:\\Python311-x64"
@ -223,7 +226,7 @@ environment:
QT_VERSION: Qt5_15 QT_VERSION: Qt5_15
BUILD_SYSTEM: "make" BUILD_SYSTEM: "make"
ARCH: x64 ARCH: x64
XCODE_VERSION: 12.5.1 XCODE_VERSION: 12.3
PLATFORM: "macOS10.13+" PLATFORM: "macOS10.13+"
DEPLOY: false DEPLOY: false
@ -235,7 +238,7 @@ environment:
BUILD_SYSTEM: "nmake" BUILD_SYSTEM: "nmake"
VSVER: 14 VSVER: 14
ARCH: x64 ARCH: x64
PYTHON: "C:\\Python311-x64" PYTHON: "C:\\Python38-x64"
PLATFORM: "WindowsXP+" PLATFORM: "WindowsXP+"
DEPLOY: false DEPLOY: false
@ -341,21 +344,40 @@ for:
- qbs-setup-qt %QTDIR%\bin\qmake.exe qt6 - qbs-setup-qt %QTDIR%\bin\qmake.exe qt6
- qbs-config defaultProfile qt6 - qbs-config defaultProfile qt6
- dir "C:\Qt\Tools" - dir "C:\Qt\Tools"
- conan config home
- type %HOMEPATH%\.conan2\settings.yml
- conan profile new valentina
- ps: | - ps: |
if ($env:COMPILER -eq "msvc") if ($env:COMPILER -eq "msvc")
{ {
& qbs-setup-toolchains.exe --type msvc $env:MSVC_PATH\cl.exe $env:COMPILER & qbs-setup-toolchains.exe --type msvc $env:MSVC_PATH\cl.exe $env:COMPILER
& qbs-config.exe profiles.qt6.baseProfile $env:COMPILER & qbs-config.exe profiles.qt6.baseProfile $env:COMPILER
& conan profile update settings.compiler=msvc valentina
& conan profile update settings.compiler.cppstd=17 valentina
& conan profile update settings.compiler.version=192 valentina
& conan profile update settings.compiler.runtime=static valentina
& conan profile update settings.compiler.runtime_type=Release valentina
} }
else else
{ {
& qbs-setup-toolchains.exe --type mingw $env:MINGW_PATH\g++.exe $env:COMPILER & qbs-setup-toolchains.exe --type mingw $env:MINGW_PATH\g++.exe $env:COMPILER
& qbs-config.exe profiles.qt6.baseProfile $env:COMPILER & qbs-config.exe profiles.qt6.baseProfile $env:COMPILER
& conan profile update settings.compiler=gcc valentina
& conan profile update settings.compiler.cppstd=gnu17 valentina
& conan profile update settings.compiler.libcxx=libstdc++11 valentina
& conan profile update settings.compiler.version=$env:GCC_VERSION valentina
} }
if ($env:ARCH -eq "x64") {
& conan profile update settings.arch=x86_64 valentina
} else {
& conan profile update settings.arch=x86 valentina
}
- conan profile update settings.os=Windows valentina
- conan profile update settings.build_type=Release valentina
- qbs-config --list profiles - qbs-config --list profiles
- conan profile detect
build_script: build_script:
- conan install . -s os=Windows --build=xerces-c/3.2.4
- 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 - 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
test_script: test_script:
@ -474,10 +496,11 @@ for:
- sudo xcode-select -s /Applications/Xcode-$XCODE_VERSION.app - sudo xcode-select -s /Applications/Xcode-$XCODE_VERSION.app
- sudo xcode-select -p - sudo xcode-select -p
- brew update > /dev/null - brew update > /dev/null
- brew install coreutils qbs cmake - rm '/usr/local/bin/ccmake'
- brew install --force coreutils qbs cmake
- | - |
if [[ "$ENABLE_CONAN" == "true" ]]; then if [[ "$ENABLE_CONAN" == "true" ]]; then
brew install conan; brew install --force conan;
conan --version conan --version
fi fi
- python3 --version - python3 --version
@ -512,7 +535,7 @@ for:
- job_name: MacOS_10_15_Qt_5_15 (make) - job_name: MacOS_10_15_Qt_5_15 (make)
init: init:
- find /Applications -maxdepth 1 -type d -name 'Xcode*.ap - find /Applications -maxdepth 1 -type d -name 'Xcode*.app'
- sudo xcode-select -p - sudo xcode-select -p
- sudo xcode-select -s /Applications/Xcode-$XCODE_VERSION.app - sudo xcode-select -s /Applications/Xcode-$XCODE_VERSION.app
- sudo xcode-select -p - sudo xcode-select -p