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

Optimize working with paths.

Browse Source 
FileInfo.pathSeparator() available only since qbs 1.22.
Use FileInfo.joinPaths() only when necessary.
This commit is contained in:
Roman Telezhynskyi 2023-01-17 13:00:35 +03:00
parent 74bd52652e
commit c8bd8aeb2c
10 changed files with 117 additions and 121 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
qbs/imports/VApp.qbs
View File

@ -46,33 +46,33 @@ CppApplication {
// Qt from scratch without OpenSSL support. // Qt from scratch without OpenSSL support.
condition: qbs.targetOS.contains("windows") && (qbs.architecture.contains("x86_64") || qbs.architecture.contains("x86")) condition: qbs.targetOS.contains("windows") && (qbs.architecture.contains("x86_64") || qbs.architecture.contains("x86"))
name: "openssl" name: "openssl"
prefix: FileInfo.joinPaths(project.sourceDirectory, "dist", "win", "openssl", FileInfo.pathSeparator()) prefix: project.sourceDirectory + "/dist/win/"
files: { files: {
var files = []; var files = [];
// Minimal supported OpenSSL version since Qt 5.12.4 is 1.1.1. // Minimal supported OpenSSL version since Qt 5.12.4 is 1.1.1.
if (Qt.core.versionMajor >= 5 && Qt.core.versionMinor >= 12 && Qt.core.versionPatch >= 4) { if (Qt.core.versionMajor >= 5 && Qt.core.versionMinor >= 12 && Qt.core.versionPatch >= 4) {
if (qbs.architecture.contains("x86_64")) { if (qbs.architecture.contains("x86_64")) {
files.push( files.push(
FileInfo.joinPaths("win64", "libcrypto-1_1-x64.dll"), "openssl/win64/libcrypto-1_1-x64.dll",
FileInfo.joinPaths("win64", "libssl-1_1-x64.dll") "openssl/win64/libssl-1_1-x64.dll"
); );
} else { } else {
files.push( files.push(
FileInfo.joinPaths("win32", "libcrypto-1_1.dll"), "openssl/win32/libcrypto-1_1.dll",
FileInfo.joinPaths("win32", "libssl-1_1.dll") "openssl/win32/libssl-1_1.dll"
); );
} }
} else { } else {
files.push("msvcr120.dll"); files.push("msvcr120.dll");
if (qbs.architecture.contains("x86_64")) { if (qbs.architecture.contains("x86_64")) {
files.push( files.push(
FileInfo.joinPaths("win64", "libeay32.dll"), "openssl/win64/libeay32.dll",
FileInfo.joinPaths("win64", "ssleay32.dll") "openssl/win64/ssleay32.dll"
); );
} else { } else {
files.push( files.push(
FileInfo.joinPaths("win32", "libeay32.dll"), "openssl/win32/libeay32.dll",
FileInfo.joinPaths("win32", "ssleay32.dll") "openssl/win32/ssleay32.dll"
); );
} }
} }

4
qbs/imports/VToolApp.qbs
View File

@ -23,7 +23,7 @@ VApp {
Group { Group {
name: "freedesktop" name: "freedesktop"
prefix: FileInfo.joinPaths(project.sourceDirectory, "dist", FileInfo.pathSeparator()) prefix: project.sourceDirectory + "/dist/"
files: [ files: [
"ua.com.smart-pattern." + product.targetName + ".desktop" "ua.com.smart-pattern." + product.targetName + ".desktop"
] ]
@ -38,7 +38,7 @@ VApp {
Group { Group {
name: "Translations" name: "Translations"
prefix: FileInfo.joinPaths(project.sourceDirectory, "share", "translations", FileInfo.pathSeparator()) prefix: project.sourceDirectory + "/share/translations/"
files: { files: {
var files = []; var files = [];

2
qbs/modules/buildconfig/buildconfig.qbs
View File

@ -801,7 +801,7 @@ Module {
Group { Group {
name: "Precompiled headers" name: "Precompiled headers"
condition: buildconfig.enablePCH condition: buildconfig.enablePCH
prefix: FileInfo.joinPaths(product.sourceDirectory, FileInfo.pathSeparator()) prefix: product.sourceDirectory + "/"
files: { files: {
var files = ["stable.h"]; var files = ["stable.h"];
if (qbs.toolchain.contains("msvc")) if (qbs.toolchain.contains("msvc"))

4
qbs/modules/tenv/tenv.qbs
View File

@ -28,7 +28,7 @@ Module {
})); }));
artifactNames = artifactNames.concat((inputs["multisize_tables"] || []).map(function(file){ artifactNames = artifactNames.concat((inputs["multisize_tables"] || []).map(function(file){
return FileInfo.joinPaths(product.buildDirectory, "tables", "multisize",file.fileName); return FileInfo.joinPaths(product.buildDirectory, "tables/multisize",file.fileName);
})); }));
artifactNames = artifactNames.concat((inputs["label_templates"] || []).map(function(file){ artifactNames = artifactNames.concat((inputs["label_templates"] || []).map(function(file){
@ -92,7 +92,7 @@ Module {
})); }));
destination = destination.concat((inputs["multisize_tables"] || []).map(function(artifact) { destination = destination.concat((inputs["multisize_tables"] || []).map(function(artifact) {
return FileInfo.joinPaths(product.buildDirectory, "tables", "multisize", artifact.fileName); return FileInfo.joinPaths(product.buildDirectory, "tables/multisize", artifact.fileName);
})); }));
destination = destination.concat((inputs["label_templates"] || []).map(function(artifact) { destination = destination.concat((inputs["label_templates"] || []).map(function(artifact) {

4
share/translations/measurements.qbs
View File

@ -9,7 +9,7 @@ Product {
Group { Group {
name: "Headers" name: "Headers"
prefix: FileInfo.joinPaths(project.sourceDirectory, "src", FileInfo.pathSeparator()) prefix: project.sourceDirectory + "/src/"
files: [ files: [
"libs/vpatterndb/vtranslatemeasurements.h" "libs/vpatterndb/vtranslatemeasurements.h"
] ]
@ -18,7 +18,7 @@ Product {
Group { Group {
name: "Sources" name: "Sources"
prefix: FileInfo.joinPaths(project.sourceDirectory, "src", FileInfo.pathSeparator()) prefix: project.sourceDirectory + "/src/"
files: [ files: [
"libs/vpatterndb/vtranslatemeasurements.cpp" "libs/vpatterndb/vtranslatemeasurements.cpp"
] ]

6
share/translations/translations.qbs
View File

@ -9,7 +9,7 @@ Product {
Group { Group {
name: "Headers" name: "Headers"
prefix: FileInfo.joinPaths(project.sourceDirectory, "src", FileInfo.pathSeparator()) prefix: project.sourceDirectory + "/src/"
files: [ files: [
"app/**/*.h", "app/**/*.h",
"app/**/*.hpp", "app/**/*.hpp",
@ -24,7 +24,7 @@ Product {
Group { Group {
name: "Sources" name: "Sources"
prefix: FileInfo.joinPaths(project.sourceDirectory, "src", FileInfo.pathSeparator()) prefix: project.sourceDirectory + "/src/"
files: [ files: [
"app/**/*.cpp", "app/**/*.cpp",
"app/**/*.js", "app/**/*.js",
@ -41,7 +41,7 @@ Product {
Group { Group {
name: "Forms" name: "Forms"
prefix: FileInfo.joinPaths(project.sourceDirectory, "src", FileInfo.pathSeparator()) prefix: project.sourceDirectory + "/src/"
files: [ files: [
"app/**/*.ui", "app/**/*.ui",
"libs/**/*.ui" "libs/**/*.ui"

31
src/app/puzzle/puzzle.qbs
View File

@ -160,8 +160,7 @@ VToolApp {
cpp.defines: { cpp.defines: {
var defines = []; var defines = [];
var extension = qbs.targetOS.contains("windows") ? ".exe" : ""; var extension = qbs.targetOS.contains("windows") ? ".exe" : "";
defines.push('PUZZLE_BUILDDIR="' + exportingProduct.buildDirectory + FileInfo.pathSeparator() + defines.push('PUZZLE_BUILDDIR="' + FileInfo.joinPaths(exportingProduct.buildDirectory, exportingProduct.targetName + extension) +'"');
exportingProduct.targetName + extension +'"');
return defines; return defines;
} }
} }
@ -169,7 +168,7 @@ VToolApp {
Group { Group {
condition: qbs.targetOS.contains("windows") && (qbs.architecture.contains("x86_64") || qbs.architecture.contains("x86")) condition: qbs.targetOS.contains("windows") && (qbs.architecture.contains("x86_64") || qbs.architecture.contains("x86"))
name: "pdftops Windows" name: "pdftops Windows"
prefix: FileInfo.joinPaths(project.sourceDirectory, "dist", "win", FileInfo.pathSeparator()) prefix: project.sourceDirectory + "/dist/win/"
files: ["pdftops.exe"] files: ["pdftops.exe"]
fileTags: ["pdftops_dist_win"] fileTags: ["pdftops_dist_win"]
qbs.install: true qbs.install: true
@ -179,7 +178,7 @@ VToolApp {
Group { Group {
condition: qbs.targetOS.contains("macos") && qbs.architecture.contains("x86_64") condition: qbs.targetOS.contains("macos") && qbs.architecture.contains("x86_64")
name: "pdftops MacOS" name: "pdftops MacOS"
prefix: FileInfo.joinPaths(project.sourceDirectory, "dist", "macx", "bin64", FileInfo.pathSeparator()) prefix: project.sourceDirectory + "/dist/macx/bin64/"
files: ["pdftops"] files: ["pdftops"]
fileTags: ["pdftops_dist_macx"] fileTags: ["pdftops_dist_macx"]
qbs.install: true qbs.install: true
@ -188,70 +187,70 @@ VToolApp {
Group { Group {
name: "48x48/apps" name: "48x48/apps"
prefix: FileInfo.joinPaths(project.sourceDirectory, "share", "icons", "48x48", "apps", FileInfo.pathSeparator()) prefix: project.sourceDirectory + "/share/icons/48x48/apps/"
files: "puzzle.png" files: "puzzle.png"
fileTags: "freedesktop.48x48AppsIcons" fileTags: "freedesktop.48x48AppsIcons"
} }
Group { Group {
name: "64x64/apps" name: "64x64/apps"
prefix: FileInfo.joinPaths(project.sourceDirectory, "share", "icons", "64x64", "apps", FileInfo.pathSeparator()) prefix: project.sourceDirectory + "/share/icons/64x64/apps/"
files: "puzzle.png" files: "puzzle.png"
fileTags: "freedesktop.64x64AppsIcons" fileTags: "freedesktop.64x64AppsIcons"
} }
Group { Group {
name: "128x128/apps" name: "128x128/apps"
prefix: FileInfo.joinPaths(project.sourceDirectory, "share", "icons", "128x128", "apps", FileInfo.pathSeparator()) prefix: project.sourceDirectory + "/share/icons/128x128/apps/"
files: "puzzle.png" files: "puzzle.png"
fileTags: "freedesktop.128x128AppsIcons" fileTags: "freedesktop.128x128AppsIcons"
} }
Group { Group {
name: "256x256/apps" name: "256x256/apps"
prefix: FileInfo.joinPaths(project.sourceDirectory, "share", "icons", "256x256", "apps", FileInfo.pathSeparator()) prefix: project.sourceDirectory + "/share/icons/256x256/apps/"
files: "puzzle.png" files: "puzzle.png"
fileTags: "freedesktop.256x256AppsIcons" fileTags: "freedesktop.256x256AppsIcons"
} }
Group { Group {
name: "512x512/apps" name: "512x512/apps"
prefix: FileInfo.joinPaths(project.sourceDirectory, "share", "icons", "512x512", "apps", FileInfo.pathSeparator()) prefix: project.sourceDirectory + "/share/icons/512x512/apps/"
files: "puzzle.png" files: "puzzle.png"
fileTags: "freedesktop.512x512AppsIcons" fileTags: "freedesktop.512x512AppsIcons"
} }
Group { Group {
name: "apps48x48/mimetypes" name: "apps48x48/mimetypes"
prefix: FileInfo.joinPaths(project.sourceDirectory, "share", "icons", "48x48", "mimetypes", FileInfo.pathSeparator()) prefix: project.sourceDirectory + "/share/icons/48x48/mimetypes/"
files: "application-x-valentina-layout.png" files: "application-x-valentina-layout.png"
fileTags: "freedesktop.48x48MimetypesIcons" fileTags: "freedesktop.48x48MimetypesIcons"
} }
Group { Group {
name: "apps64x64/mimetypes" name: "apps64x64/mimetypes"
prefix: FileInfo.joinPaths(project.sourceDirectory, "share", "icons", "64x64", "mimetypes", FileInfo.pathSeparator()) prefix: project.sourceDirectory + "/share/icons/64x64/mimetypes/"
files: "application-x-valentina-layout.png" files: "application-x-valentina-layout.png"
fileTags: "freedesktop.64x64MimetypesIcons" fileTags: "freedesktop.64x64MimetypesIcons"
} }
Group { Group {
name: "apps128x128/mimetypes" name: "apps128x128/mimetypes"
prefix: FileInfo.joinPaths(project.sourceDirectory, "share", "icons", "128x128", "mimetypes", FileInfo.pathSeparator()) prefix: project.sourceDirectory + "/share/icons/128x128/mimetypes/"
files: "application-x-valentina-layout.png" files: "application-x-valentina-layout.png"
fileTags: "freedesktop.128x128MimetypesIcons" fileTags: "freedesktop.128x128MimetypesIcons"
} }
Group { Group {
name: "apps256x256/mimetypes" name: "apps256x256/mimetypes"
prefix: FileInfo.joinPaths(project.sourceDirectory, "share", "icons", "256x256", "mimetypes", FileInfo.pathSeparator()) prefix: project.sourceDirectory + "/share/icons/256x256/mimetypes/"
files: "application-x-valentina-layout.png" files: "application-x-valentina-layout.png"
fileTags: "freedesktop.256x256MimetypesIcons" fileTags: "freedesktop.256x256MimetypesIcons"
} }
Group { Group {
name: "apps512x512/mimetypes" name: "apps512x512/mimetypes"
prefix: FileInfo.joinPaths(project.sourceDirectory, "share", "icons", "512x512", "mimetypes", FileInfo.pathSeparator()) prefix: project.sourceDirectory + "/share/icons/512x512/mimetypes/"
files: "application-x-valentina-layout.png" files: "application-x-valentina-layout.png"
fileTags: "freedesktop.512x512MimetypesIcons" fileTags: "freedesktop.512x512MimetypesIcons"
} }
@ -260,12 +259,12 @@ VToolApp {
condition: qbs.targetOS.contains("macos") condition: qbs.targetOS.contains("macos")
fileTagsFilter: "qm" fileTagsFilter: "qm"
qbs.install: true qbs.install: true
qbs.installDir: buildconfig.installDataPath + FileInfo.pathSeparator() + "translations" qbs.installDir: buildconfig.installDataPath + "/translations"
} }
Group { Group {
name: "Puzzle RC" name: "Puzzle RC"
prefix: FileInfo.joinPaths(product.sourceDirectory, "share", "resources", FileInfo.pathSeparator()) prefix: product.sourceDirectory + "/share/resources/"
files: "puzzle.rc" files: "puzzle.rc"
} }
} }

41
src/app/tape/tape.qbs
View File

@ -83,101 +83,100 @@ VToolApp {
cpp.defines: { cpp.defines: {
var defines = []; var defines = [];
var extension = qbs.targetOS.contains("windows") ? ".exe" : ""; var extension = qbs.targetOS.contains("windows") ? ".exe" : "";
defines.push('TAPE_BUILDDIR="' + exportingProduct.buildDirectory + FileInfo.pathSeparator() + defines.push('TAPE_BUILDDIR="' + FileInfo.joinPaths(exportingProduct.buildDirectory, exportingProduct.targetName + extension) +'"');
exportingProduct.targetName + extension +'"');
return defines; return defines;
} }
} }
Group { Group {
name: "Multisize tables" name: "Multisize tables"
prefix: FileInfo.joinPaths(project.sourceDirectory, "src", "app", "share", "tables", "multisize", FileInfo.pathSeparator()) prefix: project.sourceDirectory + "/src/app/share/tables/multisize/"
files: [ files: [
"GOST_man_ru.vst" "GOST_man_ru.vst"
] ]
fileTags: ["multisize_tables"] fileTags: ["multisize_tables"]
qbs.install: true qbs.install: true
qbs.installDir: buildconfig.installDataPath + FileInfo.pathSeparator() + "tables" + FileInfo.pathSeparator() + "multisize" qbs.installDir: buildconfig.installDataPath + "/tables/multisize"
} }
Group { Group {
name: "Measurements templates" name: "Measurements templates"
prefix: FileInfo.joinPaths(project.sourceDirectory, "src", "app", "share", "tables", "templates", FileInfo.pathSeparator()) prefix: project.sourceDirectory + "/src/app/share/tables/templates/"
files: [ files: [
"template_all_measurements.vit", "template_all_measurements.vit",
"t_Aldrich_Women.vit" "t_Aldrich_Women.vit"
] ]
fileTags: ["measurements_templates"] fileTags: ["measurements_templates"]
qbs.install: true qbs.install: true
qbs.installDir: buildconfig.installDataPath + FileInfo.pathSeparator() + "tables" + FileInfo.pathSeparator() + "templates" qbs.installDir: buildconfig.installDataPath + "/tables/templates"
} }
Group { Group {
name: "48x48/apps" name: "48x48/apps"
prefix: FileInfo.joinPaths(project.sourceDirectory, "share", "icons", "48x48", "apps", FileInfo.pathSeparator()) prefix: project.sourceDirectory + "/share/icons/48x48/apps/"
files: "tape.png" files: "tape.png"
fileTags: "freedesktop.48x48AppsIcons" fileTags: "freedesktop.48x48AppsIcons"
} }
Group { Group {
name: "64x64/apps" name: "64x64/apps"
prefix: FileInfo.joinPaths(project.sourceDirectory, "share", "icons", "64x64", "apps", FileInfo.pathSeparator()) prefix: project.sourceDirectory + "/share/icons/64x64/apps/"
files: "tape.png" files: "tape.png"
fileTags: "freedesktop.64x64AppsIcons" fileTags: "freedesktop.64x64AppsIcons"
} }
Group { Group {
name: "128x128/apps" name: "128x128/apps"
prefix: FileInfo.joinPaths(project.sourceDirectory, "share", "icons", "128x128", "apps", FileInfo.pathSeparator()) prefix: project.sourceDirectory + "/share/icons/128x128/apps/"
files: "tape.png" files: "tape.png"
fileTags: "freedesktop.128x128AppsIcons" fileTags: "freedesktop.128x128AppsIcons"
} }
Group { Group {
name: "256x256/apps" name: "256x256/apps"
prefix: FileInfo.joinPaths(project.sourceDirectory, "share", "icons", "256x256", "apps", FileInfo.pathSeparator()) prefix: project.sourceDirectory + "/share/icons/256x256/apps/"
files: "tape.png" files: "tape.png"
fileTags: "freedesktop.256x256AppsIcons" fileTags: "freedesktop.256x256AppsIcons"
} }
Group { Group {
name: "512x512/apps" name: "512x512/apps"
prefix: FileInfo.joinPaths(project.sourceDirectory, "share", "icons", "512x512", "apps", FileInfo.pathSeparator()) prefix: project.sourceDirectory + "/share/icons/512x512/apps/"
files: "tape.png" files: "tape.png"
fileTags: "freedesktop.512x512AppsIcons" fileTags: "freedesktop.512x512AppsIcons"
} }
Group { Group {
name: "apps48x48/mimetypes" name: "apps48x48/mimetypes"
prefix: FileInfo.joinPaths(project.sourceDirectory, "share", "icons", "48x48", "mimetypes", FileInfo.pathSeparator()) prefix: project.sourceDirectory + "/share/icons/48x48/mimetypes/"
files: ["application-x-valentina-i-measurements.png", "application-x-valentina-s-measurements.png"] files: ["application-x-valentina-i-measurements.png", "application-x-valentina-s-measurements.png"]
fileTags: "freedesktop.48x48MimetypesIcons" fileTags: "freedesktop.48x48MimetypesIcons"
} }
Group { Group {
name: "apps64x64/mimetypes" name: "apps64x64/mimetypes"
prefix: FileInfo.joinPaths(project.sourceDirectory, "share", "icons", "64x64", "mimetypes", FileInfo.pathSeparator()) prefix: project.sourceDirectory + "/share/icons/64x64/mimetypes/"
files: ["application-x-valentina-i-measurements.png", "application-x-valentina-s-measurements.png"] files: ["application-x-valentina-i-measurements.png", "application-x-valentina-s-measurements.png"]
fileTags: "freedesktop.64x64MimetypesIcons" fileTags: "freedesktop.64x64MimetypesIcons"
} }
Group { Group {
name: "apps128x128/mimetypes" name: "apps128x128/mimetypes"
prefix: FileInfo.joinPaths(project.sourceDirectory, "share", "icons", "128x128", "mimetypes", FileInfo.pathSeparator()) prefix: project.sourceDirectory + "/share/icons/128x128/mimetypes/"
files: ["application-x-valentina-i-measurements.png", "application-x-valentina-s-measurements.png"] files: ["application-x-valentina-i-measurements.png", "application-x-valentina-s-measurements.png"]
fileTags: "freedesktop.128x128MimetypesIcons" fileTags: "freedesktop.128x128MimetypesIcons"
} }
Group { Group {
name: "apps256x256/mimetypes" name: "apps256x256/mimetypes"
prefix: FileInfo.joinPaths(project.sourceDirectory, "share", "icons", "256x256", "mimetypes", FileInfo.pathSeparator()) prefix: project.sourceDirectory + "/share/icons/256x256/mimetypes/"
files: ["application-x-valentina-i-measurements.png", "application-x-valentina-s-measurements.png"] files: ["application-x-valentina-i-measurements.png", "application-x-valentina-s-measurements.png"]
fileTags: "freedesktop.256x256MimetypesIcons" fileTags: "freedesktop.256x256MimetypesIcons"
} }
Group { Group {
name: "apps512x512/mimetypes" name: "apps512x512/mimetypes"
prefix: FileInfo.joinPaths(project.sourceDirectory, "share", "icons", "512x512", "mimetypes", FileInfo.pathSeparator()) prefix: project.sourceDirectory + "/share/icons/512x512/mimetypes/"
files: ["application-x-valentina-i-measurements.png", "application-x-valentina-s-measurements.png"] files: ["application-x-valentina-i-measurements.png", "application-x-valentina-s-measurements.png"]
fileTags: "freedesktop.512x512MimetypesIcons" fileTags: "freedesktop.512x512MimetypesIcons"
} }
@ -186,12 +185,12 @@ VToolApp {
condition: qbs.targetOS.contains("macos") condition: qbs.targetOS.contains("macos")
fileTagsFilter: "qm" fileTagsFilter: "qm"
qbs.install: true qbs.install: true
qbs.installDir: buildconfig.installDataPath + FileInfo.pathSeparator() + "translations" qbs.installDir: buildconfig.installDataPath + "/translations"
} }
Group { Group {
name: "Diagrams" name: "Diagrams"
prefix: FileInfo.joinPaths(product.sourceDirectory, "share", "resources", FileInfo.pathSeparator()) prefix: product.sourceDirectory + "/share/resources/"
files: "diagrams.qrc" files: "diagrams.qrc"
fileTags: "ebr.external_qrc" fileTags: "ebr.external_qrc"
} }
@ -201,15 +200,15 @@ VToolApp {
qbs.install: true qbs.install: true
qbs.installDir: { qbs.installDir: {
if (qbs.targetOS.contains("unix") && !qbs.targetOS.contains("macos")) if (qbs.targetOS.contains("unix") && !qbs.targetOS.contains("macos"))
return FileInfo.joinPaths("share", "valentina", FileInfo.pathSeparator()); return "share/valentina/";
else else
return buildconfig.installDataPath + FileInfo.pathSeparator(); return buildconfig.installDataPath + "/";
} }
} }
Group { Group {
name: "Tape RC" name: "Tape RC"
prefix: FileInfo.joinPaths(product.sourceDirectory, "share", "resources", FileInfo.pathSeparator()) prefix: product.sourceDirectory + "/share/resources/"
files: "tape.rc" files: "tape.rc"
} }
} }

47
src/app/valentina/valentina.qbs
View File

@ -147,52 +147,51 @@ VToolApp {
cpp.defines: { cpp.defines: {
var defines = []; var defines = [];
var extension = qbs.targetOS.contains("windows") ? ".exe" : ""; var extension = qbs.targetOS.contains("windows") ? ".exe" : "";
defines.push('VALENTINA_BUILDDIR="' + exportingProduct.buildDirectory + FileInfo.pathSeparator() + defines.push('VALENTINA_BUILDDIR="' + FileInfo.joinPaths(exportingProduct.buildDirectory, exportingProduct.targetName + extension) +'"');
exportingProduct.targetName + extension +'"'); defines.push('TRANSLATIONS_DIR="' + FileInfo.joinPaths(exportingProduct.buildDirectory, 'translations') +'"');
defines.push('TRANSLATIONS_DIR="' + exportingProduct.buildDirectory + FileInfo.pathSeparator() + 'translations"');
return defines; return defines;
} }
} }
Group { Group {
name: "Label templates" name: "Label templates"
prefix: FileInfo.joinPaths(project.sourceDirectory, "src", "app", "share", "labels", FileInfo.pathSeparator()) prefix: project.sourceDirectory + "/src/app/share/labels/"
files: [ files: [
"def_pattern_label.xml", "def_pattern_label.xml",
"def_piece_label.xml" "def_piece_label.xml"
] ]
fileTags: ["label_templates"] fileTags: ["label_templates"]
qbs.install: true qbs.install: true
qbs.installDir: buildconfig.installDataPath + FileInfo.pathSeparator() + "labels" qbs.installDir: buildconfig.installDataPath + "/labels"
} }
Group { Group {
name: "Multisize tables" name: "Multisize tables"
prefix: FileInfo.joinPaths(project.sourceDirectory, "src", "app", "share", "tables", "multisize", FileInfo.pathSeparator()) prefix: project.sourceDirectory + "/src/app/share/tables/multisize/"
files: [ files: [
"GOST_man_ru.vst" "GOST_man_ru.vst"
] ]
fileTags: ["multisize_tables"] fileTags: ["multisize_tables"]
qbs.install: true qbs.install: true
qbs.installDir: buildconfig.installDataPath + FileInfo.pathSeparator() + "tables" + FileInfo.pathSeparator() + "multisize" qbs.installDir: buildconfig.installDataPath + "/tables/multisize"
} }
Group { Group {
name: "Measurements templates" name: "Measurements templates"
prefix: FileInfo.joinPaths(project.sourceDirectory, "src", "app", "share", "tables", "templates", FileInfo.pathSeparator()) prefix: project.sourceDirectory + "/src/app/share/tables/templates/"
files: [ files: [
"template_all_measurements.vit", "template_all_measurements.vit",
"t_Aldrich_Women.vit" "t_Aldrich_Women.vit"
] ]
fileTags: ["measurements_templates"] fileTags: ["measurements_templates"]
qbs.install: true qbs.install: true
qbs.installDir: buildconfig.installDataPath + FileInfo.pathSeparator() + "tables" + FileInfo.pathSeparator() + "templates" qbs.installDir: buildconfig.installDataPath + "/tables/templates"
} }
Group { Group {
condition: qbs.targetOS.contains("windows") && (qbs.architecture.contains("x86_64") || qbs.architecture.contains("x86")) condition: qbs.targetOS.contains("windows") && (qbs.architecture.contains("x86_64") || qbs.architecture.contains("x86"))
name: "pdftops Windows" name: "pdftops Windows"
prefix: FileInfo.joinPaths(project.sourceDirectory, "dist", "win", FileInfo.pathSeparator()) prefix: project.sourceDirectory + "/dist/win/"
files: ["pdftops.exe"] files: ["pdftops.exe"]
fileTags: ["pdftops_dist_win"] fileTags: ["pdftops_dist_win"]
qbs.install: true qbs.install: true
@ -202,7 +201,7 @@ VToolApp {
Group { Group {
condition: qbs.targetOS.contains("macos") && qbs.architecture.contains("x86_64") condition: qbs.targetOS.contains("macos") && qbs.architecture.contains("x86_64")
name: "pdftops MacOS" name: "pdftops MacOS"
prefix: FileInfo.joinPaths(project.sourceDirectory, "dist", "macx", "bin64", FileInfo.pathSeparator()) prefix: project.sourceDirectory + "/dist/macx/bin64/"
files: ["pdftops"] files: ["pdftops"]
fileTags: ["pdftops_dist_macx"] fileTags: ["pdftops_dist_macx"]
qbs.install: true qbs.install: true
@ -211,7 +210,7 @@ VToolApp {
Group { Group {
name: "freedesktop" name: "freedesktop"
prefix: FileInfo.joinPaths(project.sourceDirectory, "dist", FileInfo.pathSeparator()) prefix: project.sourceDirectory + "/dist/"
files: [ files: [
"ua.com.smart-pattern." + product.targetName + ".metainfo.xml" "ua.com.smart-pattern." + product.targetName + ".metainfo.xml"
] ]
@ -219,70 +218,70 @@ VToolApp {
Group { Group {
name: "48x48/apps" name: "48x48/apps"
prefix: FileInfo.joinPaths(project.sourceDirectory, "share", "icons", "48x48", "apps", FileInfo.pathSeparator()) prefix: project.sourceDirectory + "/share/icons/48x48/apps/"
files: "valentina.png" files: "valentina.png"
fileTags: "freedesktop.48x48AppsIcons" fileTags: "freedesktop.48x48AppsIcons"
} }
Group { Group {
name: "64x64/apps" name: "64x64/apps"
prefix: FileInfo.joinPaths(project.sourceDirectory, "share", "icons", "64x64", "apps", FileInfo.pathSeparator()) prefix: project.sourceDirectory + "/share/icons/64x64/apps/"
files: "valentina.png" files: "valentina.png"
fileTags: "freedesktop.64x64AppsIcons" fileTags: "freedesktop.64x64AppsIcons"
} }
Group { Group {
name: "128x128/apps" name: "128x128/apps"
prefix: FileInfo.joinPaths(project.sourceDirectory, "share", "icons", "128x128", "apps", FileInfo.pathSeparator()) prefix: project.sourceDirectory + "/share/icons/128x128/apps/"
files: "valentina.png" files: "valentina.png"
fileTags: "freedesktop.128x128AppsIcons" fileTags: "freedesktop.128x128AppsIcons"
} }
Group { Group {
name: "256x256/apps" name: "256x256/apps"
prefix: FileInfo.joinPaths(project.sourceDirectory, "share", "icons", "256x256", "apps", FileInfo.pathSeparator()) prefix: project.sourceDirectory + "/share/icons/256x256/apps/"
files: "valentina.png" files: "valentina.png"
fileTags: "freedesktop.256x256AppsIcons" fileTags: "freedesktop.256x256AppsIcons"
} }
Group { Group {
name: "512x512/apps" name: "512x512/apps"
prefix: FileInfo.joinPaths(project.sourceDirectory, "share", "icons", "512x512", "apps", FileInfo.pathSeparator()) prefix: project.sourceDirectory + "/share/icons/512x512/apps/"
files: "valentina.png" files: "valentina.png"
fileTags: "freedesktop.512x512AppsIcons" fileTags: "freedesktop.512x512AppsIcons"
} }
Group { Group {
name: "apps48x48/mimetypes" name: "apps48x48/mimetypes"
prefix: FileInfo.joinPaths(project.sourceDirectory, "share", "icons", "48x48", "mimetypes", FileInfo.pathSeparator()) prefix: project.sourceDirectory + "/share/icons/48x48/mimetypes/"
files: "application-x-valentina-pattern.png" files: "application-x-valentina-pattern.png"
fileTags: "freedesktop.48x48MimetypesIcons" fileTags: "freedesktop.48x48MimetypesIcons"
} }
Group { Group {
name: "apps64x64/mimetypes" name: "apps64x64/mimetypes"
prefix: FileInfo.joinPaths(project.sourceDirectory, "share", "icons", "64x64", "mimetypes", FileInfo.pathSeparator()) prefix: project.sourceDirectory + "/share/icons/64x64/mimetypes/"
files: "application-x-valentina-pattern.png" files: "application-x-valentina-pattern.png"
fileTags: "freedesktop.64x64MimetypesIcons" fileTags: "freedesktop.64x64MimetypesIcons"
} }
Group { Group {
name: "apps128x128/mimetypes" name: "apps128x128/mimetypes"
prefix: FileInfo.joinPaths(project.sourceDirectory, "share", "icons", "128x128", "mimetypes", FileInfo.pathSeparator()) prefix: project.sourceDirectory + "/share/icons/128x128/mimetypes/"
files: "application-x-valentina-pattern.png" files: "application-x-valentina-pattern.png"
fileTags: "freedesktop.128x128MimetypesIcons" fileTags: "freedesktop.128x128MimetypesIcons"
} }
Group { Group {
name: "apps256x256/mimetypes" name: "apps256x256/mimetypes"
prefix: FileInfo.joinPaths(project.sourceDirectory, "share", "icons", "256x256", "mimetypes", FileInfo.pathSeparator()) prefix: project.sourceDirectory + "/share/icons/256x256/mimetypes/"
files: "application-x-valentina-pattern.png" files: "application-x-valentina-pattern.png"
fileTags: "freedesktop.256x256MimetypesIcons" fileTags: "freedesktop.256x256MimetypesIcons"
} }
Group { Group {
name: "apps512x512/mimetypes" name: "apps512x512/mimetypes"
prefix: FileInfo.joinPaths(project.sourceDirectory, "share", "icons", "512x512", "mimetypes", FileInfo.pathSeparator()) prefix: project.sourceDirectory + "/share/icons/512x512/mimetypes/"
files: "application-x-valentina-pattern.png" files: "application-x-valentina-pattern.png"
fileTags: "freedesktop.512x512MimetypesIcons" fileTags: "freedesktop.512x512MimetypesIcons"
} }
@ -290,12 +289,12 @@ VToolApp {
Group { Group {
fileTagsFilter: "qm" fileTagsFilter: "qm"
qbs.install: true qbs.install: true
qbs.installDir: buildconfig.installDataPath + FileInfo.pathSeparator() + "translations" qbs.installDir: buildconfig.installDataPath + "/translations"
} }
Group { Group {
name: "Valentina RC" name: "Valentina RC"
prefix: FileInfo.joinPaths(product.sourceDirectory, "share", "resources", FileInfo.pathSeparator()) prefix: product.sourceDirectory + "/share/resources/"
files: "valentina.rc" files: "valentina.rc"
} }
} }

81
src/test/CollectionTest/CollectionTest.qbs
View File

@ -21,7 +21,7 @@ VTestApp {
Group { Group {
name: "Tape test files" name: "Tape test files"
prefix: "tst_tape" + FileInfo.pathSeparator() prefix: "tst_tape/"
files: [ files: [
"keiko.vit", "keiko.vit",
"empty.vit", "empty.vit",
@ -43,7 +43,7 @@ VTestApp {
Group { Group {
name: "Valentina test files" name: "Valentina test files"
prefix: "tst_valentina" + FileInfo.pathSeparator() prefix: "tst_valentina/"
files: [ files: [
"empty.val", "empty.val",
"issue_372.val", "issue_372.val",
@ -62,46 +62,45 @@ VTestApp {
Group { Group {
name: "Collection files" name: "Collection files"
prefix: FileInfo.joinPaths(project.sourceDirectory, "src", "app", "share", prefix: project.sourceDirectory + "/src/app/share/"
FileInfo.pathSeparator())
files: [ files: [
FileInfo.joinPaths("collection", "bra.val"), "collection/bra.val",
FileInfo.joinPaths("collection", "bra.vit"), "collection/bra.vit",
FileInfo.joinPaths("collection", "jacketM1_52-176.val"), "collection/jacketM1_52-176.val",
FileInfo.joinPaths("collection", "jacketM2_40-146.val"), "collection/jacketM2_40-146.val",
FileInfo.joinPaths("collection", "jacketM3_40-146.val"), "collection/jacketM3_40-146.val",
FileInfo.joinPaths("collection", "jacketM4_40-146.val"), "collection/jacketM4_40-146.val",
FileInfo.joinPaths("collection", "jacketM5_30-110.val"), "collection/jacketM5_30-110.val",
FileInfo.joinPaths("collection", "jacketM6_30-110.val"), "collection/jacketM6_30-110.val",
FileInfo.joinPaths("collection", "pantsM1_52-176.val"), "collection/pantsM1_52-176.val",
FileInfo.joinPaths("collection", "pantsM2_40-146.val"), "collection/pantsM2_40-146.val",
FileInfo.joinPaths("collection", "pantsM7.val"), "collection/pantsM7.val",
FileInfo.joinPaths("collection", "TShirt_test.val"), "collection/TShirt_test.val",
FileInfo.joinPaths("collection", "TestDart.val"), "collection/TestDart.val",
FileInfo.joinPaths("collection", "pattern_blusa.val"), "collection/pattern_blusa.val",
FileInfo.joinPaths("collection", "blusa.vit"), "collection/blusa.vit",
FileInfo.joinPaths("collection", "PajamaTopWrap2.val"), "collection/PajamaTopWrap2.val",
FileInfo.joinPaths("collection", "Susan.vit"), "collection/Susan.vit",
FileInfo.joinPaths("collection", "Moulage_0.5_armhole_neckline.val"), "collection/Moulage_0.5_armhole_neckline.val",
FileInfo.joinPaths("collection", "0.7_Armhole_adjustment_0.10.val"), "collection/0.7_Armhole_adjustment_0.10.val",
FileInfo.joinPaths("collection", "my_calculated_measurements_for_val.vit"), "collection/my_calculated_measurements_for_val.vit",
FileInfo.joinPaths("collection", "Keiko_skirt.val"), "collection/Keiko_skirt.val",
FileInfo.joinPaths("collection", "keiko.vit"), "collection/keiko.vit",
FileInfo.joinPaths("collection", "medidas_eli2015.vit"), "collection/medidas_eli2015.vit",
FileInfo.joinPaths("collection", "pantalon_base_Eli.val"), "collection/pantalon_base_Eli.val",
FileInfo.joinPaths("collection", "Razmernye_priznaki_dlya_zhenskogo_zhaketa.vit"), "collection/Razmernye_priznaki_dlya_zhenskogo_zhaketa.vit",
FileInfo.joinPaths("collection", "IMK_Zhaketa_poluprilegayuschego_silueta.val"), "collection/IMK_Zhaketa_poluprilegayuschego_silueta.val",
FileInfo.joinPaths("collection", "Lara_Jil.vit"), "collection/Lara_Jil.vit",
FileInfo.joinPaths("collection", "modell_2.val"), "collection/modell_2.val",
FileInfo.joinPaths("collection", "MaleShirt", "MaleShirt.val"), "collection/MaleShirt/MaleShirt.val",
FileInfo.joinPaths("collection", "MaleShirt", "MaleShirt.vit"), "collection/MaleShirt/MaleShirt.vit",
FileInfo.joinPaths("collection", "Trousers", "Trousers.val"), "collection/Trousers/Trousers.val",
FileInfo.joinPaths("collection", "Trousers", "trousers.vit"), "collection/Trousers/trousers.vit",
FileInfo.joinPaths("collection", "Steampunk_trousers.val"), "collection/Steampunk_trousers.val",
FileInfo.joinPaths("collection", "Steampunk_trousers.vit"), "collection/Steampunk_trousers.vit",
FileInfo.joinPaths("collection", "Basic_block_women-2016.val"), "collection/Basic_block_women-2016.val",
FileInfo.joinPaths("collection", "Gent_Jacket_with_tummy.val"), "collection/Gent_Jacket_with_tummy.val",
FileInfo.joinPaths("tables", "multisize", "GOST_man_ru.vst") "tables/multisize/GOST_man_ru.vst"
] ]
fileTags: ["tst_collection_files"] fileTags: ["tst_collection_files"]
} }