mirror of
https://gitlab.com/smart-pattern/valentina.git
synced 2024-09-18 23:04:03 +02:00
Compare commits
10 commits
e4cc5b52bc
...
d590b8aa3a
Author | SHA1 | Date | |
---|---|---|---|
d590b8aa3a | |||
bc6ff3df0d | |||
e857dc6a8d | |||
96d2529055 | |||
6330d574d3 | |||
232e1f049a | |||
e368b3d2b7 | |||
5486c208c3 | |||
69fe8c01d9 | |||
4b98e304d3 |
|
@ -238,7 +238,7 @@ macos_task_template: &MACOS_TASK_TEMPLATE
|
||||||
- chmod -R 755 /opt/homebrew/opt/poppler/*
|
- chmod -R 755 /opt/homebrew/opt/poppler/*
|
||||||
- chmod -R 755 /opt/homebrew/opt/xerces-c/*
|
- chmod -R 755 /opt/homebrew/opt/xerces-c/*
|
||||||
- python3 --version
|
- python3 --version
|
||||||
- pip3 install --user --upgrade pip dropbox
|
- pip3 install --user --upgrade pip dropbox 'urllib3<2.0'
|
||||||
- ccache --set-config sloppiness=pch_defines,time_macros max_size="$CCACHE_SIZE"
|
- ccache --set-config sloppiness=pch_defines,time_macros max_size="$CCACHE_SIZE"
|
||||||
- qmake --version
|
- qmake --version
|
||||||
- which qmake
|
- which qmake
|
||||||
|
|
14
appveyor.yml
14
appveyor.yml
|
@ -608,7 +608,7 @@ for:
|
||||||
secure: B8yHPBym+BTDPK5ZCg7WlSnUCHLbcim8WqLTC6/PSNs=
|
secure: B8yHPBym+BTDPK5ZCg7WlSnUCHLbcim8WqLTC6/PSNs=
|
||||||
|
|
||||||
cache:
|
cache:
|
||||||
- /Users/appveyor/.conan/data -> conanfile.py
|
#- /Users/appveyor/.conan/data -> conanfile.py
|
||||||
- /Users/appveyor/cache_dir
|
- /Users/appveyor/cache_dir
|
||||||
|
|
||||||
init:
|
init:
|
||||||
|
@ -654,8 +654,7 @@ for:
|
||||||
|
|
||||||
before_build:
|
before_build:
|
||||||
- ls ${HOME}/Qt
|
- ls ${HOME}/Qt
|
||||||
- export QTDIR="${HOME}/${QT}"
|
- export PATH="$HOME/.local/bin:`python3 -m site --user-base`/bin:$PATH"
|
||||||
- export PATH="$QTDIR/bin:$HOME/.local/bin:`python3 -m site --user-base`/bin:${HOME}/Qt/Qt Creator.app/Contents/MacOS:$PATH"
|
|
||||||
- echo $PATH
|
- echo $PATH
|
||||||
- python3 --version
|
- python3 --version
|
||||||
- whereis python3
|
- whereis python3
|
||||||
|
@ -716,11 +715,14 @@ for:
|
||||||
|
|
||||||
fi
|
fi
|
||||||
- sudo python3 -m pip install --upgrade pip
|
- sudo python3 -m pip install --upgrade pip
|
||||||
- pip3 install --user --upgrade pip dropbox
|
- pip3 install --user --upgrade pip dropbox 'urllib3<2.0'
|
||||||
- export PATH="$PATH:`python3 -m site --user-base`/bin"
|
- export QTDIR=`$(brew --prefix qt6)`
|
||||||
|
- export PATH="$PATH:`python3 -m site --user-base`/bin:$QTDIR/bin"
|
||||||
- echo $PATH
|
- echo $PATH
|
||||||
- python3 --version
|
- python3 --version
|
||||||
- clang --version
|
- clang --version
|
||||||
|
# Annoying clang issue: clang++ does not respect -isystem flag
|
||||||
|
- rm /usr/local/include/xercesc
|
||||||
- qmake --version
|
- qmake --version
|
||||||
- which qmake
|
- which qmake
|
||||||
- which qbs
|
- which qbs
|
||||||
|
@ -847,7 +849,7 @@ for:
|
||||||
- sudo ln -s /Library/Developer/CommandLineTools/usr/bin/python3 /Library/Developer/CommandLineTools/usr/bin/python
|
- sudo ln -s /Library/Developer/CommandLineTools/usr/bin/python3 /Library/Developer/CommandLineTools/usr/bin/python
|
||||||
- whereis python
|
- whereis python
|
||||||
- sudo python3 -m pip install --upgrade pip
|
- sudo python3 -m pip install --upgrade pip
|
||||||
- pip3 install --user --upgrade pip dropbox conan==1.61.0
|
- pip3 install --user --upgrade pip dropbox conan==1.61.0 'urllib3<2.0'
|
||||||
- conan --version
|
- conan --version
|
||||||
- clang --version
|
- clang --version
|
||||||
- qmake --version
|
- qmake --version
|
||||||
|
|
|
@ -1,4 +1,5 @@
|
||||||
import qbs.FileInfo
|
import qbs.FileInfo
|
||||||
|
import qbs.File
|
||||||
import qbs.Utilities
|
import qbs.Utilities
|
||||||
|
|
||||||
Module {
|
Module {
|
||||||
|
@ -829,6 +830,15 @@ Module {
|
||||||
paths.push(includePaths[i]);
|
paths.push(includePaths[i]);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (qbs.targetOS.contains("unix"))
|
||||||
|
{
|
||||||
|
var xercescHeaders = "/usr/local/include/xercesc";
|
||||||
|
if (File.exists(xercescHeaders) && !paths.contains(xercescHeaders))
|
||||||
|
{
|
||||||
|
paths.push(xercescHeaders);
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (Utilities.versionCompare(qbs.version, "1.22") < 0)
|
if (Utilities.versionCompare(qbs.version, "1.22") < 0)
|
||||||
|
|
|
@ -16,6 +16,7 @@ Module {
|
||||||
property string path
|
property string path
|
||||||
property string sourceDirectory: project.sourceDirectory
|
property string sourceDirectory: project.sourceDirectory
|
||||||
property string qtVersion: product.Qt.core.version
|
property string qtVersion: product.Qt.core.version
|
||||||
|
property string architecture: product.qbs.architecture
|
||||||
|
|
||||||
configure: {
|
configure: {
|
||||||
if (Utilities.versionCompare(qtVersion, "6") >= 0) {
|
if (Utilities.versionCompare(qtVersion, "6") >= 0) {
|
||||||
|
@ -34,7 +35,7 @@ Module {
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
var binPath = sourceDirectory + "/dist/macx/bin64/pdftops";
|
var binPath = sourceDirectory + "/dist/macx/bin64/pdftops";
|
||||||
if (product.qbs.architecture.contains("x86_64") && File.exists(binPath)) {
|
if (architecture.contains("x86_64") && File.exists(binPath)) {
|
||||||
path = binPath;
|
path = binPath;
|
||||||
found = true;
|
found = true;
|
||||||
}
|
}
|
||||||
|
|
|
@ -137,7 +137,8 @@ def run_clean(refresh_token):
|
||||||
r'^valentina-WindowsXP\+-mingw-x86-Qt.*-develop-[a-f0-9]{40}\.tar\.xz$',
|
r'^valentina-WindowsXP\+-mingw-x86-Qt.*-develop-[a-f0-9]{40}\.tar\.xz$',
|
||||||
r'^valentina-macOS_11\+-Qt.*-x64-develop-[a-f0-9]{40}\.dmg$',
|
r'^valentina-macOS_11\+-Qt.*-x64-develop-[a-f0-9]{40}\.dmg$',
|
||||||
r'^valentina-macOS_10.13\+-Qt.*-x64-develop-[a-f0-9]{40}\.dmg$',
|
r'^valentina-macOS_10.13\+-Qt.*-x64-develop-[a-f0-9]{40}\.dmg$',
|
||||||
r'^valentina-macOS.*\+-Qt.*-arm.*-develop-[a-f0-9]{40}\.dmg$']
|
r'^valentina-macOS.*\+-Qt.*-arm.*-develop-[a-f0-9]{40}\.dmg$',
|
||||||
|
r'^valentina-macOS.*\+-Qt.*-arm.*-develop-multibundle-[a-f0-9]{40}\.dmg$']
|
||||||
|
|
||||||
item_types = {}
|
item_types = {}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue