Created
September 16, 2015 14:08
-
-
Save superdump/9728bc1962499ab68d13 to your computer and use it in GitHub Desktop.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
From c981f8885b2b3e9fde1b217369f7cae57d5dffe1 Mon Sep 17 00:00:00 2001 | |
From: Robert Swain <[email protected]> | |
Date: Mon, 14 Sep 2015 20:46:19 +0200 | |
Subject: [PATCH 1/2] Add support for OS X 10.11 El Capitan | |
--- | |
cerbero/enums.py | 1 + | |
cerbero/utils/__init__.py | 4 +++- | |
config/darwin.config | 1 + | |
3 files changed, 5 insertions(+), 1 deletion(-) | |
diff --git a/cerbero/enums.py b/cerbero/enums.py | |
index bc07dc3..d7e23a3 100644 | |
--- a/cerbero/enums.py | |
+++ b/cerbero/enums.py | |
@@ -92,6 +92,7 @@ class DistroVersion: | |
OS_X_MAVERICKS = 'osx_mavericks' | |
OS_X_MOUNTAIN_LION = 'osx_mountain_lion' | |
OS_X_YOSEMITE = 'osx_yosemite' | |
+ OS_X_EL_CAPITAN = 'osx_el_capitan' | |
IOS_6_0 = 'ios_6_0' | |
IOS_6_1 = 'ios_6_1' | |
IOS_7_0 = 'ios_7_0' | |
diff --git a/cerbero/utils/__init__.py b/cerbero/utils/__init__.py | |
index bb8f4b8..29f70a1 100644 | |
--- a/cerbero/utils/__init__.py | |
+++ b/cerbero/utils/__init__.py | |
@@ -222,7 +222,9 @@ def system_info(): | |
elif platform == Platform.DARWIN: | |
distro = Distro.OS_X | |
ver = pplatform.mac_ver()[0] | |
- if ver.startswith('10.10'): | |
+ if ver.startswith('10.11'): | |
+ distro_version = DistroVersion.OS_X_EL_CAPITAN | |
+ elif ver.startswith('10.10'): | |
distro_version = DistroVersion.OS_X_YOSEMITE | |
elif ver.startswith('10.9'): | |
distro_version = DistroVersion.OS_X_MAVERICKS | |
diff --git a/config/darwin.config b/config/darwin.config | |
index 3322353..b0ccf99 100644 | |
--- a/config/darwin.config | |
+++ b/config/darwin.config | |
@@ -24,6 +24,7 @@ SDK_VERSION = { | |
DistroVersion.OS_X_MOUNTAIN_LION: '10.8', | |
DistroVersion.OS_X_MAVERICKS: '10.9', | |
DistroVersion.OS_X_YOSEMITE: '10.10', | |
+ DistroVersion.OS_X_EL_CAPITAN: '10.11', | |
} | |
# The SDK target can be overriden in configure with 'osx_target_sdk_version' for instance | |
-- | |
2.3.8 (Apple Git-58) |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment