mirror of
https://gitlab.com/smart-pattern/valentina.git
synced 2024-09-19 23:34:04 +02:00
Compare commits
No commits in common. "ce0abdeb21f85587022ce7355769dc02a4a6c308" and "da57bfc7b1fa34ab225ea6858aec99dddfb50ca4" have entirely different histories.
ce0abdeb21
...
da57bfc7b1
|
@ -163,16 +163,14 @@ macos_task_template: &MACOS_TASK_TEMPLATE
|
|||
pip_cache:
|
||||
folder: ${PIP_CACHE_DIR}
|
||||
install_script:
|
||||
- clang --version
|
||||
- find /Applications -maxdepth 1 -type d -name 'Xcode*.app'
|
||||
- sudo xcode-select -p
|
||||
- brew update > /dev/null
|
||||
- brew install --force qt6 coreutils ccache conan qbs cmake
|
||||
- brew install qt6 coreutils ccache conan qbs cmake
|
||||
- chmod -R 755 /opt/homebrew/opt/qt6/*
|
||||
- python3 --version
|
||||
- pip3 install --user --upgrade pip dropbox
|
||||
- ccache --set-config=sloppiness=pch_defines,time_macros
|
||||
- conan --version
|
||||
- clang --version
|
||||
- qmake --version
|
||||
- which qmake
|
||||
- qbs --version
|
||||
|
@ -185,6 +183,7 @@ macos_task_template: &MACOS_TASK_TEMPLATE
|
|||
- qbs setup-qt /opt/homebrew/opt/qt6/bin/qmake qt6
|
||||
- qbs-config defaultProfile qt6
|
||||
- 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}
|
||||
- ccache -s
|
||||
deploy_script:
|
||||
|
|
41
appveyor.yml
41
appveyor.yml
|
@ -47,7 +47,6 @@ environment:
|
|||
QT: Qt\6.4.0\mingw_64
|
||||
QT_VERSION: Qt6_4
|
||||
BUILD_SYSTEM: "qbs"
|
||||
GCC_VERSION: 11.2
|
||||
MINGW_PATH: C:\Qt\Tools\mingw1120_64\bin
|
||||
ARCH: x64
|
||||
PYTHON: "C:\\Python311-x64"
|
||||
|
@ -60,7 +59,6 @@ environment:
|
|||
QT: Qt\5.15\mingw81_32
|
||||
QT_VERSION: Qt5_15
|
||||
BUILD_SYSTEM: "qbs"
|
||||
GCC_VERSION: 8.1
|
||||
MINGW_PATH: C:\Qt\Tools\mingw810_32\bin
|
||||
ARCH: x86
|
||||
PYTHON: "C:\\Python311"
|
||||
|
@ -75,7 +73,7 @@ environment:
|
|||
BUILD_SYSTEM: "make"
|
||||
MINGW_PATH: C:\Qt\Tools\mingw492_32\bin
|
||||
ARCH: x86
|
||||
PYTHON: "C:\\Python38"
|
||||
PYTHON: "C:\\Python311"
|
||||
PLATFORM: "WindowsXP+"
|
||||
DEPLOY: true
|
||||
|
||||
|
@ -114,7 +112,7 @@ environment:
|
|||
QT_VERSION: Qt5_15
|
||||
BUILD_SYSTEM: "qbs"
|
||||
ARCH: x64
|
||||
XCODE_VERSION: 12.3
|
||||
XCODE_VERSION: 12.5.1
|
||||
PLATFORM: "macOS10.13+"
|
||||
MACOS_DEPLOYMENT_TARGET: 10.13
|
||||
MULTI_BUNDLE: true
|
||||
|
@ -128,7 +126,7 @@ environment:
|
|||
QT_VERSION: Qt5_15
|
||||
BUILD_SYSTEM: "qbs"
|
||||
ARCH: x64
|
||||
XCODE_VERSION: 12.3
|
||||
XCODE_VERSION: 12.5.1
|
||||
PLATFORM: "macOS10.13+"
|
||||
MACOS_DEPLOYMENT_TARGET: 10.13
|
||||
MULTI_BUNDLE: false
|
||||
|
@ -177,7 +175,6 @@ environment:
|
|||
QT: Qt\5.15\mingw81_64
|
||||
QT_VERSION: Qt5_15
|
||||
BUILD_SYSTEM: "qbs"
|
||||
GCC_VERSION: 8.1
|
||||
MINGW_PATH: C:\Qt\Tools\mingw810_64\bin
|
||||
ARCH: x64
|
||||
PYTHON: "C:\\Python311-x64"
|
||||
|
@ -226,7 +223,7 @@ environment:
|
|||
QT_VERSION: Qt5_15
|
||||
BUILD_SYSTEM: "make"
|
||||
ARCH: x64
|
||||
XCODE_VERSION: 12.3
|
||||
XCODE_VERSION: 12.5.1
|
||||
PLATFORM: "macOS10.13+"
|
||||
DEPLOY: false
|
||||
|
||||
|
@ -238,7 +235,7 @@ environment:
|
|||
BUILD_SYSTEM: "nmake"
|
||||
VSVER: 14
|
||||
ARCH: x64
|
||||
PYTHON: "C:\\Python38-x64"
|
||||
PYTHON: "C:\\Python311-x64"
|
||||
PLATFORM: "WindowsXP+"
|
||||
DEPLOY: false
|
||||
|
||||
|
@ -344,40 +341,21 @@ for:
|
|||
- qbs-setup-qt %QTDIR%\bin\qmake.exe qt6
|
||||
- qbs-config defaultProfile qt6
|
||||
- dir "C:\Qt\Tools"
|
||||
- conan config home
|
||||
- type %HOMEPATH%\.conan2\settings.yml
|
||||
- conan profile new valentina
|
||||
- ps: |
|
||||
if ($env:COMPILER -eq "msvc")
|
||||
{
|
||||
& qbs-setup-toolchains.exe --type msvc $env:MSVC_PATH\cl.exe $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
|
||||
{
|
||||
& qbs-setup-toolchains.exe --type mingw $env:MINGW_PATH\g++.exe $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
|
||||
- conan profile detect
|
||||
|
||||
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
|
||||
|
||||
test_script:
|
||||
|
@ -496,11 +474,10 @@ for:
|
|||
- sudo xcode-select -s /Applications/Xcode-$XCODE_VERSION.app
|
||||
- sudo xcode-select -p
|
||||
- brew update > /dev/null
|
||||
- rm '/usr/local/bin/ccmake'
|
||||
- brew install --force coreutils qbs cmake
|
||||
- brew install coreutils qbs cmake
|
||||
- |
|
||||
if [[ "$ENABLE_CONAN" == "true" ]]; then
|
||||
brew install --force conan;
|
||||
brew install conan;
|
||||
conan --version
|
||||
fi
|
||||
- python3 --version
|
||||
|
@ -535,7 +512,7 @@ for:
|
|||
- job_name: MacOS_10_15_Qt_5_15 (make)
|
||||
|
||||
init:
|
||||
- find /Applications -maxdepth 1 -type d -name 'Xcode*.app'
|
||||
- find /Applications -maxdepth 1 -type d -name 'Xcode*.ap
|
||||
- sudo xcode-select -p
|
||||
- sudo xcode-select -s /Applications/Xcode-$XCODE_VERSION.app
|
||||
- sudo xcode-select -p
|
||||
|
|
Loading…
Reference in a new issue