diff options
| author | Jose <jose@zeroc.com> | 2016-11-28 22:55:16 +0100 |
|---|---|---|
| committer | Jose <jose@zeroc.com> | 2016-11-28 22:55:16 +0100 |
| commit | 01d82a8985bc12508aa22039e406a7a5d83f5311 (patch) | |
| tree | 93425f8ce97cc1bb80340d91d828f58c49624589 /scripts/Util.py | |
| parent | Fixed JS --es5 Ice/properties test failure, removed run.js files (diff) | |
| download | ice-01d82a8985bc12508aa22039e406a7a5d83f5311.tar.bz2 ice-01d82a8985bc12508aa22039e406a7a5d83f5311.tar.xz ice-01d82a8985bc12508aa22039e406a7a5d83f5311.zip | |
CSharp test updates
Diffstat (limited to 'scripts/Util.py')
| -rw-r--r-- | scripts/Util.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/scripts/Util.py b/scripts/Util.py index ef91502b99e..44b900ae76a 100644 --- a/scripts/Util.py +++ b/scripts/Util.py @@ -1837,8 +1837,7 @@ class JavaCompatMapping(JavaMapping): class CSharpMapping(Mapping): def getBuildDir(self, name, current): - # Executables are not produced in build sub-directory with the C# mapping. - return "" + return os.path.join("msbuild", name) def getSSLProps(self, process, current): props = Mapping.getSSLProps(self, process, current) @@ -1852,9 +1851,10 @@ class CSharpMapping(Mapping): return props def getPluginEntryPoint(self, plugin, process, current): + plugindir = "{icedir}/Assemblies" return { - "IceSSL" : "{icedir}/Assemblies/IceSSL.dll:IceSSL.PluginFactory", - "IceDiscovery" : "{icedir}/Assemblies/IceDiscovery.dll:IceDiscovery.PluginFactory" + "IceSSL" : plugindir + "/IceSSL.dll:IceSSL.PluginFactory", + "IceDiscovery" : plugindir + "/IceDiscovery.dll:IceDiscovery.PluginFactory" }[plugin] def getEnv(self, process, current): |