summaryrefslogtreecommitdiff
path: root/matlab
diff options
context:
space:
mode:
Diffstat (limited to 'matlab')
-rw-r--r--matlab/msbuild/buildToolbox.m2
-rw-r--r--matlab/msbuild/doc/overview.html2
-rw-r--r--matlab/msbuild/ice.proj4
-rw-r--r--matlab/msbuild/ice.toolbox.targets2
-rw-r--r--matlab/msbuild/toolbox.template.prj2
-rw-r--r--matlab/src/msbuild/ice/ice.vcxproj10
6 files changed, 11 insertions, 11 deletions
diff --git a/matlab/msbuild/buildToolbox.m b/matlab/msbuild/buildToolbox.m
index 65ccfba0161..85bf406b2e6 100644
--- a/matlab/msbuild/buildToolbox.m
+++ b/matlab/msbuild/buildToolbox.m
@@ -14,7 +14,7 @@ function buildToolbox(iceVersion)
fprintf(f, '%% Version %s (R%s) %s\r\n', iceVersion, version('-release'), date);
fprintf(f, '%%\r\n');
fprintf(f, ['%% Please refer to the '...
- '<a href="https://doc.zeroc.com/display/Rel/Ice+3.7.2+Release+Notes">Ice Release Notes</a> '...
+ '<a href="https://doc.zeroc.com/display/Rel/Ice+3.7.3+Release+Notes">Ice Release Notes</a> '...
'for more information\r\n']);
fclose(f);
matlab.addons.toolbox.packageToolbox(projectFile, sprintf('ice-%s-R%s.mltbx', iceVersion, version('-release')))
diff --git a/matlab/msbuild/doc/overview.html b/matlab/msbuild/doc/overview.html
index aa4626a1cd2..4634190851b 100644
--- a/matlab/msbuild/doc/overview.html
+++ b/matlab/msbuild/doc/overview.html
@@ -10,7 +10,7 @@
<div itemprop="content">
<h2 id="descrip">Release Notes</h2>
<p>For details on the Ice for MATLAB toolbox release, please refer to the
- <a href="https://doc.zeroc.com/display/Rel/Ice+3.7.2+Release+Notes">Release Notes</a>.</p>
+ <a href="https://doc.zeroc.com/display/Rel/Ice+3.7.3+Release+Notes">Release Notes</a>.</p>
<h2 id="descrip">Manual</h2>
<p>You can read the Ice for MATLAB documentation in the
<a href="https://doc.zeroc.com/display/Rel/Ice+3.7+Manual">Ice Manual</a>.</p>
diff --git a/matlab/msbuild/ice.proj b/matlab/msbuild/ice.proj
index 64afb184181..58482359db2 100644
--- a/matlab/msbuild/ice.proj
+++ b/matlab/msbuild/ice.proj
@@ -114,7 +114,7 @@
<WriteFileWithReplacements InputFile="$(MSBuildThisFileDirectory)toolbox.template.prj"
OutputFile="$(MSBuildThisFileDirectory)toolbox.prj"
Tokens="@RootDir@;@MatlabHome@;@IceVersion@;@MatlabVersion@"
- Replacements="$(RootDir);$(MatlabHome);3.7.2;$(MatlabVersion)"/>
+ Replacements="$(RootDir);$(MatlabHome);3.7.3;$(MatlabVersion)"/>
<WriteFileWithReplacements InputFile="$(MSBuildThisFileDirectory)info.template.xml"
OutputFile="$(MSBuildThisFileDirectory)toolbox\info.xml"
Tokens="@MatlabVersion@"
@@ -123,7 +123,7 @@
Properties="Configuration=$(Configuration);Platform=x64" />
<Exec Command="&quot;$(MatlabHome)\bin\matlab.exe&quot; -nodesktop -nosplash -wait -log -minimize -r &quot;cd('$(MSBuildThisFileDirectory)');addFolderToPath '$(ToolboxDir)\ice'&quot;"
WorkingDirectory="$(MSBuildThisFileDirectory)"/>
- <Exec Command="&quot;$(MatlabHome)\bin\matlab.exe&quot; -nodesktop -nosplash -wait -log -minimize -r &quot;cd('$(MSBuildThisFileDirectory)');buildToolbox '3.7.2'&quot;"
+ <Exec Command="&quot;$(MatlabHome)\bin\matlab.exe&quot; -nodesktop -nosplash -wait -log -minimize -r &quot;cd('$(MSBuildThisFileDirectory)');buildToolbox '3.7.3'&quot;"
WorkingDirectory="$(MSBuildThisFileDirectory)"/>
<Exec Command="&quot;$(MatlabHome)\bin\matlab.exe&quot; -nodesktop -nosplash -wait -log -minimize -r &quot;cd('$(MSBuildThisFileDirectory)');removeFolderFromPath '$(ToolboxDir)\ice'&quot;"
WorkingDirectory="$(MSBuildThisFileDirectory)"/>
diff --git a/matlab/msbuild/ice.toolbox.targets b/matlab/msbuild/ice.toolbox.targets
index 7c740404f9d..8690ea5154d 100644
--- a/matlab/msbuild/ice.toolbox.targets
+++ b/matlab/msbuild/ice.toolbox.targets
@@ -8,7 +8,7 @@
</PropertyGroup>
<PropertyGroup Condition="'$(ICE_BIN_DIST)' == 'cpp'">
- <CppToolsDir>$(MSBuildThisFileDirectory)packages\zeroc.ice.v140.3.7.2\tools</CppToolsDir>
+ <CppToolsDir>$(MSBuildThisFileDirectory)packages\zeroc.ice.v140.3.7.3\tools</CppToolsDir>
</PropertyGroup>
<!-- Dynamic libraries and import libraries -->
diff --git a/matlab/msbuild/toolbox.template.prj b/matlab/msbuild/toolbox.template.prj
index 8a5712f293f..626dc1309be 100644
--- a/matlab/msbuild/toolbox.template.prj
+++ b/matlab/msbuild/toolbox.template.prj
@@ -11,7 +11,7 @@
<param.company>ZeroC, Inc.</param.company>
<param.summary>Ice @IceVersion@ for MATLAB @MatlabVersion@</param.summary>
<param.description>Ice is a comprehensive RPC framework with support for MATLAB, C++, .NET, Java, Python and more. Please refer to the Ice Release Notes for more information:
- https://doc.zeroc.com/display/Rel/Ice+3.7.2+Release+Notes</param.description>
+ https://doc.zeroc.com/display/Rel/Ice+3.7.3+Release+Notes</param.description>
<param.screenshot>${PROJECT_ROOT}\zeroc_logo-64x64.png</param.screenshot>
<param.version>@IceVersion@</param.version>
<param.output>${PROJECT_ROOT}\ice.mltbx</param.output>
diff --git a/matlab/src/msbuild/ice/ice.vcxproj b/matlab/src/msbuild/ice/ice.vcxproj
index 602ac61dda6..7c72cf56da7 100644
--- a/matlab/src/msbuild/ice/ice.vcxproj
+++ b/matlab/src/msbuild/ice/ice.vcxproj
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <Import Project="..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props') And '$(ICE_BIN_DIST)' == 'cpp'" />
+ <Import Project="..\..\..\msbuild\packages\zeroc.ice.v140.3.7.3\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\msbuild\packages\zeroc.ice.v140.3.7.3\build\native\zeroc.ice.v140.props') And '$(ICE_BIN_DIST)' == 'cpp'" />
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|x64">
<Configuration>Debug</Configuration>
@@ -81,13 +81,13 @@
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
- <Import Project="..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') And '$(ICE_BIN_DIST)' == 'cpp'" />
+ <Import Project="..\..\..\msbuild\packages\zeroc.ice.v140.3.7.3\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\msbuild\packages\zeroc.ice.v140.3.7.3\build\native\zeroc.ice.v140.targets') And '$(ICE_BIN_DIST)' == 'cpp'" />
</ImportGroup>
<Import Project="$(MSBuildThisFileDirectory)..\..\..\..\cpp\msbuild\ice.sign.targets" />
<PropertyGroup>
<DebugExtension Condition="'$(Configuration)' == 'Debug'">d</DebugExtension>
<IceBinPath Condition="'$(ICE_BIN_DIST)' == ''">..\..\..\..\cpp\bin\$(Platform)\$(Configuration)</IceBinPath>
- <IceBinPath Condition="'$(ICE_BIN_DIST)' != ''">..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\bin\$(Platform)\$(Configuration)</IceBinPath>
+ <IceBinPath Condition="'$(ICE_BIN_DIST)' != ''">..\..\..\msbuild\packages\zeroc.ice.v140.3.7.3\build\native\bin\$(Platform)\$(Configuration)</IceBinPath>
</PropertyGroup>
<Target Name="AfterClean">
<Delete Files="$(OutDir)\bzip2$(DebugExtension).dll" />
@@ -110,7 +110,7 @@
<PropertyGroup>
<ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
</PropertyGroup>
- <Error Condition="!Exists('..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props') And '$(ICE_BIN_DIST)' == 'cpp'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props'))" />
- <Error Condition="!Exists('..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') And '$(ICE_BIN_DIST)' == 'cpp'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets'))" />
+ <Error Condition="!Exists('..\..\..\msbuild\packages\zeroc.ice.v140.3.7.3\build\native\zeroc.ice.v140.props') And '$(ICE_BIN_DIST)' == 'cpp'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\msbuild\packages\zeroc.ice.v140.3.7.3\build\native\zeroc.ice.v140.props'))" />
+ <Error Condition="!Exists('..\..\..\msbuild\packages\zeroc.ice.v140.3.7.3\build\native\zeroc.ice.v140.targets') And '$(ICE_BIN_DIST)' == 'cpp'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\msbuild\packages\zeroc.ice.v140.3.7.3\build\native\zeroc.ice.v140.targets'))" />
</Target>
</Project>