diff options
| author | Denis Shienkov <denis.shienkov@gmail.com> | 2021-08-19 12:37:59 +0300 |
|---|---|---|
| committer | Denis Shienkov <denis.shienkov@gmail.com> | 2021-08-22 15:30:07 +0000 |
| commit | 16e7e824724e5c74d6589714f2b1f93183563676 (patch) | |
| tree | f2e7c4901b04469e67dc3fc7f5739a37051c1a98 /share/qbs/modules/cpp/GenericGCC.qbs | |
| parent | 9d6267a708b966286b6b7c1a0864fdf34bde6910 (diff) | |
Use more FileInfo.joinPaths() in artifacts generators
It makes sense to use the FileInfo.joinPaths() instead of the '/'
separators in the paths, because the FileInfo.joinPaths() automatically
use the best separators for a specific platforms.
Change-Id: If518cca7f9edf0f199c146b1f22f07ddb51c1d51
Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
Diffstat (limited to 'share/qbs/modules/cpp/GenericGCC.qbs')
| -rw-r--r-- | share/qbs/modules/cpp/GenericGCC.qbs | 14 |
1 files changed, 7 insertions, 7 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) |