diff options
| author | Ivan Komissarov <abbapoh@gmail.com> | 2023-04-04 17:43:56 +0300 |
|---|---|---|
| committer | Ivan Komissarov <ABBAPOH@gmail.com> | 2023-04-06 10:00:28 +0000 |
| commit | 13e84a58d6e01bc157e856566f06af4e8de63cb6 (patch) | |
| tree | f6abe34ff3dfa3d71381ae3b41ab4974ab9838e3 | |
| parent | 9638d97d91fb64477e51cbd14a4aa6e09f4def0f (diff) | |
| download | qbs-13e84a58d6e01bc157e856566f06af4e8de63cb6.tar.gz | |
xcode: add support for xcode 14.3
Change-Id: Id28155e06744e53f99fdbcdc9f5bf5231a3f511e
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
| -rw-r--r-- | changelogs/changes-2.0.1.md | 6 | ||||
| -rw-r--r-- | share/qbs/modules/bundle/bundle.js | 10 | ||||
| -rw-r--r-- | share/qbs/modules/xcode/xcode.js | 8 |
3 files changed, 18 insertions, 6 deletions
diff --git a/changelogs/changes-2.0.1.md b/changelogs/changes-2.0.1.md new file mode 100644 index 000000000..53582c367 --- /dev/null +++ b/changelogs/changes-2.0.1.md @@ -0,0 +1,6 @@ +# Apple Support +* Added support for Xcode 14.3 + +# Contributors +* Christian Kandeler +* Ivan Komissarov diff --git a/share/qbs/modules/bundle/bundle.js b/share/qbs/modules/bundle/bundle.js index ec0e30054..da23b7313 100644 --- a/share/qbs/modules/bundle/bundle.js +++ b/share/qbs/modules/bundle/bundle.js @@ -152,13 +152,15 @@ function _assign(target, source) { function macOSSpecsPaths(version, developerPath) { var result = []; - if (Utilities.versionCompare(version, "12.5") >= 0) { + if (Utilities.versionCompare(version, "14.3") >= 0) { + result.push(FileInfo.joinPaths( + developerPath, "Library", "Xcode", "Plug-ins", "XCBSpecifications.ideplugin", + "Contents", "Resources")); + } else if (Utilities.versionCompare(version, "12.5") >= 0) { result.push(FileInfo.joinPaths( developerPath, "..", "PlugIns", "XCBSpecifications.ideplugin", "Contents", "Resources")); - } - - if (Utilities.versionCompare(version, "12") >= 0) { + } else if (Utilities.versionCompare(version, "12") >= 0) { result.push(FileInfo.joinPaths( developerPath, "Platforms", "MacOSX.platform", "Developer", "Library", "Xcode", "PrivatePlugIns", "IDEOSXSupportCore.ideplugin", "Contents", "Resources")); diff --git a/share/qbs/modules/xcode/xcode.js b/share/qbs/modules/xcode/xcode.js index 15afddb95..6bd37ad10 100644 --- a/share/qbs/modules/xcode/xcode.js +++ b/share/qbs/modules/xcode/xcode.js @@ -205,8 +205,12 @@ function boolFromSdkOrPlatform(varName, sdkProps, platformProps, defaultValue) { function archsSpecsPath(version, targetOS, platformType, platformPath, devicePlatformPath, developerPath) { if (Utilities.versionCompare(version, "13.3") >= 0) { - var baseDir = FileInfo.joinPaths(developerPath, "..", - "PlugIns/XCBSpecifications.ideplugin/Contents/Resources"); + var pluginsDir = Utilities.versionCompare(version, "14.3") >= 0 + ? FileInfo.joinPaths(developerPath, "Library", "Xcode", "Plug-ins") + : FileInfo.joinPaths(developerPath, "..", "PlugIns"); + var baseDir = FileInfo.joinPaths(pluginsDir, + "XCBSpecifications.ideplugin", "Contents", "Resources"); + var baseName = targetOS.includes("macos") ? "MacOSX Architectures" : targetOS.includes("ios-simulator") ? "iOS Simulator" : targetOS.includes("ios") ? "iOS Device" |