diff options
| author | Ivan Komissarov <abbapoh@gmail.com> | 2021-02-19 10:57:25 +0100 |
|---|---|---|
| committer | Ivan Komissarov <abbapoh@gmail.com> | 2021-02-19 10:57:25 +0100 |
| commit | 36f139c4f405e057baa768e4728704b22de6519d (patch) | |
| tree | 4b554ff21e92698c185d0683b50c7cd742c18817 /share/qbs/modules | |
| parent | 2bc823ec00cec8a1d58981710eb50ba85b4f58d7 (diff) | |
| parent | 7b50dca83a5a75a5c24b5ef329f25990daf2ff50 (diff) | |
Merge branch '1.18'
Change-Id: I4e437865514add88558f66420718bc02fb39e41d
Diffstat (limited to 'share/qbs/modules')
| -rw-r--r-- | share/qbs/modules/java/JavaModule.qbs | 8 | ||||
| -rw-r--r-- | share/qbs/modules/xcode/xcode.qbs | 9 |
2 files changed, 14 insertions, 3 deletions
diff --git a/share/qbs/modules/java/JavaModule.qbs b/share/qbs/modules/java/JavaModule.qbs index c3efb15bf..ceb29f36f 100644 --- a/share/qbs/modules/java/JavaModule.qbs +++ b/share/qbs/modules/java/JavaModule.qbs @@ -234,14 +234,18 @@ Module { inputsFromDependencies: ["java.jar"] explicitlyDependsOn: ["java.class-internal"] - outputFileTags: ["java.class"].concat(_tagJniHeaders ? ["hpp"] : []) // Annotations can produce additional java source files. Ignored for now. + outputFileTags: ["java.class"].concat(_tagJniHeaders ? ["hpp"] : ["java.jni-hpp"]) // Annotations can produce additional java source files. Ignored for now. outputArtifacts: { var artifacts = JavaUtils.outputArtifacts(product, inputs); if (!product.java._tagJniHeaders) { for (var i = 0; i < artifacts.length; ++i) { var a = artifacts[i]; if (a.fileTags instanceof Array) - a.fileTags = a.fileTags.filter(function(tag) { return tag != "hpp"; }); + a.fileTags = a.fileTags.map(function(tag) { + if (tag === "hpp") + return "java.jni-hpp"; + return tag; + }); } } return artifacts; diff --git a/share/qbs/modules/xcode/xcode.qbs b/share/qbs/modules/xcode/xcode.qbs index 72120ed37..6c0584c81 100644 --- a/share/qbs/modules/xcode/xcode.qbs +++ b/share/qbs/modules/xcode/xcode.qbs @@ -11,6 +11,11 @@ import qbs.Utilities Module { id: xcodeModule + Probes.XcodeLocationProbe { + id: xcodeLocationProbe + condition: !xcodeModule.developerPath + } + Probes.XcodeProbe { id: xcodeProbe developerPath: xcodeModule.developerPath @@ -26,7 +31,9 @@ Module { version: xcodeProbe.xcodeVersion - property path developerPath: "/Applications/Xcode.app/Contents/Developer" + property path developerPath: xcodeLocationProbe.found + ? xcodeLocationProbe.developerPath + : undefined property string sdk: DarwinTools.applePlatformName(qbs.targetOS, platformType) property stringList targetDevices: DarwinTools.targetDevices(qbs.targetOS) |