aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--doc/reference/modules/android-sdk-module.qdoc4
-rw-r--r--share/qbs/imports/qbs/Probes/GccBinaryProbe.qbs19
-rw-r--r--share/qbs/imports/qbs/Probes/NpmProbe.qbs26
-rw-r--r--share/qbs/imports/qbs/Probes/TypeScriptProbe.qbs23
-rw-r--r--share/qbs/modules/Android/sdk/sdk.qbs14
5 files changed, 54 insertions, 32 deletions
diff --git a/doc/reference/modules/android-sdk-module.qdoc b/doc/reference/modules/android-sdk-module.qdoc
index 7733ae75d..2c2e43eab 100644
--- a/doc/reference/modules/android-sdk-module.qdoc
+++ b/doc/reference/modules/android-sdk-module.qdoc
@@ -119,7 +119,7 @@
*/
/*!
- \qmlproperty string Android.sdk::assetsDir
+ \qmlproperty path Android.sdk::assetsDir
The base directory for Android assets in the respective product.
@@ -201,7 +201,7 @@
*/
/*!
- \qmlproperty string Android.sdk::resourcesDir
+ \qmlproperty path Android.sdk::resourcesDir
The base directory for Android resources in the respective product.
diff --git a/share/qbs/imports/qbs/Probes/GccBinaryProbe.qbs b/share/qbs/imports/qbs/Probes/GccBinaryProbe.qbs
index 693fb6a01..8bad0710a 100644
--- a/share/qbs/imports/qbs/Probes/GccBinaryProbe.qbs
+++ b/share/qbs/imports/qbs/Probes/GccBinaryProbe.qbs
@@ -52,16 +52,25 @@ BinaryProbe {
selectors, names, nameSuffixes, nameFilter, candidateFilter, searchPaths,
pathSuffixes, platformSearchPaths, environmentPaths, platformEnvironmentPaths,
pathListSeparator);
+
+ var resultsMapper = function(result) {
+ (nameSuffixes || [""]).forEach(function(suffix) {
+ var end = _compilerName + suffix;
+ if (result.fileName.endsWith(end))
+ result.tcPrefix = result.fileName.slice(0, -end.length);
+ });
+ return result;
+ };
+ _results.files = _results.files.map(resultsMapper);
+
found = _results.found;
+ allResults = _results.files;
+
var resultFile = _results.files[0];
candidatePaths = resultFile.candidatePaths;
path = resultFile.path;
filePath = resultFile.filePath;
fileName = resultFile.fileName;
- (nameSuffixes || [""]).forEach(function(suffix) {
- var end = _compilerName + suffix;
- if (fileName.endsWith(end))
- tcPrefix = fileName.slice(0, -end.length);
- });
+ tcPrefix = resultFile.tcPrefix;
}
}
diff --git a/share/qbs/imports/qbs/Probes/NpmProbe.qbs b/share/qbs/imports/qbs/Probes/NpmProbe.qbs
index f6a99e826..3ca6a96c2 100644
--- a/share/qbs/imports/qbs/Probes/NpmProbe.qbs
+++ b/share/qbs/imports/qbs/Probes/NpmProbe.qbs
@@ -57,18 +57,24 @@ NodeJsProbe {
hostOS.contains("windows"));
v.prepend(interpreterPath);
- var result = results.files[0];
- result.npmBin = results.found
- ? NodeJs.findLocation(result.filePath, "bin", v.value)
- : undefined;
- result.npmRoot = results.found
- ? NodeJs.findLocation(result.filePath, "root", v.value)
- : undefined;
- result.npmPrefix = results.found
- ? NodeJs.findLocation(result.filePath, "prefix", v.value)
- : undefined;
+ var resultsMapper = function(result) {
+ result.npmBin = result.found
+ ? NodeJs.findLocation(result.filePath, "bin", v.value)
+ : undefined;
+ result.npmRoot = result.found
+ ? NodeJs.findLocation(result.filePath, "root", v.value)
+ : undefined;
+ result.npmPrefix = result.found
+ ? NodeJs.findLocation(result.filePath, "prefix", v.value)
+ : undefined;
+ return result;
+ };
+ results.files = results.files.map(resultsMapper);
found = results.found;
+ allResults = results.files;
+
+ var result = results.files[0];
candidatePaths = result.candidatePaths;
path = result.path;
filePath = result.filePath;
diff --git a/share/qbs/imports/qbs/Probes/TypeScriptProbe.qbs b/share/qbs/imports/qbs/Probes/TypeScriptProbe.qbs
index a35e555cc..6a854a2e6 100644
--- a/share/qbs/imports/qbs/Probes/TypeScriptProbe.qbs
+++ b/share/qbs/imports/qbs/Probes/TypeScriptProbe.qbs
@@ -67,16 +67,23 @@ BinaryProbe {
hostOS.contains("windows"));
v.prepend(interpreterPath);
- var result = results.files[0];
- result.version = results.found
- ? TypeScript.findTscVersion(result.filePath, v.value)
- : undefined;
- if (FileInfo.fromNativeSeparators(packageManagerBinPath) !== result.path ||
- !File.exists(FileInfo.fromNativeSeparators(packageManagerRootPath, "typescript"))) {
- result = { found: false };
- }
+ var resultsMapper = function(result) {
+ result.version = result.found
+ ? TypeScript.findTscVersion(result.filePath, v.value)
+ : undefined;
+ if (FileInfo.fromNativeSeparators(packageManagerBinPath) !== result.path ||
+ !File.exists(
+ FileInfo.fromNativeSeparators(packageManagerRootPath, "typescript"))) {
+ result = { found: false };
+ }
+ return result;
+ };
+ results.files = results.files.map(resultsMapper);
found = results.found;
+ allResults = results.files;
+
+ var result = results.files[0];
candidatePaths = result.candidatePaths;
path = result.path;
filePath = result.filePath;
diff --git a/share/qbs/modules/Android/sdk/sdk.qbs b/share/qbs/modules/Android/sdk/sdk.qbs
index ecf64a188..b4ad5766f 100644
--- a/share/qbs/modules/Android/sdk/sdk.qbs
+++ b/share/qbs/modules/Android/sdk/sdk.qbs
@@ -72,12 +72,12 @@ Module {
property string apkBaseName: packageName
property bool automaticSources: true
property bool legacyLayout: false
- property string sourceSetDir: legacyLayout
+ property path sourceSetDir: legacyLayout
? product.sourceDirectory
: FileInfo.joinPaths(product.sourceDirectory, "src/main")
- property string resourcesDir: FileInfo.joinPaths(sourceSetDir, "res")
- property string assetsDir: FileInfo.joinPaths(sourceSetDir, "assets")
- property string sourcesDir: FileInfo.joinPaths(sourceSetDir, legacyLayout ? "src" : "java")
+ property path resourcesDir: FileInfo.joinPaths(sourceSetDir, "res")
+ property path assetsDir: FileInfo.joinPaths(sourceSetDir, "assets")
+ property path sourcesDir: FileInfo.joinPaths(sourceSetDir, legacyLayout ? "src" : "java")
property string manifestFile: defaultManifestFile
readonly property string defaultManifestFile: FileInfo.joinPaths(sourceSetDir,
"AndroidManifest.xml")
@@ -90,7 +90,7 @@ Module {
Group {
name: "java sources"
condition: Android.sdk.automaticSources
- prefix: Android.sdk.sourcesDir + '/'
+ prefix: FileInfo.resolvePath(product.sourceDirectory, Android.sdk.sourcesDir + '/')
files: "**/*.java"
}
@@ -98,7 +98,7 @@ Module {
name: "android resources"
condition: Android.sdk.automaticSources
fileTags: ["android.resources"]
- prefix: Android.sdk.resourcesDir + '/'
+ prefix: FileInfo.resolvePath(product.sourceDirectory, Android.sdk.resourcesDir + '/')
files: "**/*"
}
@@ -106,7 +106,7 @@ Module {
name: "android assets"
condition: Android.sdk.automaticSources
fileTags: ["android.assets"]
- prefix: Android.sdk.assetsDir + '/'
+ prefix: FileInfo.resolvePath(product.sourceDirectory, Android.sdk.assetsDir + '/')
files: "**/*"
}
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-05 01:21:01 +0000