summaryrefslogtreecommitdiff
path: root/scripts/Component.py
diff options
context:
space:
mode:
authorJose <jose@zeroc.com>2018-07-23 11:15:11 +0200
committerJose <jose@zeroc.com>2018-07-23 11:15:11 +0200
commita40f635a6546bb0e0b3d6e343b4e47ea28e673e7 (patch)
tree9a76843f7269bbe259dc06f458725e3383367ad4 /scripts/Component.py
parentUpdate UWP C++ controller package name (diff)
downloadice-a40f635a6546bb0e0b3d6e343b4e47ea28e673e7.tar.bz2
ice-a40f635a6546bb0e0b3d6e343b4e47ea28e673e7.tar.xz
ice-a40f635a6546bb0e0b3d6e343b4e47ea28e673e7.zip
On Windows run Xamarin tests only with Visual Studio 2017
Diffstat (limited to 'scripts/Component.py')
-rw-r--r--scripts/Component.py5
1 files changed, 3 insertions, 2 deletions
diff --git a/scripts/Component.py b/scripts/Component.py
index 65bc096734c..faa90cda2a2 100644
--- a/scripts/Component.py
+++ b/scripts/Component.py
@@ -266,11 +266,12 @@ try:
run("adb version")
Mapping.add(os.path.join("java-compat", "android"), AndroidCompatMapping())
Mapping.add(os.path.join("java", "android"), AndroidMapping())
- Mapping.add(os.path.join("csharp", "xamarin", "android"), XamarinAndroidMapping())
+ if (isinstance(platform, Windows) and platform.getCompiler() == "VC141") or isinstance(platform, Darwin):
+ Mapping.add(os.path.join("csharp", "xamarin", "android"), XamarinAndroidMapping())
except:
pass
-if isinstance(platform, Windows):
+if isinstance(platform, Windows) and platform.getCompiler() == "VC141":
Mapping.add(os.path.join("csharp", "xamarin", "uwp"), XamarinUWPMapping())
Mapping.add(os.path.join("csharp", "xamarin", "ios"), XamarinIOSMapping())