aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--share/qbs/modules/cpp/GenericGCC.qbs14
-rw-r--r--share/qbs/modules/cpp/cpp.js26
-rw-r--r--share/qbs/modules/cpp/windows-clang-mingw.qbs3
-rw-r--r--share/qbs/modules/cpp/windows-mingw.qbs3
-rw-r--r--share/qbs/modules/cpp/windows-msvc-base.qbs19
-rw-r--r--share/qbs/modules/nsis/NSISModule.qbs4
6 files changed, 38 insertions, 31 deletions
diff --git a/share/qbs/modules/cpp/GenericGCC.qbs b/share/qbs/modules/cpp/GenericGCC.qbs
index 6f22ef3e2..94b9c8069 100644
--- a/share/qbs/modules/cpp/GenericGCC.qbs
+++ b/share/qbs/modules/cpp/GenericGCC.qbs
@@ -416,14 +416,14 @@ CppModule {
}
outputArtifacts: {
var artifacts = [{
- filePath: product.destinationDirectory + "/"
- + PathTools.dynamicLibraryFilePath(product),
+ filePath: FileInfo.joinPaths(product.destinationDirectory,
+ PathTools.dynamicLibraryFilePath(product)),
fileTags: ["bundle.input", "dynamiclibrary"]
.concat(product.cpp.shouldSignArtifacts
? ["codesign.signed_artifact"] : []),
bundle: {
- _bundleFilePath: product.destinationDirectory + "/"
- + PathTools.bundleExecutableFilePath(product)
+ _bundleFilePath: FileInfo.joinPaths(product.destinationDirectory,
+ PathTools.bundleExecutableFilePath(product))
}
}];
if (product.cpp.imageFormat === "pe") {
@@ -447,9 +447,9 @@ CppModule {
var maxVersionParts = product.cpp.internalVersion ? 3 : 1;
for (var i = 0; i < maxVersionParts; ++i) {
var symlink = {
- filePath: product.destinationDirectory + "/"
- + PathTools.dynamicLibraryFilePath(product, undefined, undefined,
- i),
+ filePath: FileInfo.joinPaths(product.destinationDirectory,
+ PathTools.dynamicLibraryFilePath(
+ product, undefined, undefined, i)),
fileTags: ["dynamiclibrary_symlink"]
};
if (i > 0 && artifacts[i-1].filePath == symlink.filePath)
diff --git a/share/qbs/modules/cpp/cpp.js b/share/qbs/modules/cpp/cpp.js
index af9c7df66..931c52ddd 100644
--- a/share/qbs/modules/cpp/cpp.js
+++ b/share/qbs/modules/cpp/cpp.js
@@ -107,14 +107,14 @@ function assemblerOutputArtifacts(input) {
var artifacts = [];
artifacts.push({
fileTags: ["obj"],
- filePath: Utilities.getHash(input.baseDir) + "/"
- + input.fileName + input.cpp.objectSuffix
+ filePath: FileInfo.joinPaths(Utilities.getHash(input.baseDir),
+ input.fileName + input.cpp.objectSuffix)
});
if (input.cpp.generateAssemblerListingFiles) {
artifacts.push({
fileTags: ["lst"],
- filePath: Utilities.getHash(input.baseDir) + "/"
- + input.fileName + input.cpp.assemblerListingSuffix
+ filePath: FileInfo.joinPaths(Utilities.getHash(input.baseDir),
+ input.fileName + input.cpp.assemblerListingSuffix)
});
}
return artifacts;
@@ -124,14 +124,14 @@ function compilerOutputArtifacts(input) {
var artifacts = [];
artifacts.push({
fileTags: ["obj"],
- filePath: Utilities.getHash(input.baseDir) + "/"
- + input.fileName + input.cpp.objectSuffix
+ filePath: FileInfo.joinPaths(Utilities.getHash(input.baseDir),
+ input.fileName + input.cpp.objectSuffix)
});
if (input.cpp.generateCompilerListingFiles) {
artifacts.push({
fileTags: ["lst"],
- filePath: Utilities.getHash(input.baseDir) + "/"
- + input.fileName + input.cpp.compilerListingSuffix
+ filePath: FileInfo.joinPaths(Utilities.getHash(input.baseDir),
+ input.fileName + input.cpp.compilerListingSuffix)
});
}
return artifacts;
@@ -140,16 +140,14 @@ function compilerOutputArtifacts(input) {
function applicationLinkerOutputArtifacts(product) {
var artifacts = [{
fileTags: ["application"],
- filePath: FileInfo.joinPaths(
- product.destinationDirectory,
- PathTools.applicationFilePath(product))
+ filePath: FileInfo.joinPaths(product.destinationDirectory,
+ PathTools.applicationFilePath(product))
}];
if (product.cpp.generateLinkerMapFile) {
artifacts.push({
fileTags: ["mem_map"],
- filePath: FileInfo.joinPaths(
- product.destinationDirectory,
- product.targetName + product.cpp.linkerMapSuffix)
+ filePath: FileInfo.joinPaths(product.destinationDirectory,
+ product.targetName + product.cpp.linkerMapSuffix)
});
}
return artifacts;
diff --git a/share/qbs/modules/cpp/windows-clang-mingw.qbs b/share/qbs/modules/cpp/windows-clang-mingw.qbs
index 8389dbf2e..fdc167c45 100644
--- a/share/qbs/modules/cpp/windows-clang-mingw.qbs
+++ b/share/qbs/modules/cpp/windows-clang-mingw.qbs
@@ -89,7 +89,8 @@ MingwBaseModule {
auxiliaryInputs: ["hpp"]
Artifact {
- filePath: Utilities.getHash(input.baseDir) + "/" + input.completeBaseName + ".res"
+ filePath: FileInfo.joinPaths(Utilities.getHash(input.baseDir),
+ input.completeBaseName + ".res")
fileTags: ["obj"]
}
diff --git a/share/qbs/modules/cpp/windows-mingw.qbs b/share/qbs/modules/cpp/windows-mingw.qbs
index ef2ef4946..e1354736d 100644
--- a/share/qbs/modules/cpp/windows-mingw.qbs
+++ b/share/qbs/modules/cpp/windows-mingw.qbs
@@ -68,7 +68,8 @@ MingwBaseModule {
auxiliaryInputs: ["hpp"]
Artifact {
- filePath: Utilities.getHash(input.baseDir) + "/" + input.completeBaseName + "_res" + input.cpp.objectSuffix
+ filePath: FileInfo.joinPaths(Utilities.getHash(input.baseDir),
+ input.completeBaseName + "_res" + input.cpp.objectSuffix)
fileTags: ["obj"]
}
diff --git a/share/qbs/modules/cpp/windows-msvc-base.qbs b/share/qbs/modules/cpp/windows-msvc-base.qbs
index 3d4975dda..c6869462e 100644
--- a/share/qbs/modules/cpp/windows-msvc-base.qbs
+++ b/share/qbs/modules/cpp/windows-msvc-base.qbs
@@ -176,13 +176,14 @@ CppModule {
var artifacts = [];
artifacts.push({
fileTags: tags,
- filePath: Utilities.getHash(input.baseDir) + "/" + input.fileName + input.cpp.objectSuffix
+ filePath: FileInfo.joinPaths(Utilities.getHash(input.baseDir),
+ input.fileName + input.cpp.objectSuffix)
});
if (input.cpp.generateCompilerListingFiles) {
artifacts.push({
fileTags: ["lst"],
- filePath: Utilities.getHash(input.baseDir)
- + "/" + input.fileName + input.cpp.compilerListingSuffix
+ filePath: FileInfo.joinPaths(Utilities.getHash(input.baseDir),
+ input.fileName + input.cpp.compilerListingSuffix)
});
}
return artifacts;
@@ -266,11 +267,13 @@ CppModule {
{
fileTags: ["dynamiclibrary"].concat(
product.cpp.shouldSignArtifacts ? ["codesign.signed_artifact"] : []),
- filePath: product.destinationDirectory + "/" + PathTools.dynamicLibraryFilePath(product)
+ filePath: FileInfo.joinPaths(product.destinationDirectory,
+ PathTools.dynamicLibraryFilePath(product))
},
{
fileTags: ["dynamiclibrary_import"],
- filePath: product.destinationDirectory + "/" + PathTools.importLibraryFilePath(product),
+ filePath: FileInfo.joinPaths(product.destinationDirectory,
+ PathTools.importLibraryFilePath(product)),
alwaysUpdated: false
}
];
@@ -341,7 +344,8 @@ CppModule {
auxiliaryInputs: ["hpp"]
Artifact {
- filePath: Utilities.getHash(input.baseDir) + "/" + input.completeBaseName + ".res"
+ filePath: FileInfo.joinPaths(Utilities.getHash(input.baseDir),
+ input.completeBaseName + ".res")
fileTags: ["obj"]
}
@@ -361,7 +365,8 @@ CppModule {
Rule {
inputs: ["asm"]
Artifact {
- filePath: Utilities.getHash(input.baseDir) + "/" + input.completeBaseName + input.cpp.objectSuffix
+ filePath: FileInfo.joinPaths(Utilities.getHash(input.baseDir),
+ input.completeBaseName + input.cpp.objectSuffix)
fileTags: ["obj"]
}
prepare: {
diff --git a/share/qbs/modules/nsis/NSISModule.qbs b/share/qbs/modules/nsis/NSISModule.qbs
index a2b2e8f36..23d673880 100644
--- a/share/qbs/modules/nsis/NSISModule.qbs
+++ b/share/qbs/modules/nsis/NSISModule.qbs
@@ -148,7 +148,9 @@ Module {
Artifact {
fileTags: ["nsissetup", "application"]
- filePath: product.destinationDirectory + "/" + product.targetName + ModUtils.moduleProperty(product, "executableSuffix")
+ filePath: FileInfo.joinPaths(product.destinationDirectory,
+ product.targetName + ModUtils.moduleProperty(
+ product, "executableSuffix"))
}
prepare: {
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-09 01:01:34 +0000