Compare commits
8 Commits
22cbbcadfd
...
d3ee5df455
Author | SHA1 | Date |
---|---|---|
Roman Telezhynskyi | d3ee5df455 | |
Roman Telezhynskyi | 62e66deb5e | |
Roman Telezhynskyi | c630b5cdf8 | |
Roman Telezhynskyi | f4efda8de6 | |
Roman Telezhynskyi | 12a12a2a45 | |
Roman Telezhynskyi | a829a2d2de | |
Roman Telezhynskyi | dfe40b7df4 | |
Roman Telezhynskyi | e72cebf473 |
|
@ -370,7 +370,7 @@ macos_task_template: &MACOS_TASK_TEMPLATE
|
||||||
- qbs --version
|
- qbs --version
|
||||||
build_script:
|
build_script:
|
||||||
- echo $PATH
|
- echo $PATH
|
||||||
- export PATH="${HOME}/.local/bin:`python3 -m site --user-base`/bin:$PATH"
|
- export PATH="${HOME}/.local/bin:`python3 -m site --user-base`/bin:$HOME/.cargo/bin:$PATH"
|
||||||
- echo $PATH
|
- echo $PATH
|
||||||
- whereis python3
|
- whereis python3
|
||||||
- sudo mkdir /usr/local/bin
|
- sudo mkdir /usr/local/bin
|
||||||
|
|
|
@ -421,7 +421,7 @@ for:
|
||||||
$env:CRASH_SHORT_SHA = git log --pretty=format:%h -n 1
|
$env:CRASH_SHORT_SHA = git log --pretty=format:%h -n 1
|
||||||
}
|
}
|
||||||
- ps: scripts/install_dump_sysms.ps1
|
- ps: scripts/install_dump_sysms.ps1
|
||||||
- if "%WITH_CRASH_REPORTING%" == "True" (python3 scripts/symupload.py %APPVEYOR_BUILD_FOLDER%\build\install-root\valentina $VALENTINA_VERSION $CRASH_SHORT_SHA $CRASH_QT_VERSION --clean)
|
- if "%WITH_CRASH_REPORTING%" == "True" (python scripts/symupload.py %APPVEYOR_BUILD_FOLDER%\build\install-root\valentina $VALENTINA_VERSION $CRASH_SHORT_SHA $CRASH_QT_VERSION --clean)
|
||||||
- if "%DEPLOY%" == "true" (qbs build -f valentina.qbs -d %APPVEYOR_BUILD_FOLDER%\build -p ValentinaSetup --jobs %NUMBER_OF_PROCESSORS% config:release qbs.installRoot:%APPVEYOR_BUILD_FOLDER%\build\install-root\valentina profile:qt6 project.enableConan:true project.conanWithCrashReporting:true project.conanWithXerces:true modules.buildconfig.enableCcache:false project.conanProfiles:valentina modules.buildconfig.enablePCH:%ENABLE_PCH% modules.windeployqt.windeployqtProgramBinPath:%WINDEPLOYQT_BIN_PATH% modules.windeployqt.compilerRuntime:%WINDEPLOYQT_COMPILER_RUNTIME% modules.windeployqt.noCompilerRuntime:%WINDEPLOYQT_NO_COMPILER_RUNTIME%)
|
- if "%DEPLOY%" == "true" (qbs build -f valentina.qbs -d %APPVEYOR_BUILD_FOLDER%\build -p ValentinaSetup --jobs %NUMBER_OF_PROCESSORS% config:release qbs.installRoot:%APPVEYOR_BUILD_FOLDER%\build\install-root\valentina profile:qt6 project.enableConan:true project.conanWithCrashReporting:true project.conanWithXerces:true modules.buildconfig.enableCcache:false project.conanProfiles:valentina modules.buildconfig.enablePCH:%ENABLE_PCH% modules.windeployqt.windeployqtProgramBinPath:%WINDEPLOYQT_BIN_PATH% modules.windeployqt.compilerRuntime:%WINDEPLOYQT_COMPILER_RUNTIME% modules.windeployqt.noCompilerRuntime:%WINDEPLOYQT_NO_COMPILER_RUNTIME%)
|
||||||
- ps: scripts/appveyor-deploy.ps1
|
- ps: scripts/appveyor-deploy.ps1
|
||||||
|
|
||||||
|
|
|
@ -122,25 +122,8 @@ Probe {
|
||||||
}
|
}
|
||||||
|
|
||||||
var p = new Process();
|
var p = new Process();
|
||||||
p.start(executable, args);
|
console.info("Start conan: " + executable + " " + args.join(" "));
|
||||||
while (!p.waitForFinished(500)) {
|
p.exec(executable, args, true);
|
||||||
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 (generators.contains("json")) {
|
||||||
if (!File.exists(generatedFilesPath + "/conanbuildinfo.json"))
|
if (!File.exists(generatedFilesPath + "/conanbuildinfo.json"))
|
||||||
|
|
|
@ -815,7 +815,7 @@ Module {
|
||||||
cpp.systemIncludePaths: {
|
cpp.systemIncludePaths: {
|
||||||
var paths = [FileInfo.joinPaths(product.buildDirectory, "qt.headers")];
|
var paths = [FileInfo.joinPaths(product.buildDirectory, "qt.headers")];
|
||||||
|
|
||||||
if (Utilities.versionCompare(Qt.core.version, "6") >= 0 && !useConanPackages)
|
if (Utilities.versionCompare(Qt.core.version, "6") >= 0)
|
||||||
{
|
{
|
||||||
var includePaths = product.cpp.includePaths;
|
var includePaths = product.cpp.includePaths;
|
||||||
|
|
||||||
|
|
|
@ -80,7 +80,7 @@ Module {
|
||||||
artifactNames.push(installRoot + "/" + targetApp + ".app/Contents/MacOS/" + input.fileName);
|
artifactNames.push(installRoot + "/" + targetApp + ".app/Contents/MacOS/" + input.fileName);
|
||||||
|
|
||||||
if (product.installDebugInformation)
|
if (product.installDebugInformation)
|
||||||
artifactNames.push(installRoot + "/" + targetApp + ".app/Contents/MacOS/" + input.fileName +
|
artifactNames.push(installRoot + "/" + targetApp + ".app/Contents/MacOS/" + input.fileName + ".app" +
|
||||||
product.cpp.debugInfoBundleSuffix);
|
product.cpp.debugInfoBundleSuffix);
|
||||||
});
|
});
|
||||||
|
|
||||||
|
@ -109,7 +109,7 @@ Module {
|
||||||
|
|
||||||
if (product.installDebugInformation)
|
if (product.installDebugInformation)
|
||||||
data.push({
|
data.push({
|
||||||
"source" : product.buildDirectory + "/" + input.fileName + product.cpp.debugInfoBundleSuffix,
|
"source" : product.buildDirectory + "/" + input.fileName + ".app" + product.cpp.debugInfoBundleSuffix,
|
||||||
"destination": installRoot + "/" + targetApp + ".app/Contents/MacOS/" + fileName +
|
"destination": installRoot + "/" + targetApp + ".app/Contents/MacOS/" + fileName +
|
||||||
product.cpp.debugInfoBundleSuffix
|
product.cpp.debugInfoBundleSuffix
|
||||||
});
|
});
|
||||||
|
|
|
@ -15,7 +15,7 @@ if ($env:WITH_CRASH_REPORTING -eq "True") {
|
||||||
$env:Path += ";$extractPath"
|
$env:Path += ";$extractPath"
|
||||||
|
|
||||||
# Check if dump_syms is callable
|
# Check if dump_syms is callable
|
||||||
if (Test-Path (Join-Path $extractedFolderPath "dump_syms.exe")) {
|
if (Test-Path (Join-Path $extractPath "dump_syms.exe")) {
|
||||||
Write-Host "dump_syms utility installed successfully and added to PATH."
|
Write-Host "dump_syms utility installed successfully and added to PATH."
|
||||||
} else {
|
} else {
|
||||||
Write-Host "Failed to install dump_syms utility."
|
Write-Host "Failed to install dump_syms utility."
|
||||||
|
|
|
@ -47,6 +47,7 @@ def generate_sym_files(install_root):
|
||||||
subprocess.run(dump_syms_cmd, check=True)
|
subprocess.run(dump_syms_cmd, check=True)
|
||||||
|
|
||||||
sym_files.append((debug_file, zip_sym(sym_file)))
|
sym_files.append((debug_file, zip_sym(sym_file)))
|
||||||
|
os.remove(sym_file)
|
||||||
|
|
||||||
return sym_files
|
return sym_files
|
||||||
|
|
||||||
|
@ -79,6 +80,8 @@ def get_app_name(sym_file):
|
||||||
elif platform == "darwin":
|
elif platform == "darwin":
|
||||||
if base_name.endswith(".framework"):
|
if base_name.endswith(".framework"):
|
||||||
return base_name.split(".framework")[0]
|
return base_name.split(".framework")[0]
|
||||||
|
elif base_name.endswith(".app"):
|
||||||
|
return base_name.split(".app")[0]
|
||||||
|
|
||||||
return base_name
|
return base_name
|
||||||
|
|
||||||
|
|
|
@ -14,6 +14,13 @@ VLib {
|
||||||
cpp.dynamicLibraries: ["Advapi32"]
|
cpp.dynamicLibraries: ["Advapi32"]
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Properties {
|
||||||
|
condition: buildconfig.useConanPackages && buildconfig.conanCrashReportingEnabled && qbs.targetOS.contains("macos")
|
||||||
|
cpp.libraryPaths: ["/usr/lib"]
|
||||||
|
cpp.dynamicLibraries: ["bsm"]
|
||||||
|
cpp.frameworks: ["AppKit", "Security"]
|
||||||
|
}
|
||||||
|
|
||||||
name: "VMiscLib"
|
name: "VMiscLib"
|
||||||
files: {
|
files: {
|
||||||
var files = [
|
var files = [
|
||||||
|
|
|
@ -30,6 +30,13 @@ VTestApp {
|
||||||
cpp.dynamicLibraries: ["Advapi32"]
|
cpp.dynamicLibraries: ["Advapi32"]
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Properties {
|
||||||
|
condition: buildconfig.useConanPackages && buildconfig.conanCrashReportingEnabled && qbs.targetOS.contains("macos")
|
||||||
|
cpp.libraryPaths: ["/usr/lib"]
|
||||||
|
cpp.dynamicLibraries: ["bsm"]
|
||||||
|
cpp.frameworks: ["AppKit", "Security"]
|
||||||
|
}
|
||||||
|
|
||||||
name: "CollectionTest"
|
name: "CollectionTest"
|
||||||
buildconfig.appTarget: qbs.targetOS.contains("macos") ? "CollectionTest" : "collectionTest"
|
buildconfig.appTarget: qbs.targetOS.contains("macos") ? "CollectionTest" : "collectionTest"
|
||||||
targetName: buildconfig.appTarget
|
targetName: buildconfig.appTarget
|
||||||
|
|
|
@ -29,6 +29,13 @@ VTestApp {
|
||||||
cpp.dynamicLibraries: ["Advapi32"]
|
cpp.dynamicLibraries: ["Advapi32"]
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Properties {
|
||||||
|
condition: buildconfig.useConanPackages && buildconfig.conanCrashReportingEnabled && qbs.targetOS.contains("macos")
|
||||||
|
cpp.libraryPaths: ["/usr/lib"]
|
||||||
|
cpp.dynamicLibraries: ["bsm"]
|
||||||
|
cpp.frameworks: ["AppKit", "Security"]
|
||||||
|
}
|
||||||
|
|
||||||
name: "TranslationsTest"
|
name: "TranslationsTest"
|
||||||
buildconfig.appTarget: qbs.targetOS.contains("macos") ? "TranslationsTest" : "translationsTest"
|
buildconfig.appTarget: qbs.targetOS.contains("macos") ? "TranslationsTest" : "translationsTest"
|
||||||
targetName: buildconfig.appTarget
|
targetName: buildconfig.appTarget
|
||||||
|
|
Loading…
Reference in New Issue