mirror of
https://gitlab.com/smart-pattern/valentina.git
synced 2024-09-19 23:34:04 +02:00
Compare commits
5 commits
db67a484b9
...
da57bfc7b1
Author | SHA1 | Date | |
---|---|---|---|
da57bfc7b1 | |||
6a7d9c82d6 | |||
fdb8fc8f1f | |||
a21e1ddcd4 | |||
cce962ff66 |
|
@ -176,7 +176,8 @@ macos_task_template: &MACOS_TASK_TEMPLATE
|
||||||
- qbs --version
|
- qbs --version
|
||||||
build_script:
|
build_script:
|
||||||
- pwd
|
- pwd
|
||||||
- conan install . -s os=Macos -s os.version=${MACOS_DEPLOYMENT_TARGET} --build=xerces-c
|
- conan profile detect
|
||||||
|
- conan install . -s os=Macos -s os.version=${MACOS_DEPLOYMENT_TARGET} --build=xerces-c/3.2.4
|
||||||
- qbs setup-toolchains --detect
|
- qbs setup-toolchains --detect
|
||||||
- qbs config --list profiles
|
- qbs config --list profiles
|
||||||
- qbs setup-qt /opt/homebrew/opt/qt6/bin/qmake qt6
|
- qbs setup-qt /opt/homebrew/opt/qt6/bin/qmake qt6
|
||||||
|
|
17
appveyor.yml
17
appveyor.yml
|
@ -258,6 +258,16 @@ matrix:
|
||||||
job_name: Windows_Qt_5_15_(qbs_MSVC_x64)
|
job_name: Windows_Qt_5_15_(qbs_MSVC_x64)
|
||||||
- platform: x86
|
- platform: x86
|
||||||
job_name: Windows_Qt_5_6_(MSVC_x64)
|
job_name: Windows_Qt_5_6_(MSVC_x64)
|
||||||
|
- platform: x86
|
||||||
|
job_name: MacOS_12_Qt_6_4 (multibundle)
|
||||||
|
- platform: x86
|
||||||
|
job_name: MacOS_12_Qt_6_4 (singlebundle)
|
||||||
|
- platform: x86
|
||||||
|
job_name: MacOS_10_15_Qt_5_15 (qbs, multibundle)
|
||||||
|
- platform: x86
|
||||||
|
job_name: MacOS_10_15_Qt_5_15 (qbs, singlebundle)
|
||||||
|
- platform: x86
|
||||||
|
job_name: MacOS_10_15_Qt_5_15 (make)
|
||||||
- platform: x64
|
- platform: x64
|
||||||
job_name: Windows_Qt_5_15_(make_GCC_x86)
|
job_name: Windows_Qt_5_15_(make_GCC_x86)
|
||||||
- platform: x64
|
- platform: x64
|
||||||
|
@ -343,6 +353,7 @@ for:
|
||||||
& qbs-config.exe profiles.qt6.baseProfile $env:COMPILER
|
& qbs-config.exe profiles.qt6.baseProfile $env:COMPILER
|
||||||
}
|
}
|
||||||
- qbs-config --list profiles
|
- qbs-config --list profiles
|
||||||
|
- conan profile detect
|
||||||
|
|
||||||
build_script:
|
build_script:
|
||||||
- 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
|
||||||
|
@ -460,7 +471,7 @@ for:
|
||||||
init:
|
init:
|
||||||
- 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
|
||||||
- brew update > /dev/null
|
- brew update > /dev/null
|
||||||
- brew install coreutils qbs cmake
|
- brew install coreutils qbs cmake
|
||||||
|
@ -483,7 +494,7 @@ for:
|
||||||
- pwd
|
- pwd
|
||||||
- |
|
- |
|
||||||
if [[ "$ENABLE_CONAN" == "true" ]]; then
|
if [[ "$ENABLE_CONAN" == "true" ]]; then
|
||||||
conan install . -s os=Macos -s os.version=${MACOS_DEPLOYMENT_TARGET} --build=xerces-c
|
conan install . -s os=Macos -s os.version=${MACOS_DEPLOYMENT_TARGET} --build=xerces-c/3.2.4
|
||||||
fi
|
fi
|
||||||
- qbs setup-toolchains --detect
|
- qbs setup-toolchains --detect
|
||||||
- qbs config --list profiles
|
- qbs config --list profiles
|
||||||
|
@ -503,7 +514,7 @@ for:
|
||||||
init:
|
init:
|
||||||
- find /Applications -maxdepth 1 -type d -name 'Xcode*.ap
|
- find /Applications -maxdepth 1 -type d -name 'Xcode*.ap
|
||||||
- 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
|
- ${QT}/qmake --version
|
||||||
|
|
|
@ -1,11 +1,11 @@
|
||||||
import os
|
import os
|
||||||
|
|
||||||
from conans import ConanFile
|
from conan import ConanFile
|
||||||
|
|
||||||
class Recipe(ConanFile):
|
class Recipe(ConanFile):
|
||||||
settings = "os"
|
settings = "os"
|
||||||
requires = "xerces-c/[>=3.2,<4.0]"
|
requires = "xerces-c/[~3.2]"
|
||||||
default_options = {"xerces-c:shared": True}
|
default_options = {"xerces-c/*:shared": True}
|
||||||
|
|
||||||
def configure(self):
|
def configure(self):
|
||||||
if self.settings.os == "Linux":
|
if self.settings.os == "Linux":
|
||||||
|
|
151
qbs/imports/conan/ConanfileProbe.qbs
Normal file
151
qbs/imports/conan/ConanfileProbe.qbs
Normal file
|
@ -0,0 +1,151 @@
|
||||||
|
/****************************************************************************
|
||||||
|
**
|
||||||
|
** Copyright (C) 2020 Richard Weickelt
|
||||||
|
** Contact: http://www.qt.io/licensing
|
||||||
|
**
|
||||||
|
** This file is part of Qbs.
|
||||||
|
**
|
||||||
|
** Commercial License Usage
|
||||||
|
** Licensees holding valid commercial Qt licenses may use this file in
|
||||||
|
** accordance with the commercial license agreement provided with the
|
||||||
|
** Software or, alternatively, in accordance with the terms contained in
|
||||||
|
** a written agreement between you and The Qt Company. For licensing terms and
|
||||||
|
** conditions see http://www.qt.io/terms-conditions. For further information
|
||||||
|
** use the contact form at http://www.qt.io/contact-us.
|
||||||
|
**
|
||||||
|
** GNU Lesser General Public License Usage
|
||||||
|
** Alternatively, this file may be used under the terms of the GNU Lesser
|
||||||
|
** General Public License version 2.1 or version 3 as published by the Free
|
||||||
|
** Software Foundation and appearing in the file LICENSE.LGPLv21 and
|
||||||
|
** LICENSE.LGPLv3 included in the packaging of this file. Please review the
|
||||||
|
** following information to ensure the GNU Lesser General Public License
|
||||||
|
** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
|
||||||
|
** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
|
||||||
|
**
|
||||||
|
** In addition, as a special exception, The Qt Company gives you certain additional
|
||||||
|
** rights. These rights are described in The Qt Company LGPL Exception
|
||||||
|
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
|
||||||
|
**
|
||||||
|
****************************************************************************/
|
||||||
|
|
||||||
|
import qbs
|
||||||
|
import qbs.Process
|
||||||
|
import qbs.File
|
||||||
|
import qbs.FileInfo
|
||||||
|
import qbs.TextFile
|
||||||
|
import qbs.Utilities
|
||||||
|
|
||||||
|
Probe {
|
||||||
|
// Inputs
|
||||||
|
property stringList additionalArguments: []
|
||||||
|
property path conanfilePath
|
||||||
|
property path packageReference
|
||||||
|
property path executable: "conan"
|
||||||
|
property stringList generators: []
|
||||||
|
property var options
|
||||||
|
property var settings
|
||||||
|
property bool verbose: false
|
||||||
|
|
||||||
|
// Output
|
||||||
|
property var dependencies
|
||||||
|
property path generatedFilesPath
|
||||||
|
property var json
|
||||||
|
|
||||||
|
// Internal
|
||||||
|
// Ensure that the probe is re-run automatically whenever conanfile changes
|
||||||
|
// by making a file system property part of the probe's signature.
|
||||||
|
property int _conanfileLastModified: conanfilePath ? File.lastModified(conanfilePath) : 0
|
||||||
|
property path _projectBuildDirectory: project.buildDirectory
|
||||||
|
|
||||||
|
// TODO: If minimal qbs version is 1.23 replace with FileInfo.executableSuffix()
|
||||||
|
readonly property string executableSuffix: project.qbs.targetOS.contains("windows") ? ".exe" : ""
|
||||||
|
|
||||||
|
configure: {
|
||||||
|
if (executable === "conan")
|
||||||
|
executable = executable + executableSuffix;
|
||||||
|
|
||||||
|
if (conanfilePath && packageReference)
|
||||||
|
throw("conanfilePath and packageReference must not be defined at the same time.");
|
||||||
|
|
||||||
|
if (!conanfilePath && !packageReference)
|
||||||
|
throw("Either conanfilePath or packageReference must be defined.");
|
||||||
|
|
||||||
|
var reference = packageReference || FileInfo.cleanPath(conanfilePath);
|
||||||
|
console.info("Probing '" + reference + "'. This might take a while...");
|
||||||
|
if (conanfilePath && !File.exists(reference))
|
||||||
|
throw("The conanfile '" + reference + "' does not exist.");
|
||||||
|
|
||||||
|
var args = [
|
||||||
|
"install", reference,
|
||||||
|
];
|
||||||
|
|
||||||
|
if (options) {
|
||||||
|
if (typeof options !== "object")
|
||||||
|
throw("The property 'options' must be an object.");
|
||||||
|
Object.keys(options).forEach(function(key,index) {
|
||||||
|
args.push("-o");
|
||||||
|
args.push(key + "=" + options[key]);
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
if (settings) {
|
||||||
|
if (typeof settings !== "object")
|
||||||
|
throw("The property 'settings' must be an object.");
|
||||||
|
Object.keys(settings).forEach(function(key,index) {
|
||||||
|
args.push("-s");
|
||||||
|
args.push(key + "=" + settings[key]);
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
args = args.concat(["-f", "json"]);
|
||||||
|
|
||||||
|
for (var i = 0; i < generators.length; i++)
|
||||||
|
args = args.concat(["-g", generators[i]]);
|
||||||
|
|
||||||
|
for (var i = 0; i < additionalArguments.length; i++)
|
||||||
|
args.push(additionalArguments[i]);
|
||||||
|
|
||||||
|
generatedFilesPath = FileInfo.cleanPath(_projectBuildDirectory +
|
||||||
|
"/genconan/" +
|
||||||
|
Utilities.getHash(args.join()));
|
||||||
|
|
||||||
|
args = args.concat(["-of", generatedFilesPath]);
|
||||||
|
var p = new Process();
|
||||||
|
p.start(executable, args);
|
||||||
|
while (!p.waitForFinished(500)) {
|
||||||
|
const output = p.readStdOut();
|
||||||
|
if (verbose && output) {
|
||||||
|
console.info(output);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
while (!p.atEnd()) {
|
||||||
|
const output = p.readStdOut();
|
||||||
|
if (verbose && output) {
|
||||||
|
console.info(output);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if (p.exitCode()) {
|
||||||
|
const errorOutput = p.readStdErr();
|
||||||
|
p.close();
|
||||||
|
throw errorOutput;
|
||||||
|
}
|
||||||
|
p.close();
|
||||||
|
|
||||||
|
if (generators.contains("json")) {
|
||||||
|
if (!File.exists(generatedFilesPath + "/conanbuildinfo.json"))
|
||||||
|
throw("No conanbuildinfo.json has been generated.");
|
||||||
|
|
||||||
|
var jsonFile = new TextFile(generatedFilesPath + "/conanbuildinfo.json", TextFile.ReadOnly);
|
||||||
|
json = JSON.parse(jsonFile.readAll());
|
||||||
|
jsonFile.close();
|
||||||
|
|
||||||
|
dependencies = {};
|
||||||
|
for (var i = 0; i < json.dependencies.length; ++i) {
|
||||||
|
var dep = json.dependencies[i];
|
||||||
|
dependencies[dep.name] = dep;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
found = true;
|
||||||
|
}
|
||||||
|
}
|
|
@ -1,4 +1,4 @@
|
||||||
import qbs.Probes
|
import "qbs/imports/conan/ConanfileProbe.qbs" as ConanfileProbe
|
||||||
|
|
||||||
Project {
|
Project {
|
||||||
name: "Valentina"
|
name: "Valentina"
|
||||||
|
@ -7,7 +7,8 @@ Project {
|
||||||
property bool enableConan: false
|
property bool enableConan: false
|
||||||
property string minimumMacosVersion: undefined
|
property string minimumMacosVersion: undefined
|
||||||
|
|
||||||
Probes.ConanfileProbe {
|
// Temporary probe until qbs doesn't support conan 2.0
|
||||||
|
ConanfileProbe {
|
||||||
id: thirdPartyConanPackages
|
id: thirdPartyConanPackages
|
||||||
condition: enableConan
|
condition: enableConan
|
||||||
conanfilePath: project.sourceDirectory + "/conanfile.py"
|
conanfilePath: project.sourceDirectory + "/conanfile.py"
|
||||||
|
|
Loading…
Reference in a new issue