From 08873fedd988f857305c149977d52a481603fb1d Mon Sep 17 00:00:00 2001 From: SSE4 Date: Wed, 13 Jan 2021 01:17:09 +0700 Subject: [PATCH 1/2] - docs for os.sdk (apple) Signed-off-by: SSE4 --- reference/config_files/settings.yml.rst | 4 ++++ reference/tools.rst | 8 ++++++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/reference/config_files/settings.yml.rst b/reference/config_files/settings.yml.rst index f4648307588..b761f332318 100644 --- a/reference/config_files/settings.yml.rst +++ b/reference/config_files/settings.yml.rst @@ -31,14 +31,18 @@ are possible. These are the **default** values, but it is possible to customize Linux: Macos: version: [None, "10.6", "10.7", "10.8", "10.9", "10.10", "10.11", "10.12", "10.13", "10.14", "10.15", "11.0"] + sdk: [None, "MacOSX"] Android: api_level: ANY iOS: version: ["7.0", "7.1", "8.0", "8.1", "8.2", "8.3", "9.0", "9.1", "9.2", "9.3", "10.0", "10.1", "10.2", "10.3", "11.0", "11.1", "11.2", "11.3", "11.4", "12.0", "12.1", "12.2", "12.3", "12.4", "13.0", "13.1", "13.2", "13.3", "13.4", "13.5", "13.6"] + sdk: [None, "iPhoneOS", "iPhoneSimulator"] watchOS: version: ["4.0", "4.1", "4.2", "4.3", "5.0", "5.1", "5.2", "5.3", "6.0", "6.1"] + sdk: [None, "watchOS", "watchSimulator"] tvOS: version: ["11.0", "11.1", "11.2", "11.3", "11.4", "12.0", "12.1", "12.2", "12.3", "12.4", "13.0"] + sdk: [None, "AppleTVOS", "AppleTVSimulator"] FreeBSD: SunOS: AIX: diff --git a/reference/tools.rst b/reference/tools.rst index 9e50d3c64d3..1f9947ea823 100644 --- a/reference/tools.rst +++ b/reference/tools.rst @@ -1595,6 +1595,8 @@ tools.apple_sdk_name() def apple_sdk_name(settings) Returns proper SDK name suitable for OS and architecture you are building for (considering simulators). +If ``self.settings.os.sdk`` setting is defined, it is used, otherwise the function tries to auto-detect based on +``self.settings.os`` and ``self.settings.arch``. Parameters: - **settings** (Required): Conanfile settings. @@ -1623,13 +1625,15 @@ tools.apple_deployment_target_flag() .. code-block:: python - def apple_deployment_target_flag(os_, os_version) + def apple_deployment_target_flag(os_, os_version, os_sdk=None, arch=None) Compiler flag name which controls deployment target. For example: ``-mappletvos-version-min=9.0`` Parameters: - **os_** (Required): OS of the settings. Usually ``self.settings.os``. - - **os_version** (Required): OS version. + - **os_version** (Required): OS version. Usually ``self.settings.os.version``. + - **os_sdk** (Optional, Defaulted to ``None``): OS SDK. Usually ``self.settings.os.sdk``. Otherwise, check :command:`xcodebuild -sdk -version`. for available SDKs. + - **arch** (Optional, Defaulted to ``None``): Architecture of the settings. Usually ``self.settings.arch``. .. _tools_xcrun: From 7969a3dd2032352aaa2f50469f4f518eeb514396 Mon Sep 17 00:00:00 2001 From: SSE4 Date: Wed, 13 Jan 2021 19:58:28 +0700 Subject: [PATCH 2/2] Update settings.yml.rst --- reference/config_files/settings.yml.rst | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/reference/config_files/settings.yml.rst b/reference/config_files/settings.yml.rst index b761f332318..6c1b690c6cd 100644 --- a/reference/config_files/settings.yml.rst +++ b/reference/config_files/settings.yml.rst @@ -31,18 +31,18 @@ are possible. These are the **default** values, but it is possible to customize Linux: Macos: version: [None, "10.6", "10.7", "10.8", "10.9", "10.10", "10.11", "10.12", "10.13", "10.14", "10.15", "11.0"] - sdk: [None, "MacOSX"] + sdk: [None, "macosx"] Android: api_level: ANY iOS: version: ["7.0", "7.1", "8.0", "8.1", "8.2", "8.3", "9.0", "9.1", "9.2", "9.3", "10.0", "10.1", "10.2", "10.3", "11.0", "11.1", "11.2", "11.3", "11.4", "12.0", "12.1", "12.2", "12.3", "12.4", "13.0", "13.1", "13.2", "13.3", "13.4", "13.5", "13.6"] - sdk: [None, "iPhoneOS", "iPhoneSimulator"] + sdk: [None, "iphoneos", "iphonesimulator"] watchOS: version: ["4.0", "4.1", "4.2", "4.3", "5.0", "5.1", "5.2", "5.3", "6.0", "6.1"] - sdk: [None, "watchOS", "watchSimulator"] + sdk: [None, "watchos", "watchsimulator"] tvOS: version: ["11.0", "11.1", "11.2", "11.3", "11.4", "12.0", "12.1", "12.2", "12.3", "12.4", "13.0"] - sdk: [None, "AppleTVOS", "AppleTVSimulator"] + sdk: [None, "appletvos", "appletvsimulator"] FreeBSD: SunOS: AIX: