diff options
| author | Christian Kandeler <christian.kandeler@qt.io> | 2024-03-13 14:58:10 +0100 |
|---|---|---|
| committer | Ivan Komissarov <ABBAPOH@gmail.com> | 2024-03-15 11:35:53 +0000 |
| commit | 5c88b6b11b762cf5861c9d1570df4f1f050c826e (patch) | |
| tree | df0c4475cb64328a26fd667659a50aeecfd1ee59 | |
| parent | 4fe028ff8b2632e6d4bda356cc384f60cb319117 (diff) | |
Adapt to Xcode 15.3v2.3.0
Fixes: QBS-1786
Change-Id: I25cd8c4480179cb5ecb598bbe7dd6573b1fe0832
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
| -rw-r--r-- | share/qbs/modules/bundle/bundle.js | 6 | ||||
| -rw-r--r-- | share/qbs/modules/xcode/xcode.js | 13 |
2 files changed, 16 insertions, 3 deletions
diff --git a/share/qbs/modules/bundle/bundle.js b/share/qbs/modules/bundle/bundle.js index da9e2486a..cf765f7be 100644 --- a/share/qbs/modules/bundle/bundle.js +++ b/share/qbs/modules/bundle/bundle.js @@ -152,6 +152,12 @@ function _assign(target, source) { function macOSSpecsPaths(version, developerPath) { var result = []; + if (Utilities.versionCompare(version, "15.3") >= 0) { + result.push(FileInfo.joinPaths( + developerPath, "..", "SharedFrameworks", "XCBuild.framework", "PlugIns", + "XCBBuildService.bundle", "Contents", "PlugIns", "XCBSpecifications.ideplugin", + "Contents", "Resources")); + } if (Utilities.versionCompare(version, "14.3") >= 0) { result.push(FileInfo.joinPaths( developerPath, "Library", "Xcode", "Plug-ins", "XCBSpecifications.ideplugin", diff --git a/share/qbs/modules/xcode/xcode.js b/share/qbs/modules/xcode/xcode.js index a931273f2..726974579 100644 --- a/share/qbs/modules/xcode/xcode.js +++ b/share/qbs/modules/xcode/xcode.js @@ -205,9 +205,16 @@ function boolFromSdkOrPlatform(varName, sdkProps, platformProps, defaultValue) { function archsSpecsPath(version, targetOS, platformType, platformPath, devicePlatformPath, developerPath) { if (Utilities.versionCompare(version, "13.3") >= 0) { - var pluginsDir = Utilities.versionCompare(version, "14.3") >= 0 - ? FileInfo.joinPaths(developerPath, "Library", "Xcode", "Plug-ins") - : FileInfo.joinPaths(developerPath, "..", "PlugIns"); + var pluginsDir; + if (Utilities.versionCompare(version, "15.3") >= 0) { + pluginsDir = FileInfo.joinPaths(developerPath, "..", + "SharedFrameworks", "XCBuild.framework", "PlugIns", "XCBBuildService.bundle", + "Contents", "PlugIns"); + } else if (Utilities.versionCompare(version, "14.3") >= 0) { + pluginsDir = FileInfo.joinPaths(developerPath, "Library", "Xcode", "Plug-ins"); + } else { + pluginsDir = FileInfo.joinPaths(developerPath, "..", "PlugIns"); + } var baseDir = FileInfo.joinPaths(pluginsDir, "XCBSpecifications.ideplugin", "Contents", "Resources"); |