diff options
| author | Bernard Normier <bernard@zeroc.com> | 2018-11-09 11:50:02 -0500 |
|---|---|---|
| committer | Bernard Normier <bernard@zeroc.com> | 2018-11-09 11:50:02 -0500 |
| commit | 6bf3370eeb8cb8bbe0de3b10cd15345816e0a421 (patch) | |
| tree | 5ab6a4787858d61c9f557d0244f6c89cf0e115fa /scripts/Component.py | |
| parent | Upgrade gradle version checks for Java 11 (diff) | |
| download | ice-6bf3370eeb8cb8bbe0de3b10cd15345816e0a421.tar.bz2 ice-6bf3370eeb8cb8bbe0de3b10cd15345816e0a421.tar.xz ice-6bf3370eeb8cb8bbe0de3b10cd15345816e0a421.zip | |
Replaced VC1xx by v1xx for consistency
Diffstat (limited to 'scripts/Component.py')
| -rw-r--r-- | scripts/Component.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/scripts/Component.py b/scripts/Component.py index 9e8f6cfe030..258211e4572 100644 --- a/scripts/Component.py +++ b/scripts/Component.py @@ -83,7 +83,7 @@ class Ice(Component): "Ice/properties", # Property files are not supported with UWP "Ice/plugin", "Ice/threadPoolPriority"]) - elif isinstance(platform, Windows) and platform.getCompiler() in ["VC100"]: + elif isinstance(platform, Windows) and platform.getCompiler() in ["v100"]: return (["Ice/.*", "IceSSL/.*", "IceBox/.*", "IceDiscovery/.*", "IceUtil/.*", "Slice/.*"], []) elif isinstance(mapping, CSharpMapping) and config.xamarin: return (["Ice/.*"], @@ -245,9 +245,9 @@ for m in filter(lambda x: os.path.isdir(os.path.join(toplevel, x)), os.listdir(t if isinstance(platform, Windows): # Windows doesn't support all the mappings, we take them out here. Mapping.remove("ruby") - if platform.getCompiler() != "VC140": + if platform.getCompiler() != "v140": Mapping.remove("python") - if platform.getCompiler() not in ["VC140", "VC141"]: + if platform.getCompiler() not in ["v140", "v141"]: Mapping.remove("php") elif not platform.hasDotNet(): # Remove C# if Dot Net Core isn't supported |