From 5e445567683deebded1c12e78796e998cbf16ae8 Mon Sep 17 00:00:00 2001 From: Jose Date: Mon, 9 Oct 2017 21:58:46 +0200 Subject: Update MATLAB build system --- cpp/src/Slice/Preprocessor.cpp | 13 +-- cpp/src/Slice/StringLiteralUtil.cpp | 2 +- matlab/README.md | 21 +++-- matlab/lib/+Ice/Communicator.m | 2 +- matlab/lib/+Ice/initialize.m | 2 +- matlab/lib/generated/.gitignore | 1 - matlab/lib/msbuild/ice.proj | 49 ++++++++++ matlab/msbuild/ice.proj | 103 +++++++++------------ matlab/msbuild/ice.sln | 22 +++++ matlab/msbuild/ice.tests.props | 31 +++++++ matlab/src/IceMatlab/ObjectPrx.cpp | 2 +- matlab/src/IceMatlab/Util.cpp | 8 +- matlab/src/IceMatlab/msbuild/icematlab.vcxproj | 101 ++++++++++++++++++++ .../IceMatlab/msbuild/icematlab.vcxproj.filters | 74 +++++++++++++++ matlab/test/Ice/acm/generated/.gitignore | 1 - matlab/test/Ice/acm/msbuild/test.proj | 11 +++ matlab/test/Ice/ami/generated/.gitignore | 1 - matlab/test/Ice/ami/msbuild/test.proj | 11 +++ matlab/test/Ice/binding/generated/.gitignore | 1 - matlab/test/Ice/binding/msbuild/test.proj | 11 +++ matlab/test/Ice/checksum/generated/.gitignore | 1 - matlab/test/Ice/checksum/msbuild/test.proj | 11 +++ matlab/test/Ice/defaultValue/generated/.gitignore | 1 - matlab/test/Ice/defaultValue/msbuild/test.proj | 11 +++ matlab/test/Ice/enums/generated/.gitignore | 1 - matlab/test/Ice/enums/msbuild/test.proj | 11 +++ matlab/test/Ice/exceptions/generated/.gitignore | 1 - matlab/test/Ice/exceptions/msbuild/test.proj | 11 +++ matlab/test/Ice/facets/generated/.gitignore | 1 - matlab/test/Ice/facets/msbuild/test.proj | 11 +++ matlab/test/Ice/info/generated/.gitignore | 1 - matlab/test/Ice/info/msbuild/test.proj | 11 +++ matlab/test/Ice/inheritance/generated/.gitignore | 1 - matlab/test/Ice/inheritance/msbuild/test.proj | 11 +++ matlab/test/Ice/objects/generated/.gitignore | 1 - matlab/test/Ice/objects/msbuild/test.proj | 11 +++ matlab/test/Ice/operations/generated/.gitignore | 1 - matlab/test/Ice/operations/msbuild/test.proj | 11 +++ matlab/test/Ice/optional/generated/.gitignore | 1 - matlab/test/Ice/optional/msbuild/test.proj | 12 +++ matlab/test/Ice/proxy/generated/.gitignore | 1 - matlab/test/Ice/proxy/msbuild/test.proj | 11 +++ .../Ice/slicing/exceptions/generated/.gitignore | 1 - .../test/Ice/slicing/exceptions/msbuild/test.proj | 11 +++ .../test/Ice/slicing/objects/generated/.gitignore | 1 - matlab/test/Ice/slicing/objects/msbuild/test.proj | 11 +++ matlab/test/Ice/timeout/generated/.gitignore | 1 - matlab/test/Ice/timeout/msbuild/test.proj | 11 +++ 48 files changed, 530 insertions(+), 106 deletions(-) delete mode 100644 matlab/lib/generated/.gitignore create mode 100644 matlab/lib/msbuild/ice.proj create mode 100644 matlab/msbuild/ice.sln create mode 100644 matlab/msbuild/ice.tests.props create mode 100644 matlab/src/IceMatlab/msbuild/icematlab.vcxproj create mode 100644 matlab/src/IceMatlab/msbuild/icematlab.vcxproj.filters delete mode 100644 matlab/test/Ice/acm/generated/.gitignore create mode 100644 matlab/test/Ice/acm/msbuild/test.proj delete mode 100644 matlab/test/Ice/ami/generated/.gitignore create mode 100644 matlab/test/Ice/ami/msbuild/test.proj delete mode 100644 matlab/test/Ice/binding/generated/.gitignore create mode 100644 matlab/test/Ice/binding/msbuild/test.proj delete mode 100644 matlab/test/Ice/checksum/generated/.gitignore create mode 100644 matlab/test/Ice/checksum/msbuild/test.proj delete mode 100644 matlab/test/Ice/defaultValue/generated/.gitignore create mode 100644 matlab/test/Ice/defaultValue/msbuild/test.proj delete mode 100644 matlab/test/Ice/enums/generated/.gitignore create mode 100644 matlab/test/Ice/enums/msbuild/test.proj delete mode 100644 matlab/test/Ice/exceptions/generated/.gitignore create mode 100644 matlab/test/Ice/exceptions/msbuild/test.proj delete mode 100644 matlab/test/Ice/facets/generated/.gitignore create mode 100644 matlab/test/Ice/facets/msbuild/test.proj delete mode 100644 matlab/test/Ice/info/generated/.gitignore create mode 100644 matlab/test/Ice/info/msbuild/test.proj delete mode 100644 matlab/test/Ice/inheritance/generated/.gitignore create mode 100644 matlab/test/Ice/inheritance/msbuild/test.proj delete mode 100644 matlab/test/Ice/objects/generated/.gitignore create mode 100644 matlab/test/Ice/objects/msbuild/test.proj delete mode 100644 matlab/test/Ice/operations/generated/.gitignore create mode 100644 matlab/test/Ice/operations/msbuild/test.proj delete mode 100644 matlab/test/Ice/optional/generated/.gitignore create mode 100644 matlab/test/Ice/optional/msbuild/test.proj delete mode 100644 matlab/test/Ice/proxy/generated/.gitignore create mode 100644 matlab/test/Ice/proxy/msbuild/test.proj delete mode 100644 matlab/test/Ice/slicing/exceptions/generated/.gitignore create mode 100644 matlab/test/Ice/slicing/exceptions/msbuild/test.proj delete mode 100644 matlab/test/Ice/slicing/objects/generated/.gitignore create mode 100644 matlab/test/Ice/slicing/objects/msbuild/test.proj delete mode 100644 matlab/test/Ice/timeout/generated/.gitignore create mode 100644 matlab/test/Ice/timeout/msbuild/test.proj diff --git a/cpp/src/Slice/Preprocessor.cpp b/cpp/src/Slice/Preprocessor.cpp index 89a9874aac2..4bee00f7257 100644 --- a/cpp/src/Slice/Preprocessor.cpp +++ b/cpp/src/Slice/Preprocessor.cpp @@ -602,6 +602,7 @@ Slice::Preprocessor::printMakefileDependencies(ostream& out, Language lang, cons case SliceXML: break; case Java: + case MATLAB: { // // We want to shift the files left one position, so that @@ -724,18 +725,6 @@ Slice::Preprocessor::printMakefileDependencies(ostream& out, Language lang, cons } break; } - case MATLAB: - { - // - // Change .o[bj] suffix to .m suffix. - // - string::size_type pos; - if((pos = result.find(suffix)) != string::npos) - { - result.replace(pos, suffix.size() - 1, ".m"); - } - break; - } default: { assert(false); diff --git a/cpp/src/Slice/StringLiteralUtil.cpp b/cpp/src/Slice/StringLiteralUtil.cpp index 80c322b4d7f..6eb0e4bf650 100644 --- a/cpp/src/Slice/StringLiteralUtil.cpp +++ b/cpp/src/Slice/StringLiteralUtil.cpp @@ -175,7 +175,7 @@ StringLiteralGenerator::escapeASCIIChar(char c) // legal characters. If the trailing character after an escaped value could be consumed, we escape it // as well to terminate the original escape. // - if((lastFormat == OctalFormat && _octalChars.find(c) != string::npos) || + if((lastFormat == OctalFormat && _octalChars.find(c) != string::npos) || (lastFormat == HexFormat && _hexChars.find(c) != string::npos)) { ostringstream os; diff --git a/matlab/README.md b/matlab/README.md index b0f571ec43a..92454e6f35d 100644 --- a/matlab/README.md +++ b/matlab/README.md @@ -18,11 +18,6 @@ Prompt`. In this Command Prompt, change to the `matlab` subdirectory: cd matlab ``` -Add the MATLAB `bin` directory to your PATH if it's not there already: -``` -PATH=\bin;%PATH% -``` - Now you're ready to build Ice for MATLAB: ``` msbuild msbuild\ice.proj @@ -33,11 +28,18 @@ To build in debug mode instead: msbuild msbuild\ice.proj /p:Configuration=Debug ``` +If MATLAB is not installed in the standard location set the MSBuild `MatlabHome` +property: + +``` +msbuild msbuild\ice.proj /p:MatlabHome=C:\Program Files\MATLAB\R2016a +``` + Upon completion, the build generates the following components: - Ice for C++11 library, located in `cpp\bin\x64\Release` - slice2matlab executable, located in `cpp\bin\x64\Release` - - icematlab.mexw64 MEX file, located in `matlab\src\IceMatlab` + - icematlab.mexw64 MEX file, located in `matlab\lib\x64\Release` - MATLAB code for core Slice files, located in `matlab\lib\generated` - MATLAB code for test Slice files, located in `matlab\test\Ice\*\generated` @@ -49,7 +51,7 @@ Add the following directories to your MATLAB search path: - `matlab\lib` - `matlab\lib\generated` - - `matlab\src\IceMatlab` + - `matlab\lib\x64\Release` ### Slice Files @@ -65,8 +67,8 @@ The Ice for MATLAB library can be loaded with this command: loadlibrary icematlab ``` -The MEX file depends on `bzip2.dll` and `ice37++11.dll`. The build copied -these DLLs to `matlab\src\IceMatlab`. +The MEX file depends on `bzip2.dll` and `ice37++11.dll` that are part of the +C++ distribution. ### Running the Tests @@ -103,6 +105,7 @@ Replace `` with the host name or IP address of the server host. Assuming you've built the C++11 test servers in Debug mode on Windows, run the `allTests.py` script like this: + ``` python allTests.py --platform=x64 --cpp-config=Cpp11-Debug ``` 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 @@ + + + + + + + $(MSBuildThisFileDirectory)..\..\.. + $(IceHome)\cpp\bin\$(Platform)\$(Configuration) + + + + $(MSBuildThisFileDirectory)..\..\msbuild\packages\zeroc.ice.v140.$(IceJSOnVersion) + $(IceHome)\tools + + + + $(MSBuildThisFileDirectory)..\generated + $(IceHome)\slice + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/matlab/msbuild/ice.proj b/matlab/msbuild/ice.proj index fac1a932e91..c0d740a9efd 100644 --- a/matlab/msbuild/ice.proj +++ b/matlab/msbuild/ice.proj @@ -1,77 +1,62 @@ - - Win32 + + x64 Release - -g COMPFLAGS="/MDd /EHsc" - COMPFLAGS="/MD /EHsc" - d - - $(MSBuildThisFileDirectory)..\.. - $(topSrcDir)\slice - $(MSBuildThisFileDirectory)..\src\IceMatlab - $(MSBuildThisFileDirectory)..\test - $(topSrcDir)\cpp\bin\$(Platform)\$(Configuration)\slice2matlab - c++98\slice2matlab - c++11\ice++11 - - - - - - - - - - - - - - + - - + + + + + + + + - + + + - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + diff --git a/matlab/msbuild/ice.sln b/matlab/msbuild/ice.sln new file mode 100644 index 00000000000..bb67de11c3a --- /dev/null +++ b/matlab/msbuild/ice.sln @@ -0,0 +1,22 @@ + +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio 14 +VisualStudioVersion = 14.0.25420.1 +MinimumVisualStudioVersion = 10.0.40219.1 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "icematlab", "..\src\IceMatlab\msbuild\icematlab.vcxproj", "{89C40F1A-1761-46C1-B326-5B20BE6F8173}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|x64 = Debug|x64 + Release|x64 = Release|x64 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {89C40F1A-1761-46C1-B326-5B20BE6F8173}.Debug|x64.ActiveCfg = Debug|x64 + {89C40F1A-1761-46C1-B326-5B20BE6F8173}.Debug|x64.Build.0 = Debug|x64 + {89C40F1A-1761-46C1-B326-5B20BE6F8173}.Release|x64.ActiveCfg = Release|x64 + {89C40F1A-1761-46C1-B326-5B20BE6F8173}.Release|x64.Build.0 = Release|x64 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal diff --git a/matlab/msbuild/ice.tests.props b/matlab/msbuild/ice.tests.props new file mode 100644 index 00000000000..cca8af8c427 --- /dev/null +++ b/matlab/msbuild/ice.tests.props @@ -0,0 +1,31 @@ + + + + + + Release + x64 + $(MSBuildThisFileDirectory)..\.. + $(IceHome)\cpp\bin\$(Platform)\$(Configuration) + + + + $(MSBuildThisFileDirectory)packages\zeroc.ice.v140.$(IceJSOnVersion) + $(IceHome)\tools + + + + $(IceHome)\slice + + + + + + + + + + + + + diff --git a/matlab/src/IceMatlab/ObjectPrx.cpp b/matlab/src/IceMatlab/ObjectPrx.cpp index c2ef3d0b89b..dc6317c6963 100644 --- a/matlab/src/IceMatlab/ObjectPrx.cpp +++ b/matlab/src/IceMatlab/ObjectPrx.cpp @@ -565,7 +565,7 @@ Ice_ObjectPrx_ice_getNumEndpoints(void* self) { try { - return createResultValue(createInt(SELF->ice_getEndpoints().size())); + return createResultValue(createInt(static_cast(SELF->ice_getEndpoints().size()))); } catch(const std::exception& ex) { diff --git a/matlab/src/IceMatlab/Util.cpp b/matlab/src/IceMatlab/Util.cpp index 6259061d7e7..f4f3dd1e452 100644 --- a/matlab/src/IceMatlab/Util.cpp +++ b/matlab/src/IceMatlab/Util.cpp @@ -237,7 +237,7 @@ IceMatlab::createStringMap(const map& m) else { mwSize dims[2] = {1, 0}; - dims[1] = m.size(); + dims[1] = static_cast(m.size()); auto keys = mxCreateCellArray(2, dims); auto values = mxCreateCellArray(2, dims); int idx = 0; @@ -281,8 +281,8 @@ IceMatlab::getStringMap(mxArray* p, map& m) { for(size_t i = 0; i < n; ++i) { - auto k = getStringFromUTF16(mxGetCell(keys, i)); - auto v = getStringFromUTF16(mxGetCell(values, i)); + auto k = getStringFromUTF16(mxGetCell(keys, static_cast(i))); + auto v = getStringFromUTF16(mxGetCell(values, static_cast(i))); m[k] = v; } mxDestroyArray(keys); @@ -538,7 +538,7 @@ IceMatlab::createResultException(mxArray* ex) mxArray* IceMatlab::createStringList(const vector& v) { - auto r = mxCreateCellMatrix(1, v.size()); + auto r = mxCreateCellMatrix(1, static_cast(v.size())); mwIndex i = 0; for(auto p = v.begin(); p != v.end(); ++p, ++i) { diff --git a/matlab/src/IceMatlab/msbuild/icematlab.vcxproj b/matlab/src/IceMatlab/msbuild/icematlab.vcxproj new file mode 100644 index 00000000000..6e213ee58c1 --- /dev/null +++ b/matlab/src/IceMatlab/msbuild/icematlab.vcxproj @@ -0,0 +1,101 @@ + + + + + + Debug + x64 + + + Release + x64 + + + + {89C40F1A-1761-46C1-B326-5B20BE6F8173} + 8.1 + + + + DynamicLibrary + true + v140 + + + DynamicLibrary + false + v140 + + + + + C:\Program Files\MATLAB\R2016a + + + ..\..\..\lib\$(Platform)\$(Configuration)\ + .mexw64 + + + ..\..\..\lib\$(Platform)\$(Configuration)\ + .mexw64 + + + + MX_COMPAT_32;MATLAB_MEX_FILE;%(PreprocessorDefinitions) + $(MatlabHome)\extern\include;%(AdditionalIncludeDirectories) + + + libmx.lib;libmex.lib;libmat.lib;%(AdditionalDependencies) + /EXPORT:mexFunction %(AdditionalOptions) + $(MatlabHome)\extern\lib\win64\microsoft;%(AdditionalLibraryDirectories) + + + + + MX_COMPAT_32;MATLAB_MEX_FILE;%(PreprocessorDefinitions) + $(MatlabHome)\extern\include;;%(AdditionalIncludeDirectories) + + + libmx.lib;libmex.lib;libmat.lib;%(AdditionalDependencies) + /EXPORT:mexFunction %(AdditionalOptions) + $(MatlabHome)\extern\lib\win64\microsoft;%(AdditionalLibraryDirectories) + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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}. + + + + + diff --git a/matlab/src/IceMatlab/msbuild/icematlab.vcxproj.filters b/matlab/src/IceMatlab/msbuild/icematlab.vcxproj.filters new file mode 100644 index 00000000000..e22fb817c05 --- /dev/null +++ b/matlab/src/IceMatlab/msbuild/icematlab.vcxproj.filters @@ -0,0 +1,74 @@ + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + + + {93995380-89BD-4b04-88EB-625FBE52EBFB} + h;hh;hpp;hxx;hm;inl;inc;xsd + + + {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} + rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms + + + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + + + Resource Files + + + diff --git a/matlab/test/Ice/acm/generated/.gitignore b/matlab/test/Ice/acm/generated/.gitignore deleted file mode 100644 index 39af5887579..00000000000 --- a/matlab/test/Ice/acm/generated/.gitignore +++ /dev/null @@ -1 +0,0 @@ -# Dummy file, so that git retains this otherwise empty directory. diff --git a/matlab/test/Ice/acm/msbuild/test.proj b/matlab/test/Ice/acm/msbuild/test.proj new file mode 100644 index 00000000000..346fe84237b --- /dev/null +++ b/matlab/test/Ice/acm/msbuild/test.proj @@ -0,0 +1,11 @@ + + + + + $(MSBuildThisFileDirectory)..\generated + + + + + + diff --git a/matlab/test/Ice/ami/generated/.gitignore b/matlab/test/Ice/ami/generated/.gitignore deleted file mode 100644 index 39af5887579..00000000000 --- a/matlab/test/Ice/ami/generated/.gitignore +++ /dev/null @@ -1 +0,0 @@ -# Dummy file, so that git retains this otherwise empty directory. diff --git a/matlab/test/Ice/ami/msbuild/test.proj b/matlab/test/Ice/ami/msbuild/test.proj new file mode 100644 index 00000000000..346fe84237b --- /dev/null +++ b/matlab/test/Ice/ami/msbuild/test.proj @@ -0,0 +1,11 @@ + + + + + $(MSBuildThisFileDirectory)..\generated + + + + + + diff --git a/matlab/test/Ice/binding/generated/.gitignore b/matlab/test/Ice/binding/generated/.gitignore deleted file mode 100644 index 39af5887579..00000000000 --- a/matlab/test/Ice/binding/generated/.gitignore +++ /dev/null @@ -1 +0,0 @@ -# Dummy file, so that git retains this otherwise empty directory. diff --git a/matlab/test/Ice/binding/msbuild/test.proj b/matlab/test/Ice/binding/msbuild/test.proj new file mode 100644 index 00000000000..346fe84237b --- /dev/null +++ b/matlab/test/Ice/binding/msbuild/test.proj @@ -0,0 +1,11 @@ + + + + + $(MSBuildThisFileDirectory)..\generated + + + + + + diff --git a/matlab/test/Ice/checksum/generated/.gitignore b/matlab/test/Ice/checksum/generated/.gitignore deleted file mode 100644 index 39af5887579..00000000000 --- a/matlab/test/Ice/checksum/generated/.gitignore +++ /dev/null @@ -1 +0,0 @@ -# Dummy file, so that git retains this otherwise empty directory. diff --git a/matlab/test/Ice/checksum/msbuild/test.proj b/matlab/test/Ice/checksum/msbuild/test.proj new file mode 100644 index 00000000000..166a6761c68 --- /dev/null +++ b/matlab/test/Ice/checksum/msbuild/test.proj @@ -0,0 +1,11 @@ + + + + $(MSBuildThisFileDirectory)..\generated + --checksum test.Ice.checksum.Test.SliceChecksums + + + + + + diff --git a/matlab/test/Ice/defaultValue/generated/.gitignore b/matlab/test/Ice/defaultValue/generated/.gitignore deleted file mode 100644 index 39af5887579..00000000000 --- a/matlab/test/Ice/defaultValue/generated/.gitignore +++ /dev/null @@ -1 +0,0 @@ -# Dummy file, so that git retains this otherwise empty directory. diff --git a/matlab/test/Ice/defaultValue/msbuild/test.proj b/matlab/test/Ice/defaultValue/msbuild/test.proj new file mode 100644 index 00000000000..346fe84237b --- /dev/null +++ b/matlab/test/Ice/defaultValue/msbuild/test.proj @@ -0,0 +1,11 @@ + + + + + $(MSBuildThisFileDirectory)..\generated + + + + + + diff --git a/matlab/test/Ice/enums/generated/.gitignore b/matlab/test/Ice/enums/generated/.gitignore deleted file mode 100644 index 39af5887579..00000000000 --- a/matlab/test/Ice/enums/generated/.gitignore +++ /dev/null @@ -1 +0,0 @@ -# Dummy file, so that git retains this otherwise empty directory. diff --git a/matlab/test/Ice/enums/msbuild/test.proj b/matlab/test/Ice/enums/msbuild/test.proj new file mode 100644 index 00000000000..346fe84237b --- /dev/null +++ b/matlab/test/Ice/enums/msbuild/test.proj @@ -0,0 +1,11 @@ + + + + + $(MSBuildThisFileDirectory)..\generated + + + + + + diff --git a/matlab/test/Ice/exceptions/generated/.gitignore b/matlab/test/Ice/exceptions/generated/.gitignore deleted file mode 100644 index 39af5887579..00000000000 --- a/matlab/test/Ice/exceptions/generated/.gitignore +++ /dev/null @@ -1 +0,0 @@ -# Dummy file, so that git retains this otherwise empty directory. diff --git a/matlab/test/Ice/exceptions/msbuild/test.proj b/matlab/test/Ice/exceptions/msbuild/test.proj new file mode 100644 index 00000000000..346fe84237b --- /dev/null +++ b/matlab/test/Ice/exceptions/msbuild/test.proj @@ -0,0 +1,11 @@ + + + + + $(MSBuildThisFileDirectory)..\generated + + + + + + diff --git a/matlab/test/Ice/facets/generated/.gitignore b/matlab/test/Ice/facets/generated/.gitignore deleted file mode 100644 index 39af5887579..00000000000 --- a/matlab/test/Ice/facets/generated/.gitignore +++ /dev/null @@ -1 +0,0 @@ -# Dummy file, so that git retains this otherwise empty directory. diff --git a/matlab/test/Ice/facets/msbuild/test.proj b/matlab/test/Ice/facets/msbuild/test.proj new file mode 100644 index 00000000000..346fe84237b --- /dev/null +++ b/matlab/test/Ice/facets/msbuild/test.proj @@ -0,0 +1,11 @@ + + + + + $(MSBuildThisFileDirectory)..\generated + + + + + + diff --git a/matlab/test/Ice/info/generated/.gitignore b/matlab/test/Ice/info/generated/.gitignore deleted file mode 100644 index 39af5887579..00000000000 --- a/matlab/test/Ice/info/generated/.gitignore +++ /dev/null @@ -1 +0,0 @@ -# Dummy file, so that git retains this otherwise empty directory. diff --git a/matlab/test/Ice/info/msbuild/test.proj b/matlab/test/Ice/info/msbuild/test.proj new file mode 100644 index 00000000000..346fe84237b --- /dev/null +++ b/matlab/test/Ice/info/msbuild/test.proj @@ -0,0 +1,11 @@ + + + + + $(MSBuildThisFileDirectory)..\generated + + + + + + diff --git a/matlab/test/Ice/inheritance/generated/.gitignore b/matlab/test/Ice/inheritance/generated/.gitignore deleted file mode 100644 index 39af5887579..00000000000 --- a/matlab/test/Ice/inheritance/generated/.gitignore +++ /dev/null @@ -1 +0,0 @@ -# Dummy file, so that git retains this otherwise empty directory. diff --git a/matlab/test/Ice/inheritance/msbuild/test.proj b/matlab/test/Ice/inheritance/msbuild/test.proj new file mode 100644 index 00000000000..346fe84237b --- /dev/null +++ b/matlab/test/Ice/inheritance/msbuild/test.proj @@ -0,0 +1,11 @@ + + + + + $(MSBuildThisFileDirectory)..\generated + + + + + + diff --git a/matlab/test/Ice/objects/generated/.gitignore b/matlab/test/Ice/objects/generated/.gitignore deleted file mode 100644 index 39af5887579..00000000000 --- a/matlab/test/Ice/objects/generated/.gitignore +++ /dev/null @@ -1 +0,0 @@ -# Dummy file, so that git retains this otherwise empty directory. diff --git a/matlab/test/Ice/objects/msbuild/test.proj b/matlab/test/Ice/objects/msbuild/test.proj new file mode 100644 index 00000000000..346fe84237b --- /dev/null +++ b/matlab/test/Ice/objects/msbuild/test.proj @@ -0,0 +1,11 @@ + + + + + $(MSBuildThisFileDirectory)..\generated + + + + + + diff --git a/matlab/test/Ice/operations/generated/.gitignore b/matlab/test/Ice/operations/generated/.gitignore deleted file mode 100644 index 39af5887579..00000000000 --- a/matlab/test/Ice/operations/generated/.gitignore +++ /dev/null @@ -1 +0,0 @@ -# Dummy file, so that git retains this otherwise empty directory. diff --git a/matlab/test/Ice/operations/msbuild/test.proj b/matlab/test/Ice/operations/msbuild/test.proj new file mode 100644 index 00000000000..346fe84237b --- /dev/null +++ b/matlab/test/Ice/operations/msbuild/test.proj @@ -0,0 +1,11 @@ + + + + + $(MSBuildThisFileDirectory)..\generated + + + + + + diff --git a/matlab/test/Ice/optional/generated/.gitignore b/matlab/test/Ice/optional/generated/.gitignore deleted file mode 100644 index 39af5887579..00000000000 --- a/matlab/test/Ice/optional/generated/.gitignore +++ /dev/null @@ -1 +0,0 @@ -# Dummy file, so that git retains this otherwise empty directory. diff --git a/matlab/test/Ice/optional/msbuild/test.proj b/matlab/test/Ice/optional/msbuild/test.proj new file mode 100644 index 00000000000..270beb1cb65 --- /dev/null +++ b/matlab/test/Ice/optional/msbuild/test.proj @@ -0,0 +1,12 @@ + + + + + $(MSBuildThisFileDirectory)..\generated + -I.. + + + + + + diff --git a/matlab/test/Ice/proxy/generated/.gitignore b/matlab/test/Ice/proxy/generated/.gitignore deleted file mode 100644 index 39af5887579..00000000000 --- a/matlab/test/Ice/proxy/generated/.gitignore +++ /dev/null @@ -1 +0,0 @@ -# Dummy file, so that git retains this otherwise empty directory. diff --git a/matlab/test/Ice/proxy/msbuild/test.proj b/matlab/test/Ice/proxy/msbuild/test.proj new file mode 100644 index 00000000000..346fe84237b --- /dev/null +++ b/matlab/test/Ice/proxy/msbuild/test.proj @@ -0,0 +1,11 @@ + + + + + $(MSBuildThisFileDirectory)..\generated + + + + + + diff --git a/matlab/test/Ice/slicing/exceptions/generated/.gitignore b/matlab/test/Ice/slicing/exceptions/generated/.gitignore deleted file mode 100644 index 39af5887579..00000000000 --- a/matlab/test/Ice/slicing/exceptions/generated/.gitignore +++ /dev/null @@ -1 +0,0 @@ -# Dummy file, so that git retains this otherwise empty directory. diff --git a/matlab/test/Ice/slicing/exceptions/msbuild/test.proj b/matlab/test/Ice/slicing/exceptions/msbuild/test.proj new file mode 100644 index 00000000000..79e73cb9419 --- /dev/null +++ b/matlab/test/Ice/slicing/exceptions/msbuild/test.proj @@ -0,0 +1,11 @@ + + + + + $(MSBuildThisFileDirectory)..\generated + + + + + + diff --git a/matlab/test/Ice/slicing/objects/generated/.gitignore b/matlab/test/Ice/slicing/objects/generated/.gitignore deleted file mode 100644 index 39af5887579..00000000000 --- a/matlab/test/Ice/slicing/objects/generated/.gitignore +++ /dev/null @@ -1 +0,0 @@ -# Dummy file, so that git retains this otherwise empty directory. diff --git a/matlab/test/Ice/slicing/objects/msbuild/test.proj b/matlab/test/Ice/slicing/objects/msbuild/test.proj new file mode 100644 index 00000000000..79e73cb9419 --- /dev/null +++ b/matlab/test/Ice/slicing/objects/msbuild/test.proj @@ -0,0 +1,11 @@ + + + + + $(MSBuildThisFileDirectory)..\generated + + + + + + diff --git a/matlab/test/Ice/timeout/generated/.gitignore b/matlab/test/Ice/timeout/generated/.gitignore deleted file mode 100644 index 39af5887579..00000000000 --- a/matlab/test/Ice/timeout/generated/.gitignore +++ /dev/null @@ -1 +0,0 @@ -# Dummy file, so that git retains this otherwise empty directory. diff --git a/matlab/test/Ice/timeout/msbuild/test.proj b/matlab/test/Ice/timeout/msbuild/test.proj new file mode 100644 index 00000000000..346fe84237b --- /dev/null +++ b/matlab/test/Ice/timeout/msbuild/test.proj @@ -0,0 +1,11 @@ + + + + + $(MSBuildThisFileDirectory)..\generated + + + + + + -- cgit v1.2.3