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

Define Path variable.

Browse Source
This commit is contained in:
Roman Telezhynskyi 2023-02-25 11:59:12 +02:00
parent aa85a0bde9
commit 3417b22f63
1 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
appveyor.yml
View File

@ -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.0/macos/bin QT: $HOME/Qt/6.4.0/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.2/clang_64/bin QT: $HOME/Qt/5.15.2/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.2/clang_64/bin QT: $HOME/Qt/5.15.2/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.2/clang_64/bin QT: $HOME/Qt/5.15.2/clang_64
QT_VERSION: Qt5_15 QT_VERSION: Qt5_15
BUILD_SYSTEM: "make" BUILD_SYSTEM: "make"
ARCH: x64 ARCH: x64
@ -304,7 +304,7 @@ for:
# Path before # Path before
- path - path
- set QTDIR=C:\%QT% - set QTDIR=C:\%QT%
- set PATH=%QTDIR%\bin;%QTDIR%\include;C:\Tools\PsTools;C:\Program Files\Git\cmd;C:\Program Files\Git\usr\bin;C:\Program Files\Git LFS;C:\Tools\GitVersion;C:\Windows\system32;C:\Windows;C:\Windows\System32\WindowsPowerShell\v1.0\ - set PATH=%QTDIR%\bin;%QTDIR%\include;C:\Qt\Tools\QtCreator\bin;C:\Tools\PsTools;C:\Program Files\Git\cmd;C:\Program Files\Git\usr\bin;C:\Program Files\Git LFS;C:\Tools\GitVersion;C:\Windows\system32;C:\Windows;C:\Windows\System32\WindowsPowerShell\v1.0\;%PYTHON%;%PYTHON%\Scripts
# Set VC variables for the platform # Set VC variables for the platform
- ps: | - ps: |
if ($env:COMPILER -eq "msvc") { if ($env:COMPILER -eq "msvc") {
@ -322,8 +322,6 @@ for:
} }
} }
} }
- set PATH=C:\Qt\Tools\QtCreator\bin;%PATH%
- set PATH=%PYTHON%;%PYTHON%\Scripts;%PATH%
# Path after # Path after
- path - path
# Check that we have the expected version for Python # Check that we have the expected version for Python
@ -335,7 +333,7 @@ for:
# Trick qmake to not work through MSYS # Trick qmake to not work through MSYS
- del /F "C:\Program Files\Git\usr\bin\sh.exe" - del /F "C:\Program Files\Git\usr\bin\sh.exe"
- del /F "C:\Program Files\Git\bin\sh.exe" - del /F "C:\Program Files\Git\bin\sh.exe"
- qmake -v - qmake.exe -v
- qbs --version - qbs --version
before_build: before_build:
@ -501,6 +499,9 @@ for:
- job_name: MacOS_10_15_Qt_5_15 (qbs, singlebundle) - job_name: MacOS_10_15_Qt_5_15 (qbs, singlebundle)
init: init:
- QTDIR=$QT
- PATH="$QTDIR/bin:$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
- sudo xcode-select -s /Applications/Xcode-$XCODE_VERSION.app - sudo xcode-select -s /Applications/Xcode-$XCODE_VERSION.app
@ -534,7 +535,7 @@ for:
fi fi
- qbs setup-toolchains --detect - qbs setup-toolchains --detect
- qbs config --list profiles - qbs config --list profiles
- qbs setup-qt ${QT}/qmake qt6 - qbs setup-qt ${QTDIR}/bin/qmake qt6
- qbs config defaultProfile qt6 - qbs config defaultProfile qt6
- qbs config profiles.qt6.baseProfile clang - qbs config profiles.qt6.baseProfile clang
- qbs build -f valentina.qbs -d ${APPVEYOR_BUILD_FOLDER}/build --command-echo-mode command-line config:release modules.buildconfig.enableUnitTests:false modules.buildconfig.enableMultiBundle:${MULTI_BUNDLE} qbs.installRoot:${APPVEYOR_BUILD_FOLDER}/build/install-root profile:qt6 project.enableConan:true project.minimumMacosVersion:${MACOS_DEPLOYMENT_TARGET} modules.buildconfig.enableCcache:false - qbs build -f valentina.qbs -d ${APPVEYOR_BUILD_FOLDER}/build --command-echo-mode command-line config:release modules.buildconfig.enableUnitTests:false modules.buildconfig.enableMultiBundle:${MULTI_BUNDLE} qbs.installRoot:${APPVEYOR_BUILD_FOLDER}/build/install-root profile:qt6 project.enableConan:true project.minimumMacosVersion:${MACOS_DEPLOYMENT_TARGET} modules.buildconfig.enableCcache:false
@ -548,13 +549,16 @@ for:
- job_name: MacOS_10_15_Qt_5_15 (make) - job_name: MacOS_10_15_Qt_5_15 (make)
init: init:
- QTDIR=$QT
- PATH="$QTDIR/bin:$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
- 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
- clang --version - clang --version
- ${QT}/qmake --version - qmake --version
- which ${QT}/qmake - which qmake
before_build: before_build:
- cd ${APPVEYOR_BUILD_FOLDER} - cd ${APPVEYOR_BUILD_FOLDER}
@ -563,7 +567,7 @@ for:
build_script: build_script:
- pwd - pwd
- ${QT}/qmake ../Valentina.pro -r CONFIG+=noDebugSymbols CONFIG+=checkWarnings CONFIG+=noTests CONFIG+=no_ccache - qmake ../Valentina.pro -r CONFIG+=noDebugSymbols CONFIG+=checkWarnings CONFIG+=noTests CONFIG+=no_ccache
- make -j$(nproc) - make -j$(nproc)
#---------------------------------# #---------------------------------#