4 files changed, 51 insertions, 3 deletions
diff --git a/matlab/lib/+Ice/Communicator.m b/matlab/lib/+Ice/Communicator.m
index f608e5b7b9c..fed8c487e1e 100644
--- a/matlab/lib/+Ice/Communicator.m
+++ b/matlab/lib/+Ice/Communicator.m
@@ -143,7 +143,7 @@ classdef Communicator < IceInternal.WrapperObject
             assert(~isNull(future));
             r = Ice.Future(future, 'flushBatchRequests', 0, 'Ice_SimpleFuture', @(fut) fut.iceCall('check'));
         end
-        function r = getClassResolver(obj) 
+        function r = getClassResolver(obj)
             if isempty(obj.classResolver) % Lazy initialization.
                 obj.classResolver = IceInternal.ClassResolver(obj.getProperties());
             end
diff --git a/matlab/lib/+Ice/initialize.m b/matlab/lib/+Ice/initialize.m
index 0b903f29b63..0dd76308cb4 100644
--- a/matlab/lib/+Ice/initialize.m
+++ b/matlab/lib/+Ice/initialize.m
@@ -26,7 +26,7 @@ function [communicator, args] = initialize(varargin)
             throw(MException('Ice:ArgumentException', 'unexpected argument to Ice.initialize'));
         end
     end
-            
+
     if isempty(initData)
         initData = Ice.InitializationData();
     end
diff --git a/matlab/lib/generated/.gitignore b/matlab/lib/generated/.gitignore
deleted file mode 100644
index 39af5887579..00000000000
--- a/matlab/lib/generated/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-# Dummy file, so that git retains this otherwise empty directory.
diff --git a/matlab/lib/msbuild/ice.proj b/matlab/lib/msbuild/ice.proj
new file mode 100644
index 00000000000..5b2b8f4c1f3
--- /dev/null
+++ b/matlab/lib/msbuild/ice.proj
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+
+  <Import Project="$(MSBuildThisFileDirectory)..\..\..\config\icebuilder.props" />
+
+  <PropertyGroup Condition="'$(ICE_BIN_DIST)' == ''">
+    <IceHome>$(MSBuildThisFileDirectory)..\..\..</IceHome>
+    <IceToolsDir>$(IceHome)\cpp\bin\$(Platform)\$(Configuration)</IceToolsDir>
+  </PropertyGroup>
+
+  <PropertyGroup Condition="'$(ICE_BIN_DIST)' == 'cpp'">
+    <IceHome>$(MSBuildThisFileDirectory)..\..\msbuild\packages\zeroc.ice.v140.$(IceJSOnVersion)</IceHome>
+    <IceToolsDir>$(IceHome)\tools</IceToolsDir>
+  </PropertyGroup>
+
+  <PropertyGroup>
+    <SliceOutputDir>$(MSBuildThisFileDirectory)..\generated</SliceOutputDir>
+    <SliceDir>$(IceHome)\slice</SliceDir>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Slice Include="..\..\..\slice\Ice\Communicator.ice" />
+    <Slice Include="..\..\..\slice\Ice\Connection.ice" />
+    <Slice Include="..\..\..\slice\Ice\Current.ice" />
+    <Slice Include="..\..\..\slice\Ice\Endpoint.ice" />
+    <Slice Include="..\..\..\slice\Ice\EndpointTypes.ice" />
+    <Slice Include="..\..\..\slice\Ice\Identity.ice" />
+    <Slice Include="..\..\..\slice\Ice\LocalException.ice" />
+    <Slice Include="..\..\..\slice\Ice\Locator.ice" />
+    <Slice Include="..\..\..\slice\Ice\Router.ice" />
+    <Slice Include="..\..\..\slice\Ice\SliceChecksumDict.ice" />
+    <Slice Include="..\..\..\slice\Ice\ValueFactory.ice" />
+    <Slice Include="..\..\..\slice\Ice\Version.ice" />
+  </ItemGroup>
+  <Target Name="Config">
+    <Message Text="IceHome: $(IceHome)"/>
+  </Target>
+
+  <Target Name="Build">
+    <RemoveDir Directories="$(SliceOutputDir)" Condition="Exists('$(SliceOutputDir)')"/>
+    <MakeDir Directories="$(SliceOutputDir)"/>
+    <Exec Command="$(IceToolsDir)\slice2matlab.exe -I$(SliceDir) --output-dir $(SliceOutputDir) %(Slice.FullPath)"/>
+  </Target>
+
+  <Target Name="Clean">
+    <RemoveDir Directories="$(SliceOutputDir)" Condition="Exists('$(SliceOutputDir)')"/>
+  </Target>
+
+</Project>