summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBenoit Foucher <benoit@zeroc.com>2019-07-23 10:34:12 +0200
committerBenoit Foucher <benoit@zeroc.com>2019-07-23 10:34:12 +0200
commit7e62e68a8d8a3fa299ebecce6fee9112515a141e (patch)
treeda57207eb7145718fe7237b194eb7f246bb37a74
parentAligned Expect.py script with other repositories (diff)
downloadice-7e62e68a8d8a3fa299ebecce6fee9112515a141e.tar.bz2
ice-7e62e68a8d8a3fa299ebecce6fee9112515a141e.tar.xz
ice-7e62e68a8d8a3fa299ebecce6fee9112515a141e.zip
Enable Objective-C and Swift mappings on macOS only
-rw-r--r--scripts/Component.py4
-rw-r--r--scripts/Util.py6
2 files changed, 2 insertions, 8 deletions
diff --git a/scripts/Component.py b/scripts/Component.py
index bf97d47541d..9b31315dba3 100644
--- a/scripts/Component.py
+++ b/scripts/Component.py
@@ -234,9 +234,9 @@ for m in filter(lambda x: os.path.isdir(os.path.join(toplevel, x)), os.listdir(t
Mapping.add(m, JavaScriptMapping(), component, enable=platform.hasNodeJS())
Mapping.add("typescript", TypeScriptMapping(), component, "js", enable=platform.hasNodeJS())
elif m == "objective-c" or re.match("objective-c-*", m):
- Mapping.add(m, ObjCMapping(), component)
+ Mapping.add(m, ObjCMapping(), component, enable=isinstance(platform, Darwin))
elif m == "swift" or re.match("swift-.*", m):
- Mapping.add("swift", SwiftMapping(), component)
+ Mapping.add("swift", SwiftMapping(), component, enable=isinstance(platform, Darwin))
elif m == "csharp" or re.match("charp-.*", m):
Mapping.add("csharp", CSharpMapping(), component, enable=isinstance(platform, Windows) or platform.hasDotNet())
diff --git a/scripts/Util.py b/scripts/Util.py
index e078d44ab8e..2cbb3f49e61 100644
--- a/scripts/Util.py
+++ b/scripts/Util.py
@@ -3542,12 +3542,6 @@ class CppBasedMapping(Mapping):
class ObjCMapping(CppBasedMapping):
- def getTestSuites(self, ids=[]):
- return Mapping.getTestSuites(self, ids) if isinstance(platform, Darwin) else []
-
- def findTestSuite(self, testsuite):
- return Mapping.findTestSuite(self, testsuite) if isinstance(platform, Darwin) else None
-
class Config(CppBasedMapping.Config):
mappingName = "objc"
mappingDesc = "Objective-C"