diff options
| author | Jose <jose@zeroc.com> | 2017-04-26 18:05:44 +0200 |
|---|---|---|
| committer | Jose <jose@zeroc.com> | 2017-04-26 18:05:44 +0200 |
| commit | 90bf28f46309c38399cd070d1e33f39143c77b99 (patch) | |
| tree | e19820fb5cecf848a1a9f1602713e455fe61a67c | |
| parent | Fix (ICE-7790) - ice_id missing in JS (diff) | |
| download | ice-90bf28f46309c38399cd070d1e33f39143c77b99.tar.bz2 ice-90bf28f46309c38399cd070d1e33f39143c77b99.tar.xz ice-90bf28f46309c38399cd070d1e33f39143c77b99.zip | |
Fix Windows platform filters
| -rw-r--r-- | scripts/Util.py | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/scripts/Util.py b/scripts/Util.py index 3a8b0e5a44b..8702cc05282 100644 --- a/scripts/Util.py +++ b/scripts/Util.py @@ -231,7 +231,7 @@ class Windows(Platform): def getFilters(self, config): if config.uwp: - return (["Ice/.*", "IceSSL/configuration"], + return (["cpp/Ice/.*", "cpp/IceSSL/configuration"], ["Ice/background", "Ice/echo", "Ice/faultTolerance", @@ -243,7 +243,9 @@ class Windows(Platform): "Ice/plugin", "Ice/threadPoolPriority"]) elif self.getCompiler() in ["v100"]: - return (["Ice/.*", "IceSSL/.*", "IceBox/.*", "IceDiscovery/.*", "IceUtil/.*", "Slice/.*"], []) + return (["cpp/Ice/.*", "cpp/IceSSL/.*", "cpp/IceBox/.*", "cpp/IceDiscovery/.*", "cpp/IceUtil/.*", "cpp/Slice/.*"], []) + elif self.getCompiler() not in ["v140"]: + return ([], ["python", "php"]) return Platform.getFilters(self, config) def parseBuildVariables(self, variables): |