summaryrefslogtreecommitdiff
path: root/cpp
diff options
context:
space:
mode:
authorJose <jose@zeroc.com>2017-04-13 18:37:51 +0200
committerJose <jose@zeroc.com>2017-04-13 18:37:51 +0200
commitd9777a0d1789c9c873f65865444e8c5ed5a9e5b1 (patch)
tree2d7016f83f24e925602c3e36b3138ea8cae290d4 /cpp
parentUpdate priority inversion test to no be CPU sensitive (diff)
downloadice-d9777a0d1789c9c873f65865444e8c5ed5a9e5b1.tar.bz2
ice-d9777a0d1789c9c873f65865444e8c5ed5a9e5b1.tar.xz
ice-d9777a0d1789c9c873f65865444e8c5ed5a9e5b1.zip
Add slice2rb/slice2objc compilers to Windows builds
Diffstat (limited to 'cpp')
-rw-r--r--cpp/msbuild/ice.v120.sln20
-rw-r--r--cpp/msbuild/ice.v140.sln22
-rw-r--r--cpp/msbuild/ice.v141.sln22
-rw-r--r--cpp/src/slice2objc/Gen.cpp1
-rw-r--r--cpp/src/slice2objc/Slice2Objc.rc33
-rw-r--r--cpp/src/slice2objc/msbuild/packages.config6
-rw-r--r--cpp/src/slice2objc/msbuild/slice2objc.vcxproj142
-rw-r--r--cpp/src/slice2objc/msbuild/slice2objc.vcxproj.filters44
-rw-r--r--cpp/src/slice2rb/Main.cpp7
-rw-r--r--cpp/src/slice2rb/Slice2Rb.rc33
-rw-r--r--cpp/src/slice2rb/msbuild/packages.config6
-rw-r--r--cpp/src/slice2rb/msbuild/slice2rb.vcxproj132
-rw-r--r--cpp/src/slice2rb/msbuild/slice2rb.vcxproj.filters30
13 files changed, 496 insertions, 2 deletions
diff --git a/cpp/msbuild/ice.v120.sln b/cpp/msbuild/ice.v120.sln
index da55bb8268d..931b3fdcaeb 100644
--- a/cpp/msbuild/ice.v120.sln
+++ b/cpp/msbuild/ice.v120.sln
@@ -218,6 +218,10 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "icebridge", "..\src\IceBrid
{6485EC94-6B47-428D-B42D-AAA11F08DB59} = {6485EC94-6B47-428D-B42D-AAA11F08DB59}
EndProjectSection
EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "slice2rb", "..\src\slice2rb\msbuild\slice2rb.vcxproj", "{A79E9EB0-878C-4EDB-9804-2D262D6008DB}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "slice2objc", "..\src\slice2objc\msbuild\slice2objc.vcxproj", "{D64AAD99-11C7-4C69-BD27-9FA9C71A36AC}"
+EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Win32 = Debug|Win32
@@ -514,6 +518,22 @@ Global
{1D6E8807-7C28-421F-B49E-BCB482FCB21D}.Release|Win32.Build.0 = Release|Win32
{1D6E8807-7C28-421F-B49E-BCB482FCB21D}.Release|x64.ActiveCfg = Release|x64
{1D6E8807-7C28-421F-B49E-BCB482FCB21D}.Release|x64.Build.0 = Release|x64
+ {A79E9EB0-878C-4EDB-9804-2D262D6008DB}.Debug|Win32.ActiveCfg = Debug|Win32
+ {A79E9EB0-878C-4EDB-9804-2D262D6008DB}.Debug|Win32.Build.0 = Debug|Win32
+ {A79E9EB0-878C-4EDB-9804-2D262D6008DB}.Debug|x64.ActiveCfg = Debug|x64
+ {A79E9EB0-878C-4EDB-9804-2D262D6008DB}.Debug|x64.Build.0 = Debug|x64
+ {A79E9EB0-878C-4EDB-9804-2D262D6008DB}.Release|Win32.ActiveCfg = Release|Win32
+ {A79E9EB0-878C-4EDB-9804-2D262D6008DB}.Release|Win32.Build.0 = Release|Win32
+ {A79E9EB0-878C-4EDB-9804-2D262D6008DB}.Release|x64.ActiveCfg = Release|x64
+ {A79E9EB0-878C-4EDB-9804-2D262D6008DB}.Release|x64.Build.0 = Release|x64
+ {D64AAD99-11C7-4C69-BD27-9FA9C71A36AC}.Debug|Win32.ActiveCfg = Debug|Win32
+ {D64AAD99-11C7-4C69-BD27-9FA9C71A36AC}.Debug|Win32.Build.0 = Debug|Win32
+ {D64AAD99-11C7-4C69-BD27-9FA9C71A36AC}.Debug|x64.ActiveCfg = Debug|x64
+ {D64AAD99-11C7-4C69-BD27-9FA9C71A36AC}.Debug|x64.Build.0 = Debug|x64
+ {D64AAD99-11C7-4C69-BD27-9FA9C71A36AC}.Release|Win32.ActiveCfg = Release|Win32
+ {D64AAD99-11C7-4C69-BD27-9FA9C71A36AC}.Release|Win32.Build.0 = Release|Win32
+ {D64AAD99-11C7-4C69-BD27-9FA9C71A36AC}.Release|x64.ActiveCfg = Release|x64
+ {D64AAD99-11C7-4C69-BD27-9FA9C71A36AC}.Release|x64.Build.0 = Release|x64
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
diff --git a/cpp/msbuild/ice.v140.sln b/cpp/msbuild/ice.v140.sln
index ae01595a65f..6f97d716c56 100644
--- a/cpp/msbuild/ice.v140.sln
+++ b/cpp/msbuild/ice.v140.sln
@@ -277,6 +277,10 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "icesslopenssl++11", "..\src
{5923B17D-2873-4245-87A7-FB8F4BE12501} = {5923B17D-2873-4245-87A7-FB8F4BE12501}
EndProjectSection
EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "slice2objc", "..\src\slice2objc\msbuild\slice2objc.vcxproj", "{D64AAD99-11C7-4C69-BD27-9FA9C71A36AC}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "slice2rb", "..\src\slice2rb\msbuild\slice2rb.vcxproj", "{6CC5944E-6C2D-4A7A-8EEE-3FEDC177FD54}"
+EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Win32 = Debug|Win32
@@ -661,6 +665,22 @@ Global
{D0DC2305-37FE-4D03-BE05-AC8912678DC8}.Release|Win32.Build.0 = Release|Win32
{D0DC2305-37FE-4D03-BE05-AC8912678DC8}.Release|x64.ActiveCfg = Release|x64
{D0DC2305-37FE-4D03-BE05-AC8912678DC8}.Release|x64.Build.0 = Release|x64
+ {D64AAD99-11C7-4C69-BD27-9FA9C71A36AC}.Debug|Win32.ActiveCfg = Debug|Win32
+ {D64AAD99-11C7-4C69-BD27-9FA9C71A36AC}.Debug|Win32.Build.0 = Debug|Win32
+ {D64AAD99-11C7-4C69-BD27-9FA9C71A36AC}.Debug|x64.ActiveCfg = Debug|x64
+ {D64AAD99-11C7-4C69-BD27-9FA9C71A36AC}.Debug|x64.Build.0 = Debug|x64
+ {D64AAD99-11C7-4C69-BD27-9FA9C71A36AC}.Release|Win32.ActiveCfg = Release|Win32
+ {D64AAD99-11C7-4C69-BD27-9FA9C71A36AC}.Release|Win32.Build.0 = Release|Win32
+ {D64AAD99-11C7-4C69-BD27-9FA9C71A36AC}.Release|x64.ActiveCfg = Release|x64
+ {D64AAD99-11C7-4C69-BD27-9FA9C71A36AC}.Release|x64.Build.0 = Release|x64
+ {6CC5944E-6C2D-4A7A-8EEE-3FEDC177FD54}.Debug|Win32.ActiveCfg = Debug|Win32
+ {6CC5944E-6C2D-4A7A-8EEE-3FEDC177FD54}.Debug|Win32.Build.0 = Debug|Win32
+ {6CC5944E-6C2D-4A7A-8EEE-3FEDC177FD54}.Debug|x64.ActiveCfg = Debug|x64
+ {6CC5944E-6C2D-4A7A-8EEE-3FEDC177FD54}.Debug|x64.Build.0 = Debug|x64
+ {6CC5944E-6C2D-4A7A-8EEE-3FEDC177FD54}.Release|Win32.ActiveCfg = Release|Win32
+ {6CC5944E-6C2D-4A7A-8EEE-3FEDC177FD54}.Release|Win32.Build.0 = Release|Win32
+ {6CC5944E-6C2D-4A7A-8EEE-3FEDC177FD54}.Release|x64.ActiveCfg = Release|x64
+ {6CC5944E-6C2D-4A7A-8EEE-3FEDC177FD54}.Release|x64.Build.0 = Release|x64
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
@@ -713,5 +733,7 @@ Global
{1D6E8807-7C28-421F-B49E-BCB482FCB21D} = {2DC2B270-B7AE-48CF-8FB0-41A55A9747E9}
{0D08F6B8-39C0-413B-84CE-D73230BCC740} = {2DC2B270-B7AE-48CF-8FB0-41A55A9747E9}
{D0DC2305-37FE-4D03-BE05-AC8912678DC8} = {F48CC091-6F26-4EC8-A2FB-485975E7C908}
+ {D64AAD99-11C7-4C69-BD27-9FA9C71A36AC} = {2DC2B270-B7AE-48CF-8FB0-41A55A9747E9}
+ {6CC5944E-6C2D-4A7A-8EEE-3FEDC177FD54} = {2DC2B270-B7AE-48CF-8FB0-41A55A9747E9}
EndGlobalSection
EndGlobal
diff --git a/cpp/msbuild/ice.v141.sln b/cpp/msbuild/ice.v141.sln
index 313b2aff897..679895ad300 100644
--- a/cpp/msbuild/ice.v141.sln
+++ b/cpp/msbuild/ice.v141.sln
@@ -267,6 +267,10 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "icebridge", "..\src\IceBrid
{6485EC94-6B47-428D-B42D-AAA11F08DB59} = {6485EC94-6B47-428D-B42D-AAA11F08DB59}
EndProjectSection
EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "slice2rb", "..\src\slice2rb\msbuild\slice2rb.vcxproj", "{6CC5944E-6C2D-4A7A-8EEE-3FEDC177FD54}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "slice2objc", "..\src\slice2objc\msbuild\slice2objc.vcxproj", "{D64AAD99-11C7-4C69-BD27-9FA9C71A36AC}"
+EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Win32 = Debug|Win32
@@ -635,6 +639,22 @@ Global
{1D6E8807-7C28-421F-B49E-BCB482FCB21D}.Release|Win32.Build.0 = Release|Win32
{1D6E8807-7C28-421F-B49E-BCB482FCB21D}.Release|x64.ActiveCfg = Release|x64
{1D6E8807-7C28-421F-B49E-BCB482FCB21D}.Release|x64.Build.0 = Release|x64
+ {6CC5944E-6C2D-4A7A-8EEE-3FEDC177FD54}.Debug|Win32.ActiveCfg = Debug|Win32
+ {6CC5944E-6C2D-4A7A-8EEE-3FEDC177FD54}.Debug|Win32.Build.0 = Debug|Win32
+ {6CC5944E-6C2D-4A7A-8EEE-3FEDC177FD54}.Debug|x64.ActiveCfg = Debug|x64
+ {6CC5944E-6C2D-4A7A-8EEE-3FEDC177FD54}.Debug|x64.Build.0 = Debug|x64
+ {6CC5944E-6C2D-4A7A-8EEE-3FEDC177FD54}.Release|Win32.ActiveCfg = Release|Win32
+ {6CC5944E-6C2D-4A7A-8EEE-3FEDC177FD54}.Release|Win32.Build.0 = Release|Win32
+ {6CC5944E-6C2D-4A7A-8EEE-3FEDC177FD54}.Release|x64.ActiveCfg = Release|x64
+ {6CC5944E-6C2D-4A7A-8EEE-3FEDC177FD54}.Release|x64.Build.0 = Release|x64
+ {D64AAD99-11C7-4C69-BD27-9FA9C71A36AC}.Debug|Win32.ActiveCfg = Debug|Win32
+ {D64AAD99-11C7-4C69-BD27-9FA9C71A36AC}.Debug|Win32.Build.0 = Debug|Win32
+ {D64AAD99-11C7-4C69-BD27-9FA9C71A36AC}.Debug|x64.ActiveCfg = Debug|x64
+ {D64AAD99-11C7-4C69-BD27-9FA9C71A36AC}.Debug|x64.Build.0 = Debug|x64
+ {D64AAD99-11C7-4C69-BD27-9FA9C71A36AC}.Release|Win32.ActiveCfg = Release|Win32
+ {D64AAD99-11C7-4C69-BD27-9FA9C71A36AC}.Release|Win32.Build.0 = Release|Win32
+ {D64AAD99-11C7-4C69-BD27-9FA9C71A36AC}.Release|x64.ActiveCfg = Release|x64
+ {D64AAD99-11C7-4C69-BD27-9FA9C71A36AC}.Release|x64.Build.0 = Release|x64
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
@@ -685,5 +705,7 @@ Global
{541CF1D6-95FD-4499-AB02-75CCCEE660B0} = {2DC2B270-B7AE-48CF-8FB0-41A55A9747E9}
{369524F4-D374-44F4-BCFD-408934595701} = {2DC2B270-B7AE-48CF-8FB0-41A55A9747E9}
{1D6E8807-7C28-421F-B49E-BCB482FCB21D} = {2DC2B270-B7AE-48CF-8FB0-41A55A9747E9}
+ {6CC5944E-6C2D-4A7A-8EEE-3FEDC177FD54} = {2DC2B270-B7AE-48CF-8FB0-41A55A9747E9}
+ {D64AAD99-11C7-4C69-BD27-9FA9C71A36AC} = {2DC2B270-B7AE-48CF-8FB0-41A55A9747E9}
EndGlobalSection
EndGlobal
diff --git a/cpp/src/slice2objc/Gen.cpp b/cpp/src/slice2objc/Gen.cpp
index a8b9dd66f03..10012bcb1ba 100644
--- a/cpp/src/slice2objc/Gen.cpp
+++ b/cpp/src/slice2objc/Gen.cpp
@@ -7,6 +7,7 @@
//
// **********************************************************************
+#include <IceUtil/DisableWarnings.h>
#include <IceUtil/Functional.h>
#include "Gen.h"
#include <limits>
diff --git a/cpp/src/slice2objc/Slice2Objc.rc b/cpp/src/slice2objc/Slice2Objc.rc
new file mode 100644
index 00000000000..321c5bf3753
--- /dev/null
+++ b/cpp/src/slice2objc/Slice2Objc.rc
@@ -0,0 +1,33 @@
+#include<IceUtil/ResourceConfig.h>
+
+#define ICE_INTERNALNAME "slice2objc\0"
+#define ICE_ORIGINALFILENAME "slice2objc.exe\0"
+
+VS_VERSION_INFO VERSIONINFO
+FILEVERSION ICE_VERSION
+PRODUCTVERSION ICE_VERSION
+FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
+FILEOS VOS_NT_WINDOWS32
+FILETYPE VFT_APP
+FILESUBTYPE VFT2_UNKNOWN
+FILEFLAGS VER_DEBUG
+BEGIN
+ BLOCK "StringFileInfo"
+ BEGIN
+ BLOCK "040904e4"
+ BEGIN
+ VALUE "CompanyName", ICE_COMPANY_NAME
+ VALUE "FileDescription", "Slice to Objetive-C Translator\0"
+ VALUE "FileVersion", ICE_STRING_VERSION
+ VALUE "InternalName", ICE_INTERNALNAME
+ VALUE "LegalCopyright", ICE_COPYRIGHT
+ VALUE "OriginalFilename", ICE_ORIGINALFILENAME
+ VALUE "ProductName", ICE_PRODUCT_NAME
+ VALUE "ProductVersion", ICE_STRING_VERSION
+ END
+ END
+ BLOCK "VarFileInfo"
+ BEGIN
+ VALUE "Translation", 0x409, 1252
+ END
+END
diff --git a/cpp/src/slice2objc/msbuild/packages.config b/cpp/src/slice2objc/msbuild/packages.config
new file mode 100644
index 00000000000..3843006e3cd
--- /dev/null
+++ b/cpp/src/slice2objc/msbuild/packages.config
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+ <package id="mcpp.v120" version="2.7.2.12" targetFramework="native" />
+ <package id="mcpp.v140" version="2.7.2.12" targetFramework="native" />
+ <package id="mcpp.v141" version="2.7.2.12" targetFramework="native" />
+</packages> \ No newline at end of file
diff --git a/cpp/src/slice2objc/msbuild/slice2objc.vcxproj b/cpp/src/slice2objc/msbuild/slice2objc.vcxproj
new file mode 100644
index 00000000000..302d9d35112
--- /dev/null
+++ b/cpp/src/slice2objc/msbuild/slice2objc.vcxproj
@@ -0,0 +1,142 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <ItemGroup Label="ProjectConfigurations">
+ <ProjectConfiguration Include="Debug|Win32">
+ <Configuration>Debug</Configuration>
+ <Platform>Win32</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Release|Win32">
+ <Configuration>Release</Configuration>
+ <Platform>Win32</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Debug|x64">
+ <Configuration>Debug</Configuration>
+ <Platform>x64</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Release|x64">
+ <Configuration>Release</Configuration>
+ <Platform>x64</Platform>
+ </ProjectConfiguration>
+ </ItemGroup>
+ <PropertyGroup Label="Globals">
+ <ProjectGuid>{D64AAD99-11C7-4C69-BD27-9FA9C71A36AC}</ProjectGuid>
+ </PropertyGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+ <ConfigurationType>Application</ConfigurationType>
+ <UseDebugLibraries>true</UseDebugLibraries>
+ <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+ <ConfigurationType>Application</ConfigurationType>
+ <UseDebugLibraries>false</UseDebugLibraries>
+ <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+ <ConfigurationType>Application</ConfigurationType>
+ <UseDebugLibraries>true</UseDebugLibraries>
+ <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+ <ConfigurationType>Application</ConfigurationType>
+ <UseDebugLibraries>false</UseDebugLibraries>
+ <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
+ </PropertyGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+ <Import Project="$(MSBuildThisFileDirectory)\..\..\..\msbuild\ice.cpp98.props" />
+ <ImportGroup Label="ExtensionSettings">
+ </ImportGroup>
+ <ImportGroup Label="Shared">
+ </ImportGroup>
+ <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
+ <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
+ <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
+ <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
+ <PropertyGroup Label="UserMacros" />
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+ <ClCompile>
+ <PreprocessorDefinitions>ICE_STATIC_LIBS;ICE_BUILDING_SLICE_COMPILERS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+ <AdditionalIncludeDirectories>..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ </ClCompile>
+ <Link>
+ <AdditionalDependencies>rpcrt4.lib;advapi32.lib;DbgHelp.lib;Shlwapi.lib</AdditionalDependencies>
+ </Link>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+ <ClCompile>
+ <PreprocessorDefinitions>ICE_STATIC_LIBS;ICE_BUILDING_SLICE_COMPILERS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+ <AdditionalIncludeDirectories>..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ </ClCompile>
+ <Link>
+ <AdditionalDependencies>rpcrt4.lib;advapi32.lib;DbgHelp.lib;Shlwapi.lib</AdditionalDependencies>
+ </Link>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+ <ClCompile>
+ <PreprocessorDefinitions>ICE_STATIC_LIBS;ICE_BUILDING_SLICE_COMPILERS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+ <AdditionalIncludeDirectories>..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ </ClCompile>
+ <Link>
+ <AdditionalDependencies>rpcrt4.lib;advapi32.lib;DbgHelp.lib;Shlwapi.lib</AdditionalDependencies>
+ </Link>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+ <ClCompile>
+ <PreprocessorDefinitions>ICE_STATIC_LIBS;ICE_BUILDING_SLICE_COMPILERS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+ <AdditionalIncludeDirectories>..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ </ClCompile>
+ <Link>
+ <AdditionalDependencies>rpcrt4.lib;advapi32.lib;DbgHelp.lib;Shlwapi.lib</AdditionalDependencies>
+ </Link>
+ </ItemDefinitionGroup>
+ <ItemGroup>
+ <ClCompile Include="..\Gen.cpp" />
+ <ClCompile Include="..\Main.cpp" />
+ <ClCompile Include="..\ObjCUtil.cpp" />
+ </ItemGroup>
+ <ItemGroup>
+ <ClInclude Include="..\Gen.h" />
+ <ClInclude Include="..\ObjCUtil.h" />
+ </ItemGroup>
+ <ItemGroup>
+ <ProjectReference Include="..\..\IceUtil\msbuild\iceutil\iceutil.vcxproj">
+ <Project>{4d1a5110-3176-44ba-8bbb-57bf56519b9f}</Project>
+ </ProjectReference>
+ <ProjectReference Include="..\..\Slice\msbuild\slice.vcxproj">
+ <Project>{57cd6ac2-0c9d-4648-9e9d-5df60c90f18a}</Project>
+ </ProjectReference>
+ </ItemGroup>
+ <ItemGroup>
+ <None Include="packages.config" />
+ </ItemGroup>
+ <ItemGroup>
+ <ResourceCompile Include="..\Slice2Objc.rc" />
+ </ItemGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+ <ImportGroup Label="ExtensionTargets">
+ <Import Project="..\..\..\msbuild\packages\mcpp.v120.2.7.2.12\build\native\mcpp.v120.targets" Condition="Exists('..\..\..\msbuild\packages\mcpp.v120.2.7.2.12\build\native\mcpp.v120.targets')" />
+ <Import Project="..\..\..\msbuild\packages\mcpp.v140.2.7.2.12\build\native\mcpp.v140.targets" Condition="Exists('..\..\..\msbuild\packages\mcpp.v140.2.7.2.12\build\native\mcpp.v140.targets')" />
+ <Import Project="..\..\..\msbuild\packages\mcpp.v141.2.7.2.12\build\native\mcpp.v141.targets" Condition="Exists('..\..\..\msbuild\packages\mcpp.v141.2.7.2.12\build\native\mcpp.v141.targets')" />
+ </ImportGroup>
+ <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
+ <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\mcpp.v120.2.7.2.12\build\native\mcpp.v120.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\msbuild\packages\mcpp.v120.2.7.2.12\build\native\mcpp.v120.targets'))" />
+ <Error Condition="!Exists('..\..\..\msbuild\packages\mcpp.v140.2.7.2.12\build\native\mcpp.v140.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\msbuild\packages\mcpp.v140.2.7.2.12\build\native\mcpp.v140.targets'))" />
+ <Error Condition="!Exists('..\..\..\msbuild\packages\mcpp.v141.2.7.2.12\build\native\mcpp.v141.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\msbuild\packages\mcpp.v141.2.7.2.12\build\native\mcpp.v141.targets'))" />
+ </Target>
+ <Import Project="$(MSBuildThisFileDirectory)..\..\..\..\config\ice.sign.targets" />
+</Project> \ No newline at end of file
diff --git a/cpp/src/slice2objc/msbuild/slice2objc.vcxproj.filters b/cpp/src/slice2objc/msbuild/slice2objc.vcxproj.filters
new file mode 100644
index 00000000000..05c7cb1a564
--- /dev/null
+++ b/cpp/src/slice2objc/msbuild/slice2objc.vcxproj.filters
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <ItemGroup>
+ <Filter Include="Source Files">
+ <UniqueIdentifier>{8EB6FF19-8937-44E6-B2B9-95011E58BAB7}</UniqueIdentifier>
+ <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
+ </Filter>
+ <Filter Include="Header Files">
+ <UniqueIdentifier>{6CB2FD02-0536-4B80-88F4-599F4282F634}</UniqueIdentifier>
+ <Extensions>h;hh;hpp;hxx;hm;inl;inc;xsd</Extensions>
+ </Filter>
+ <Filter Include="Resource Files">
+ <UniqueIdentifier>{ACD7D6F4-3B28-4319-B9AF-3564023394C6}</UniqueIdentifier>
+ <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
+ </Filter>
+ </ItemGroup>
+ <ItemGroup>
+ <ClCompile Include="..\Gen.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\Main.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\ObjCUtil.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ </ItemGroup>
+ <ItemGroup>
+ <ClInclude Include="..\Gen.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\ObjCUtil.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ </ItemGroup>
+ <ItemGroup>
+ <None Include="packages.config" />
+ </ItemGroup>
+ <ItemGroup>
+ <ResourceCompile Include="..\Slice2Objc.rc">
+ <Filter>Resource Files</Filter>
+ </ResourceCompile>
+ </ItemGroup>
+</Project> \ No newline at end of file
diff --git a/cpp/src/slice2rb/Main.cpp b/cpp/src/slice2rb/Main.cpp
index 13b0fb69ec5..3a9d80b1bf7 100644
--- a/cpp/src/slice2rb/Main.cpp
+++ b/cpp/src/slice2rb/Main.cpp
@@ -16,8 +16,11 @@ using namespace Slice;
using namespace Slice::Ruby;
using namespace IceUtilInternal;
-int
-main(int argc, char* argv[])
+#ifdef _WIN32
+int wmain(int argc, wchar_t* argv[])
+#else
+int main(int argc, char* argv[])
+#endif
{
vector<string> args = Slice::argvToArgs(argc, argv);
try
diff --git a/cpp/src/slice2rb/Slice2Rb.rc b/cpp/src/slice2rb/Slice2Rb.rc
new file mode 100644
index 00000000000..842c68eb725
--- /dev/null
+++ b/cpp/src/slice2rb/Slice2Rb.rc
@@ -0,0 +1,33 @@
+#include<IceUtil/ResourceConfig.h>
+
+#define ICE_INTERNALNAME "slice2rb\0"
+#define ICE_ORIGINALFILENAME "slice2rb.exe\0"
+
+VS_VERSION_INFO VERSIONINFO
+FILEVERSION ICE_VERSION
+PRODUCTVERSION ICE_VERSION
+FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
+FILEOS VOS_NT_WINDOWS32
+FILETYPE VFT_APP
+FILESUBTYPE VFT2_UNKNOWN
+FILEFLAGS VER_DEBUG
+BEGIN
+ BLOCK "StringFileInfo"
+ BEGIN
+ BLOCK "040904e4"
+ BEGIN
+ VALUE "CompanyName", ICE_COMPANY_NAME
+ VALUE "FileDescription", "Slice to Ruby Translator\0"
+ VALUE "FileVersion", ICE_STRING_VERSION
+ VALUE "InternalName", ICE_INTERNALNAME
+ VALUE "LegalCopyright", ICE_COPYRIGHT
+ VALUE "OriginalFilename", ICE_ORIGINALFILENAME
+ VALUE "ProductName", ICE_PRODUCT_NAME
+ VALUE "ProductVersion", ICE_STRING_VERSION
+ END
+ END
+ BLOCK "VarFileInfo"
+ BEGIN
+ VALUE "Translation", 0x409, 1252
+ END
+END
diff --git a/cpp/src/slice2rb/msbuild/packages.config b/cpp/src/slice2rb/msbuild/packages.config
new file mode 100644
index 00000000000..3843006e3cd
--- /dev/null
+++ b/cpp/src/slice2rb/msbuild/packages.config
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+ <package id="mcpp.v120" version="2.7.2.12" targetFramework="native" />
+ <package id="mcpp.v140" version="2.7.2.12" targetFramework="native" />
+ <package id="mcpp.v141" version="2.7.2.12" targetFramework="native" />
+</packages> \ No newline at end of file
diff --git a/cpp/src/slice2rb/msbuild/slice2rb.vcxproj b/cpp/src/slice2rb/msbuild/slice2rb.vcxproj
new file mode 100644
index 00000000000..c96710b7df8
--- /dev/null
+++ b/cpp/src/slice2rb/msbuild/slice2rb.vcxproj
@@ -0,0 +1,132 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <ItemGroup Label="ProjectConfigurations">
+ <ProjectConfiguration Include="Debug|Win32">
+ <Configuration>Debug</Configuration>
+ <Platform>Win32</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Release|Win32">
+ <Configuration>Release</Configuration>
+ <Platform>Win32</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Debug|x64">
+ <Configuration>Debug</Configuration>
+ <Platform>x64</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Release|x64">
+ <Configuration>Release</Configuration>
+ <Platform>x64</Platform>
+ </ProjectConfiguration>
+ </ItemGroup>
+ <PropertyGroup Label="Globals">
+ <ProjectGuid>{A79E9EB0-878C-4EDB-9804-2D262D6008DB}</ProjectGuid>
+ </PropertyGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+ <ConfigurationType>Application</ConfigurationType>
+ <UseDebugLibraries>true</UseDebugLibraries>
+ <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+ <ConfigurationType>Application</ConfigurationType>
+ <UseDebugLibraries>false</UseDebugLibraries>
+ <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+ <ConfigurationType>Application</ConfigurationType>
+ <UseDebugLibraries>true</UseDebugLibraries>
+ <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+ <ConfigurationType>Application</ConfigurationType>
+ <UseDebugLibraries>false</UseDebugLibraries>
+ <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
+ </PropertyGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+ <Import Project="$(MSBuildThisFileDirectory)\..\..\..\msbuild\ice.cpp98.props" />
+ <ImportGroup Label="ExtensionSettings">
+ </ImportGroup>
+ <ImportGroup Label="Shared">
+ </ImportGroup>
+ <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
+ <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
+ <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
+ <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
+ <PropertyGroup Label="UserMacros" />
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+ <ClCompile>
+ <PreprocessorDefinitions>ICE_STATIC_LIBS;ICE_BUILDING_SLICE_COMPILERS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+ </ClCompile>
+ <Link>
+ <AdditionalDependencies>rpcrt4.lib;advapi32.lib;DbgHelp.lib;Shlwapi.lib</AdditionalDependencies>
+ </Link>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+ <ClCompile>
+ <PreprocessorDefinitions>ICE_STATIC_LIBS;ICE_BUILDING_SLICE_COMPILERS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+ </ClCompile>
+ <Link>
+ <AdditionalDependencies>rpcrt4.lib;advapi32.lib;DbgHelp.lib;Shlwapi.lib</AdditionalDependencies>
+ </Link>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+ <ClCompile>
+ <PreprocessorDefinitions>ICE_STATIC_LIBS;ICE_BUILDING_SLICE_COMPILERS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+ </ClCompile>
+ <Link>
+ <AdditionalDependencies>rpcrt4.lib;advapi32.lib;DbgHelp.lib;Shlwapi.lib</AdditionalDependencies>
+ </Link>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+ <ClCompile>
+ <PreprocessorDefinitions>ICE_STATIC_LIBS;ICE_BUILDING_SLICE_COMPILERS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+ </ClCompile>
+ <Link>
+ <AdditionalDependencies>rpcrt4.lib;advapi32.lib;DbgHelp.lib;Shlwapi.lib</AdditionalDependencies>
+ </Link>
+ </ItemDefinitionGroup>
+ <ItemGroup>
+ <ClCompile Include="..\Main.cpp" />
+ </ItemGroup>
+ <ItemGroup>
+ <ProjectReference Include="..\..\IceUtil\msbuild\iceutil\iceutil.vcxproj">
+ <Project>{4d1a5110-3176-44ba-8bbb-57bf56519b9f}</Project>
+ </ProjectReference>
+ <ProjectReference Include="..\..\Slice\msbuild\slice.vcxproj">
+ <Project>{57cd6ac2-0c9d-4648-9e9d-5df60c90f18a}</Project>
+ </ProjectReference>
+ </ItemGroup>
+ <ItemGroup>
+ <None Include="packages.config" />
+ </ItemGroup>
+ <ItemGroup>
+ <ResourceCompile Include="..\Slice2Rb.rc" />
+ </ItemGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+ <ImportGroup Label="ExtensionTargets">
+ <Import Project="..\..\..\msbuild\packages\mcpp.v120.2.7.2.12\build\native\mcpp.v120.targets" Condition="Exists('..\..\..\msbuild\packages\mcpp.v120.2.7.2.12\build\native\mcpp.v120.targets')" />
+ <Import Project="..\..\..\msbuild\packages\mcpp.v140.2.7.2.12\build\native\mcpp.v140.targets" Condition="Exists('..\..\..\msbuild\packages\mcpp.v140.2.7.2.12\build\native\mcpp.v140.targets')" />
+ <Import Project="..\..\..\msbuild\packages\mcpp.v141.2.7.2.12\build\native\mcpp.v141.targets" Condition="Exists('..\..\..\msbuild\packages\mcpp.v141.2.7.2.12\build\native\mcpp.v141.targets')" />
+ </ImportGroup>
+ <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
+ <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\mcpp.v120.2.7.2.12\build\native\mcpp.v120.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\msbuild\packages\mcpp.v120.2.7.2.12\build\native\mcpp.v120.targets'))" />
+ <Error Condition="!Exists('..\..\..\msbuild\packages\mcpp.v140.2.7.2.12\build\native\mcpp.v140.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\msbuild\packages\mcpp.v140.2.7.2.12\build\native\mcpp.v140.targets'))" />
+ <Error Condition="!Exists('..\..\..\msbuild\packages\mcpp.v141.2.7.2.12\build\native\mcpp.v141.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\msbuild\packages\mcpp.v141.2.7.2.12\build\native\mcpp.v141.targets'))" />
+ </Target>
+ <Import Project="$(MSBuildThisFileDirectory)..\..\..\..\config\ice.sign.targets" />
+</Project> \ No newline at end of file
diff --git a/cpp/src/slice2rb/msbuild/slice2rb.vcxproj.filters b/cpp/src/slice2rb/msbuild/slice2rb.vcxproj.filters
new file mode 100644
index 00000000000..cee1b5dfe7f
--- /dev/null
+++ b/cpp/src/slice2rb/msbuild/slice2rb.vcxproj.filters
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <ItemGroup>
+ <Filter Include="Source Files">
+ <UniqueIdentifier>{8EB6FF19-8937-44E6-B2B9-95011E58BAB7}</UniqueIdentifier>
+ <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
+ </Filter>
+ <Filter Include="Header Files">
+ <UniqueIdentifier>{6CB2FD02-0536-4B80-88F4-599F4282F634}</UniqueIdentifier>
+ <Extensions>h;hh;hpp;hxx;hm;inl;inc;xsd</Extensions>
+ </Filter>
+ <Filter Include="Resource Files">
+ <UniqueIdentifier>{ACD7D6F4-3B28-4319-B9AF-3564023394C6}</UniqueIdentifier>
+ <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
+ </Filter>
+ </ItemGroup>
+ <ItemGroup>
+ <ClCompile Include="..\Main.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ </ItemGroup>
+ <ItemGroup>
+ <None Include="packages.config" />
+ </ItemGroup>
+ <ItemGroup>
+ <ResourceCompile Include="..\Slice2Rb.rc">
+ <Filter>Resource Files</Filter>
+ </ResourceCompile>
+ </ItemGroup>
+</Project> \ No newline at end of file