diff options
53 files changed, 177 insertions, 177 deletions
diff --git a/cpp/config/ice.cpp.props b/cpp/config/ice.cpp.props index bbd4730e1bf..2aeefcf94de 100644 --- a/cpp/config/ice.cpp.props +++ b/cpp/config/ice.cpp.props @@ -1,15 +1,15 @@ <?xml version="1.0" encoding="utf-8"?> <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <PropertyGroup Condition="'$(UseDebugLibraries)' == 'true'"> - <Ice_Configuration>Debug</Ice_Configuration> + <IceConfiguration>Debug</IceConfiguration> </PropertyGroup> <PropertyGroup Condition="'$(UseDebugLibraries)' != 'true'"> - <Ice_Configuration>Release</Ice_Configuration> + <IceConfiguration>Release</IceConfiguration> </PropertyGroup> - <PropertyGroup Condition="'$(Ice_CppMapping)' == ''"> - <Ice_CppMapping>cpp98</Ice_CppMapping> + <PropertyGroup Condition="'$(IceCppMapping)' == ''"> + <IceCppMapping>cpp98</IceCppMapping> </PropertyGroup> <PropertyGroup Condition="'$(Platform)'=='Win32'"> @@ -27,9 +27,9 @@ <!-- Source distributions library, binary and include paths --> <PropertyGroup Condition="Exists('$(IceSourceHome)')"> - <IceBinPath>$(IceHome)\cpp\bin\$(Platform)\$(Ice_Configuration)</IceBinPath> - <IceLibraryPath>$(IceHome)\cpp\lib\$(Ice_Platform)\$(Ice_Configuration)</IceLibraryPath> - <IceIncludePath>$(IceHome)\cpp\include;$(IceHome)\cpp\include\generated\$(Ice_CppMapping)\$(Platform)\$(Ice_Configuration)</IceIncludePath> + <IceBinPath>$(IceHome)\cpp\bin\$(Platform)\$(IceConfiguration)</IceBinPath> + <IceLibraryPath>$(IceHome)\cpp\lib\$(Ice_Platform)\$(IceConfiguration)</IceLibraryPath> + <IceIncludePath>$(IceHome)\cpp\include;$(IceHome)\cpp\include\generated\$(IceCppMapping)\$(Platform)\$(IceConfiguration)</IceIncludePath> <IceToolsPath>$(IceBinPath)</IceToolsPath> <Path>$(IceBinPath);$(Path)</Path> diff --git a/cpp/msbuild/ice.cpp.props b/cpp/msbuild/ice.cpp.props index 54cf422d786..acf07cd2d00 100644 --- a/cpp/msbuild/ice.cpp.props +++ b/cpp/msbuild/ice.cpp.props @@ -4,7 +4,7 @@ If we are building Ice source distribution or if ICE_BIN_DIST was not set to yes, set IceHome to point to this source distribution. --> - <PropertyGroup Condition="'$(ICE_BIN_DIST)' != 'all' or '$(Ice_BuildingSrc)' == yes"> + <PropertyGroup Condition="'$(ICE_BIN_DIST)' != 'all' or '$(IceBuildingSrc)' == yes"> <IceHome>$(MSBuildThisFileDirectory)..\..</IceHome> </PropertyGroup> @@ -23,7 +23,7 @@ Common properties --> <PropertyGroup> - <Ice_SrcRootDir>$([System.IO.Path]::GetFullPath('$(MSBuildThisFileDirectory)\..'))</Ice_SrcRootDir> + <IceSrcRootDir>$([System.IO.Path]::GetFullPath('$(MSBuildThisFileDirectory)\..'))</IceSrcRootDir> <IntDir>$(Platform)\$(Configuration)\</IntDir> <IceBuilderOutputDir Condition="'$(IceBuilderOutputDir)' == ''">$(Platform)\$(Configuration)</IceBuilderOutputDir> <LinkIncremental>false</LinkIncremental> @@ -32,30 +32,30 @@ <Choose> <When Condition="'$(ConfigurationType)' == 'StaticLibrary'"> <PropertyGroup> - <OutDir>$(Ice_SrcRootDir)\lib\$(Platform)\$(Configuration)\</OutDir> + <OutDir>$(IceSrcRootDir)\lib\$(Platform)\$(Configuration)\</OutDir> </PropertyGroup> </When> <Otherwise> <PropertyGroup> - <OutDir>$(Ice_SrcRootDir)\bin\$(Platform)\$(Configuration)\</OutDir> + <OutDir>$(IceSrcRootDir)\bin\$(Platform)\$(Configuration)\</OutDir> </PropertyGroup> </Otherwise> </Choose> <!-- - Ice_Configuration to use for C++ builds, we map all configurations that use + IceConfiguration to use for C++ builds, we map all configurations that use debug libraries to Debug configuration, this allow us to define common settings for the different debug configurations "Debug" and "Cpp11-Debug" --> <Choose> <When Condition="'$(UseDebugLibraries)' == 'true'"> <PropertyGroup> - <Ice_Configuration>Debug</Ice_Configuration> + <IceConfiguration>Debug</IceConfiguration> </PropertyGroup> </When> <Otherwise> <PropertyGroup> - <Ice_Configuration>Release</Ice_Configuration> + <IceConfiguration>Release</IceConfiguration> </PropertyGroup> </Otherwise> </Choose> @@ -76,7 +76,7 @@ <PrecompiledHeaderOutputFile /> <OmitFramePointers>false</OmitFramePointers> <PrecompiledHeader>NotUsing</PrecompiledHeader> - <AdditionalIncludeDirectories>$(Ice_SrcRootDir)\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <AdditionalIncludeDirectories>$(IceSrcRootDir)\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <!-- PDB settings --> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName> @@ -91,7 +91,7 @@ <!-- Common properties set for all debug builds and platforms. --> - <ItemDefinitionGroup Condition="'$(Ice_Configuration)'=='Debug'"> + <ItemDefinitionGroup Condition="'$(IceConfiguration)'=='Debug'"> <ClCompile> <Optimization>Disabled</Optimization> <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> @@ -137,7 +137,7 @@ <!-- Common properties set for all release builds and platforms. --> - <ItemDefinitionGroup Condition="'$(Ice_Configuration)'=='Release'"> + <ItemDefinitionGroup Condition="'$(IceConfiguration)'=='Release'"> <ClCompile> <Optimization>MaxSpeed</Optimization> <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> @@ -149,7 +149,7 @@ Definitions required when building the C++11 mapping, note that UWP also use the C++11 mapping. --> - <ItemDefinitionGroup Condition="'$(Ice_CppMapping)' == 'cpp11' or '$(Ice_CppMapping)' == 'uwp'"> + <ItemDefinitionGroup Condition="'$(IceCppMapping)' == 'cpp11' or '$(IceCppMapping)' == 'uwp'"> <ClCompile> <PreprocessorDefinitions>ICE_CPP11_MAPPING;%(PreprocessorDefinitions)</PreprocessorDefinitions> </ClCompile> @@ -162,27 +162,27 @@ <!-- Definitions that are only required when build Ice C++ source distribution as opposed to test suite. --> - <ItemDefinitionGroup Condition="'$(Ice_BuildingSrc)' == 'yes'"> + <ItemDefinitionGroup Condition="'$(IceBuildingSrc)' == 'yes'"> <ClCompile> - <AdditionalIncludeDirectories>$(Ice_SrcRootDir)\include\generated\$(Ice_CppMapping)\$(Platform)\$(Ice_Configuration); - $(Ice_SrcRootDir)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - <PreprocessorDefinitions Condition="'$(Ice_LanguageMapping)' == 'cpp'">ICE_BUILDING_SRC;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <AdditionalIncludeDirectories>$(IceSrcRootDir)\include\generated\$(IceCppMapping)\$(Platform)\$(IceConfiguration); + $(IceSrcRootDir)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <PreprocessorDefinitions Condition="'$(IceLanguageMapping)' == 'cpp'">ICE_BUILDING_SRC;%(PreprocessorDefinitions)</PreprocessorDefinitions> </ClCompile> <Link> - <AdditionalLibraryDirectories>$(Ice_SrcRootDir)\lib\$(Platform)\$(Ice_Configuration)</AdditionalLibraryDirectories> + <AdditionalLibraryDirectories>$(IceSrcRootDir)\lib\$(Platform)\$(IceConfiguration)</AdditionalLibraryDirectories> </Link> <ResourceCompile> - <AdditionalIncludeDirectories>$(Ice_SrcRootDir)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <AdditionalIncludeDirectories>$(IceSrcRootDir)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> </ResourceCompile> </ItemDefinitionGroup> - <ItemDefinitionGroup Condition="'$(ConfigurationType)|$(Ice_BuildingSrc)' == 'DynamicLibrary|yes'"> + <ItemDefinitionGroup Condition="'$(ConfigurationType)|$(IceBuildingSrc)' == 'DynamicLibrary|yes'"> <Link> - <ImportLibrary>$(Ice_SrcRootDir)\lib\$(Platform)\$(Ice_Configuration)\$(TargetName).lib</ImportLibrary> + <ImportLibrary>$(IceSrcRootDir)\lib\$(Platform)\$(IceConfiguration)\$(TargetName).lib</ImportLibrary> </Link> </ItemDefinitionGroup> - <ItemDefinitionGroup Condition="'$(ConfigurationType)|$(Ice_BuildingSrc)' == 'Application|yes'"> + <ItemDefinitionGroup Condition="'$(ConfigurationType)|$(IceBuildingSrc)' == 'Application|yes'"> <Link> <AdditionalDependencies>wsetargv.obj</AdditionalDependencies> </Link> @@ -195,12 +195,12 @@ <!-- C++11 mapping target names. --> - <When Condition="'$(Ice_CppMapping)' == 'cpp11'"> - <PropertyGroup Condition="'$(Ice_Configuration)|$(ConfigurationType)' == 'Debug|DynamicLibrary'"> + <When Condition="'$(IceCppMapping)' == 'cpp11'"> + <PropertyGroup Condition="'$(IceConfiguration)|$(ConfigurationType)' == 'Debug|DynamicLibrary'"> <TargetName>$(ProjectName.Replace("++11", "$(IceSoVersion)++11d"))</TargetName> </PropertyGroup> - <PropertyGroup Condition="'$(Ice_Configuration)|$(ConfigurationType)' == 'Release|DynamicLibrary'"> + <PropertyGroup Condition="'$(IceConfiguration)|$(ConfigurationType)' == 'Release|DynamicLibrary'"> <TargetName>$(ProjectName.Replace("++11", "$(IceSoVersion)++11"))</TargetName> </PropertyGroup> </When> @@ -208,12 +208,12 @@ <!-- UWP mapping target names. --> - <When Condition="'$(Ice_CppMapping)' == 'uwp'"> - <PropertyGroup Condition="'$(Ice_Configuration)|$(ConfigurationType)' == 'Debug|StaticLibrary'"> + <When Condition="'$(IceCppMapping)' == 'uwp'"> + <PropertyGroup Condition="'$(IceConfiguration)|$(ConfigurationType)' == 'Debug|StaticLibrary'"> <TargetName>$(ProjectName.Replace("uwp++11", "$(IceSoVersion)uwp++11d"))</TargetName> </PropertyGroup> - <PropertyGroup Condition="'$(Ice_Configuration)|$(ConfigurationType)' == 'Release|StaticLibrary'"> + <PropertyGroup Condition="'$(IceConfiguration)|$(ConfigurationType)' == 'Release|StaticLibrary'"> <TargetName>$(ProjectName.Replace("uwp++11", "$(IceSoVersion)uwp++11"))</TargetName> </PropertyGroup> </When> @@ -222,19 +222,19 @@ C++98 mapping target names. --> <Otherwise> - <PropertyGroup Condition="'$(Ice_Configuration)|$(ConfigurationType)' == 'Debug|DynamicLibrary'"> + <PropertyGroup Condition="'$(IceConfiguration)|$(ConfigurationType)' == 'Debug|DynamicLibrary'"> <TargetName>$(ProjectName)$(IceSoVersion)d</TargetName> </PropertyGroup> - <PropertyGroup Condition="'$(Ice_Configuration)|$(ConfigurationType)' == 'Release|DynamicLibrary'"> + <PropertyGroup Condition="'$(IceConfiguration)|$(ConfigurationType)' == 'Release|DynamicLibrary'"> <TargetName>$(ProjectName)$(IceSoVersion)</TargetName> </PropertyGroup> - <PropertyGroup Condition="'$(Ice_Configuration)|$(ConfigurationType)' == 'Debug|StaticLibrary'"> + <PropertyGroup Condition="'$(IceConfiguration)|$(ConfigurationType)' == 'Debug|StaticLibrary'"> <TargetName>$(ProjectName)d</TargetName> </PropertyGroup> - <PropertyGroup Condition="'$(Ice_Configuration)|$(ConfigurationType)' == 'Release|StaticLibrary'"> + <PropertyGroup Condition="'$(IceConfiguration)|$(ConfigurationType)' == 'Release|StaticLibrary'"> <TargetName>$(ProjectName)</TargetName> </PropertyGroup> </Otherwise> diff --git a/cpp/msbuild/ice.cpp11.props b/cpp/msbuild/ice.cpp11.props index f79445ea5af..78b2b4fddbb 100644 --- a/cpp/msbuild/ice.cpp11.props +++ b/cpp/msbuild/ice.cpp11.props @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="utf-8"?> <Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <PropertyGroup> - <Ice_LanguageMapping Condition="'$(Ice_LanguageMapping)' == ''">cpp</Ice_LanguageMapping> - <Ice_BuildingSrc>yes</Ice_BuildingSrc> - <Ice_CppMapping>cpp11</Ice_CppMapping> + <IceLanguageMapping Condition="'$(IceLanguageMapping)' == ''">cpp</IceLanguageMapping> + <IceBuildingSrc>yes</IceBuildingSrc> + <IceCppMapping>cpp11</IceCppMapping> </PropertyGroup> <Import Project="$(MSBuildThisFileDirectory)\ice.cpp.props" /> </Project> diff --git a/cpp/msbuild/ice.cpp98.props b/cpp/msbuild/ice.cpp98.props index 4902724c9b4..0c8a743348b 100644 --- a/cpp/msbuild/ice.cpp98.props +++ b/cpp/msbuild/ice.cpp98.props @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="utf-8"?> <Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <PropertyGroup> - <Ice_LanguageMapping Condition="'$(Ice_LanguageMapping)' == ''">cpp</Ice_LanguageMapping> - <Ice_BuildingSrc>yes</Ice_BuildingSrc> - <Ice_CppMapping>cpp98</Ice_CppMapping> + <IceLanguageMapping Condition="'$(IceLanguageMapping)' == ''">cpp</IceLanguageMapping> + <IceBuildingSrc>yes</IceBuildingSrc> + <IceCppMapping>cpp98</IceCppMapping> </PropertyGroup> <Import Project="$(MSBuildThisFileDirectory)\ice.cpp.props" /> </Project> diff --git a/cpp/msbuild/ice.nuget.targets b/cpp/msbuild/ice.nuget.targets index 44eff0a1e86..dded2691f3c 100644 --- a/cpp/msbuild/ice.nuget.targets +++ b/cpp/msbuild/ice.nuget.targets @@ -1,53 +1,53 @@ <Project DefaultTargets="NugetPack" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <PropertyGroup> - <Ice_SrcRootDir>$(MSBuildThisFileDirectory)..\</Ice_SrcRootDir> + <IceSrcRootDir>$(MSBuildThisFileDirectory)..\</IceSrcRootDir> </PropertyGroup> <!-- Dynamic libraries and import libraries --> <ItemGroup> - <Libraries Include="$(Ice_SrcRootDir)bin\$(Platform)\$(Configuration)\*.dll" - Exclude="$(Ice_SrcRootDir)bin\$(Platform)\$(Configuration)\glacier2cryptpermissionsverifier*d.dll; - $(Ice_SrcRootDir)bin\$(Platform)\$(Configuration)\icesslopenssl*.dll; - $(Ice_SrcRootDir)bin\$(Platform)\$(Configuration)\ssleay32.dll; - $(Ice_SrcRootDir)bin\$(Platform)\$(Configuration)\libeay32.dll"/> + <Libraries Include="$(IceSrcRootDir)bin\$(Platform)\$(Configuration)\*.dll" + Exclude="$(IceSrcRootDir)bin\$(Platform)\$(Configuration)\glacier2cryptpermissionsverifier*d.dll; + $(IceSrcRootDir)bin\$(Platform)\$(Configuration)\icesslopenssl*.dll; + $(IceSrcRootDir)bin\$(Platform)\$(Configuration)\ssleay32.dll; + $(IceSrcRootDir)bin\$(Platform)\$(Configuration)\libeay32.dll"/> - <ImportLibraries Include="$(Ice_SrcRootDir)lib\$(Platform)\$(Configuration)\*.lib" - Exclude="$(Ice_SrcRootDir)lib\$(Platform)\$(Configuration)\glacier2cryptpermissionsverifier*.lib; - $(Ice_SrcRootDir)lib\$(Platform)\$(Configuration)\icesslopenssl*.lib; - $(Ice_SrcRootDir)lib\$(Platform)\$(Configuration)\*uwp++11*.lib"/> + <ImportLibraries Include="$(IceSrcRootDir)lib\$(Platform)\$(Configuration)\*.lib" + Exclude="$(IceSrcRootDir)lib\$(Platform)\$(Configuration)\glacier2cryptpermissionsverifier*.lib; + $(IceSrcRootDir)lib\$(Platform)\$(Configuration)\icesslopenssl*.lib; + $(IceSrcRootDir)lib\$(Platform)\$(Configuration)\*uwp++11*.lib"/> </ItemGroup> <!-- Win32 Release binaries --> <ItemGroup Condition="'$(Platform)|$(Configuration)' == 'Win32|Release'"> - <Executables Include="$(Ice_SrcRootDir)bin\Win32\Release\*.exe" - Exclude="$(Ice_SrcRootDir)bin\Win32\Release\slice2*.exe" /> + <Executables Include="$(IceSrcRootDir)bin\Win32\Release\*.exe" + Exclude="$(IceSrcRootDir)bin\Win32\Release\slice2*.exe" /> </ItemGroup> <!-- x64 Release binaries --> <ItemGroup Condition="'$(Platform)|$(Configuration)' == 'x64|Release'"> - <Executables Include="$(Ice_SrcRootDir)bin\$(Platform)\$(Configuration)\*.exe" - Exclude="$(Ice_SrcRootDir)bin\$(Platform)\$(Configuration)\slice2*.exe"/> - <Tools Include="$(Ice_SrcRootDir)bin\x64\Release\slice2*.exe" /> + <Executables Include="$(IceSrcRootDir)bin\$(Platform)\$(Configuration)\*.exe" + Exclude="$(IceSrcRootDir)bin\$(Platform)\$(Configuration)\slice2*.exe"/> + <Tools Include="$(IceSrcRootDir)bin\x64\Release\slice2*.exe" /> </ItemGroup> <!-- Win32/x64 Debug binaries --> <ItemGroup Condition="'$(Configuration)' == 'Debug'"> - <Executables Include="$(Ice_SrcRootDir)bin\$(Platform)\$(Configuration)\*.exe" - Exclude="$(Ice_SrcRootDir)bin\$(Platform)\$(Configuration)\slice2*.exe; - $(Ice_SrcRootDir)bin\$(Platform)\$(Configuration)\iceserviceinstall.exe; - $(Ice_SrcRootDir)bin\$(Platform)\$(Configuration)\icepatch2*.exe; - $(Ice_SrcRootDir)bin\$(Platform)\$(Configuration)\glacier2router.exe"/> + <Executables Include="$(IceSrcRootDir)bin\$(Platform)\$(Configuration)\*.exe" + Exclude="$(IceSrcRootDir)bin\$(Platform)\$(Configuration)\slice2*.exe; + $(IceSrcRootDir)bin\$(Platform)\$(Configuration)\iceserviceinstall.exe; + $(IceSrcRootDir)bin\$(Platform)\$(Configuration)\icepatch2*.exe; + $(IceSrcRootDir)bin\$(Platform)\$(Configuration)\glacier2router.exe"/> </ItemGroup> <!-- public C++ header and Slice files --> <ItemGroup> - <Headers Include="$(Ice_SrcRootDir)include\**\*.h" - Exclude="$(Ice_SrcRootDir)include\generated\**\*.h; - $(Ice_SrcRootDir)include\IceBT\*.h"/> - <Headers Include="$(Ice_SrcRootDir)include\generated\cpp98\$(Platform)\$(Configuration)\**\*.h" /> + <Headers Include="$(IceSrcRootDir)include\**\*.h" + Exclude="$(IceSrcRootDir)include\generated\**\*.h; + $(IceSrcRootDir)include\IceBT\*.h"/> + <Headers Include="$(IceSrcRootDir)include\generated\cpp98\$(Platform)\$(Configuration)\**\*.h" /> - <Slices Include="$(Ice_SrcRootDir)..\slice\**\*.ice" /> + <Slices Include="$(IceSrcRootDir)..\slice\**\*.ice" /> </ItemGroup> <!-- Copy required files to the package specific directories --> diff --git a/cpp/msbuild/ice.nuget.uwp.arch.targets b/cpp/msbuild/ice.nuget.uwp.arch.targets index e5654d80c0c..39cc0448bef 100644 --- a/cpp/msbuild/ice.nuget.uwp.arch.targets +++ b/cpp/msbuild/ice.nuget.uwp.arch.targets @@ -1,13 +1,13 @@ <Project DefaultTargets="NugetPack" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <PropertyGroup> - <Ice_SrcRootDir>$(MSBuildThisFileDirectory)..\</Ice_SrcRootDir> + <IceSrcRootDir>$(MSBuildThisFileDirectory)..\</IceSrcRootDir> </PropertyGroup> <!-- Static libraries --> <ItemGroup> - <Libraries Include="$(Ice_SrcRootDir)lib\$(Platform)\$(Configuration)\*uwp++11*.lib"/> - <Libraries Include="$(Ice_SrcRootDir)lib\$(Platform)\$(Configuration)\*uwp++11*.pdb"/> + <Libraries Include="$(IceSrcRootDir)lib\$(Platform)\$(Configuration)\*uwp++11*.lib"/> + <Libraries Include="$(IceSrcRootDir)lib\$(Platform)\$(Configuration)\*uwp++11*.pdb"/> </ItemGroup> <!-- Copy required files to the package specific directories --> diff --git a/cpp/msbuild/ice.nuget.uwp.targets b/cpp/msbuild/ice.nuget.uwp.targets index 590fd3cf81a..e087f802530 100644 --- a/cpp/msbuild/ice.nuget.uwp.targets +++ b/cpp/msbuild/ice.nuget.uwp.targets @@ -1,21 +1,21 @@ <Project DefaultTargets="NugetPack" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <PropertyGroup> - <Ice_SrcRootDir>$(MSBuildThisFileDirectory)..\</Ice_SrcRootDir> + <IceSrcRootDir>$(MSBuildThisFileDirectory)..\</IceSrcRootDir> </PropertyGroup> <ItemGroup> <!-- Slice compiler from x64 Release builds --> - <Tools Include="$(Ice_SrcRootDir)bin\x64\Release\slice2cpp.exe; - $(Ice_SrcRootDir)bin\x64\Release\slice2html.exe" /> + <Tools Include="$(IceSrcRootDir)bin\x64\Release\slice2cpp.exe; + $(IceSrcRootDir)bin\x64\Release\slice2html.exe" /> <!-- public header files and sources --> - <Headers Include="$(Ice_SrcRootDir)include\**\*.h" - Exclude="$(Ice_SrcRootDir)include\generated\**\*.h; - $(Ice_SrcRootDir)include\IceBT\*.h"/> - <Headers Include="$(Ice_SrcRootDir)include\generated\uwp\Win32\Release\**\*.h" /> + <Headers Include="$(IceSrcRootDir)include\**\*.h" + Exclude="$(IceSrcRootDir)include\generated\**\*.h; + $(IceSrcRootDir)include\IceBT\*.h"/> + <Headers Include="$(IceSrcRootDir)include\generated\uwp\Win32\Release\**\*.h" /> - <Slices Include="$(Ice_SrcRootDir)..\slice\**\*.ice" /> + <Slices Include="$(IceSrcRootDir)..\slice\**\*.ice" /> </ItemGroup> <!-- Copy required files to the package specific directories --> diff --git a/cpp/msbuild/ice.test.props b/cpp/msbuild/ice.test.props index 99c66001c84..46ba8962e14 100644 --- a/cpp/msbuild/ice.test.props +++ b/cpp/msbuild/ice.test.props @@ -6,11 +6,11 @@ </PropertyGroup> <PropertyGroup Condition="'$(Configuration)' == 'Cpp11-Debug' Or '$(Configuration)' == 'Cpp11-Release'"> - <Ice_CppMapping>cpp11</Ice_CppMapping> + <IceCppMapping>cpp11</IceCppMapping> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)' == 'Debug' Or '$(Configuration)' == 'Release'"> - <Ice_CppMapping>cpp98</Ice_CppMapping> + <IceCppMapping>cpp98</IceCppMapping> </PropertyGroup> <Import Project="$(MSBuildThisFileDirectory)\ice.cpp.props"/> @@ -22,10 +22,10 @@ <ItemDefinitionGroup> <ClCompile> - <AdditionalIncludeDirectories>$(Platform)\$(Configuration);$(Ice_SrcRootDir)\test\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <AdditionalIncludeDirectories>$(Platform)\$(Configuration);$(IceSrcRootDir)\test\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> </ClCompile> <Link> - <AdditionalLibraryDirectories>$(Ice_SrcRootDir)\test\Common\msbuild\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> + <AdditionalLibraryDirectories>$(IceSrcRootDir)\test\Common\msbuild\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> </Link> </ItemDefinitionGroup> diff --git a/cpp/msbuild/ice.testuwp.props b/cpp/msbuild/ice.testuwp.props index 91c658603d1..4e3330867be 100644 --- a/cpp/msbuild/ice.testuwp.props +++ b/cpp/msbuild/ice.testuwp.props @@ -2,7 +2,7 @@ <Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <PropertyGroup> - <Ice_CppMapping>uwp</Ice_CppMapping> + <IceCppMapping>uwp</IceCppMapping> <IceSoVersion>37</IceSoVersion> </PropertyGroup> @@ -16,10 +16,10 @@ <ItemDefinitionGroup> <ClCompile> <PreprocessorDefinitions>WINAPI_FAMILY=2;_UNICODE;UNICODE;ICE_CPP11_MAPPING;WIN32_LEAN_AND_MEAN</PreprocessorDefinitions> - <AdditionalIncludeDirectories>$(Platform)\$(Configuration)\;$(Ice_SrcRootDir)\test\include\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <AdditionalIncludeDirectories>$(Platform)\$(Configuration)\;$(IceSrcRootDir)\test\include\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> </ClCompile> <Link> - <AdditionalLibraryDirectories>$(Ice_SrcRootDir)\test\Common\msbuild\uwp\$(Platform)\$(Configuration)\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> + <AdditionalLibraryDirectories>$(IceSrcRootDir)\test\Common\msbuild\uwp\$(Platform)\$(Configuration)\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> <AdditionalDependencies>Windowsapp.lib</AdditionalDependencies> </Link> </ItemDefinitionGroup> diff --git a/cpp/msbuild/ice.uwp.props b/cpp/msbuild/ice.uwp.props index b39d9a184e7..7779922c3d9 100644 --- a/cpp/msbuild/ice.uwp.props +++ b/cpp/msbuild/ice.uwp.props @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="utf-8"?> <Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <PropertyGroup> - <Ice_BuildingSrc>yes</Ice_BuildingSrc> - <Ice_CppMapping>uwp</Ice_CppMapping> + <IceBuildingSrc>yes</IceBuildingSrc> + <IceCppMapping>uwp</IceCppMapping> </PropertyGroup> <Import Project="$(MSBuildThisFileDirectory)\ice.cpp.props" /> diff --git a/cpp/msbuild/icebuilder.cpp.props b/cpp/msbuild/icebuilder.cpp.props index 66663ba249e..ab64a5366d4 100644 --- a/cpp/msbuild/icebuilder.cpp.props +++ b/cpp/msbuild/icebuilder.cpp.props @@ -9,11 +9,11 @@ Guess the Configuration for C++ builds --> <PropertyGroup Condition="'$(UseDebugLibraries)' == 'true'"> - <Ice_Configuration>Debug</Ice_Configuration> + <IceConfiguration>Debug</IceConfiguration> </PropertyGroup> <PropertyGroup Condition="'$(UseDebugLibraries)' != 'true'"> - <Ice_Configuration>Release</Ice_Configuration> + <IceConfiguration>Release</IceConfiguration> </PropertyGroup> <!-- @@ -37,8 +37,8 @@ <!-- C++98 is the default mapping --> - <PropertyGroup Condition="'$(Ice_CppMapping)' == ''"> - <Ice_CppMapping>cpp98</Ice_CppMapping> + <PropertyGroup Condition="'$(IceCppMapping)' == ''"> + <IceCppMapping>cpp98</IceCppMapping> </PropertyGroup> <!-- @@ -64,10 +64,10 @@ by the current build. --> <PropertyGroup> - <IceBinPath>$(IceHome)\cpp\bin\$(Platform)\$(Ice_Configuration)</IceBinPath> - <IceLibraryPath>$(IceHome)\cpp\lib\$(Platform)\$(Ice_Configuration)</IceLibraryPath> - <IceIncludePath>$(IceHome)\cpp\include;$(IceHome)\cpp\include\generated\$(Ice_CppMapping)\$(Platform)\$(Ice_Configuration)</IceIncludePath> - <IceToolsPath>$(IceHome)\cpp\bin\$(Ice_Platform)\$(Ice_Configuration)</IceToolsPath> + <IceBinPath>$(IceHome)\cpp\bin\$(Platform)\$(IceConfiguration)</IceBinPath> + <IceLibraryPath>$(IceHome)\cpp\lib\$(Platform)\$(IceConfiguration)</IceLibraryPath> + <IceIncludePath>$(IceHome)\cpp\include;$(IceHome)\cpp\include\generated\$(IceCppMapping)\$(Platform)\$(IceConfiguration)</IceIncludePath> + <IceToolsPath>$(IceHome)\cpp\bin\$(Ice_Platform)\$(IceConfiguration)</IceToolsPath> <Path>$(IceBinPath);$(Path)</Path> </PropertyGroup> diff --git a/cpp/msbuild/zeroc.ice.uwp.v140.targets b/cpp/msbuild/zeroc.ice.uwp.v140.targets index b2325349c4e..ecee3991202 100644 --- a/cpp/msbuild/zeroc.ice.uwp.v140.targets +++ b/cpp/msbuild/zeroc.ice.uwp.v140.targets @@ -2,8 +2,8 @@ <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <PropertyGroup Condition="'$(PlatformToolset)' == 'v140'"> - <Ice_Configuration Condition="'$(UseDebugLibraries)' == 'true'">Debug</Ice_Configuration> - <Ice_Configuration Condition="'$(UseDebugLibraries)' != 'true'">Release</Ice_Configuration> + <IceConfiguration Condition="'$(UseDebugLibraries)' == 'true'">Debug</IceConfiguration> + <IceConfiguration Condition="'$(UseDebugLibraries)' != 'true'">Release</IceConfiguration> </PropertyGroup> <ItemDefinitionGroup Condition="'$(PlatformToolset)' == 'v140'"> @@ -11,7 +11,7 @@ <AdditionalIncludeDirectories>$(IceHome)\build\native\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> </ClCompile> <Link> - <AdditionalLibraryDirectories>$(MSBuildThisFileDirectory)lib\$(Platform)\$(Ice_Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> + <AdditionalLibraryDirectories>$(MSBuildThisFileDirectory)lib\$(Platform)\$(IceConfiguration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> </Link> </ItemDefinitionGroup> </Project> diff --git a/cpp/msbuild/zeroc.ice.uwp.v141.targets b/cpp/msbuild/zeroc.ice.uwp.v141.targets index 9e4b239baac..89a62d00d0c 100644 --- a/cpp/msbuild/zeroc.ice.uwp.v141.targets +++ b/cpp/msbuild/zeroc.ice.uwp.v141.targets @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="utf-8"?> <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <PropertyGroup Condition="'$(PlatformToolset)' == 'v141'"> - <Ice_Configuration Condition="'$(UseDebugLibraries)' == 'true'">Debug</Ice_Configuration> - <Ice_Configuration Condition="'$(UseDebugLibraries)' != 'true'">Release</Ice_Configuration> + <IceConfiguration Condition="'$(UseDebugLibraries)' == 'true'">Debug</IceConfiguration> + <IceConfiguration Condition="'$(UseDebugLibraries)' != 'true'">Release</IceConfiguration> </PropertyGroup> <ItemDefinitionGroup Condition="'$(PlatformToolset)' == 'v141'"> @@ -10,7 +10,7 @@ <AdditionalIncludeDirectories>$(IceHome)\build\native\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> </ClCompile> <Link> - <AdditionalLibraryDirectories>$(MSBuildThisFileDirectory)lib\$(Platform)\$(Ice_Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> + <AdditionalLibraryDirectories>$(MSBuildThisFileDirectory)lib\$(Platform)\$(IceConfiguration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> </Link> </ItemDefinitionGroup> </Project> diff --git a/cpp/msbuild/zeroc.ice.v100.targets b/cpp/msbuild/zeroc.ice.v100.targets index b67042755fc..c9144b70bff 100644 --- a/cpp/msbuild/zeroc.ice.v100.targets +++ b/cpp/msbuild/zeroc.ice.v100.targets @@ -11,14 +11,14 @@ <!-- Use bin and lib directories that match the used platform toolset --> <PropertyGroup Condition="'$(PlatformToolset)' == 'v100'"> - <Ice_Configuration Condition="'$(UseDebugLibraries)' == 'true'">Debug</Ice_Configuration> - <Ice_Configuration Condition="'$(UseDebugLibraries)' != 'true'">Release</Ice_Configuration> - <LocalDebuggerEnvironment>PATH=$(MSBuildThisFileDirectory)bin\$(Platform)\$(Ice_Configuration);$(IceToolsPath);$(Path)</LocalDebuggerEnvironment> + <IceConfiguration Condition="'$(UseDebugLibraries)' == 'true'">Debug</IceConfiguration> + <IceConfiguration Condition="'$(UseDebugLibraries)' != 'true'">Release</IceConfiguration> + <LocalDebuggerEnvironment>PATH=$(MSBuildThisFileDirectory)bin\$(Platform)\$(IceConfiguration);$(IceToolsPath);$(Path)</LocalDebuggerEnvironment> </PropertyGroup> <ItemDefinitionGroup Condition="'$(PlatformToolset)' == 'v100'"> <Link> - <AdditionalLibraryDirectories>$(MSBuildThisFileDirectory)lib\$(Platform)\$(Ice_Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> + <AdditionalLibraryDirectories>$(MSBuildThisFileDirectory)lib\$(Platform)\$(IceConfiguration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> </Link> </ItemDefinitionGroup> diff --git a/cpp/msbuild/zeroc.ice.v120.targets b/cpp/msbuild/zeroc.ice.v120.targets index b2dbb8ced47..e2a3067e326 100644 --- a/cpp/msbuild/zeroc.ice.v120.targets +++ b/cpp/msbuild/zeroc.ice.v120.targets @@ -11,14 +11,14 @@ <!-- Use bin and lib directories that match the used platform toolset --> <PropertyGroup Condition="'$(PlatformToolset)' == 'v120'"> - <Ice_Configuration Condition="'$(UseDebugLibraries)' == 'true'">Debug</Ice_Configuration> - <Ice_Configuration Condition="'$(UseDebugLibraries)' != 'true'">Release</Ice_Configuration> - <LocalDebuggerEnvironment>PATH=$(MSBuildThisFileDirectory)bin\$(Platform)\$(Ice_Configuration);$(IceToolsPath);$(Path)</LocalDebuggerEnvironment> + <IceConfiguration Condition="'$(UseDebugLibraries)' == 'true'">Debug</IceConfiguration> + <IceConfiguration Condition="'$(UseDebugLibraries)' != 'true'">Release</IceConfiguration> + <LocalDebuggerEnvironment>PATH=$(MSBuildThisFileDirectory)bin\$(Platform)\$(IceConfiguration);$(IceToolsPath);$(Path)</LocalDebuggerEnvironment> </PropertyGroup> <ItemDefinitionGroup Condition="'$(PlatformToolset)' == 'v120'"> <Link> - <AdditionalLibraryDirectories>$(MSBuildThisFileDirectory)lib\$(Platform)\$(Ice_Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> + <AdditionalLibraryDirectories>$(MSBuildThisFileDirectory)lib\$(Platform)\$(IceConfiguration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> </Link> </ItemDefinitionGroup> diff --git a/cpp/msbuild/zeroc.ice.v140.targets b/cpp/msbuild/zeroc.ice.v140.targets index a45d563a216..f51d04a269a 100644 --- a/cpp/msbuild/zeroc.ice.v140.targets +++ b/cpp/msbuild/zeroc.ice.v140.targets @@ -11,14 +11,14 @@ <!-- Use bin and lib directories that match the used platform toolset --> <PropertyGroup Condition="'$(PlatformToolset)' == 'v140'"> - <Ice_Configuration Condition="'$(UseDebugLibraries)' == 'true'">Debug</Ice_Configuration> - <Ice_Configuration Condition="'$(UseDebugLibraries)' != 'true'">Release</Ice_Configuration> - <LocalDebuggerEnvironment>PATH=$(MSBuildThisFileDirectory)bin\$(Platform)\$(Ice_Configuration);$(IceToolsPath);$(Path)</LocalDebuggerEnvironment> + <IceConfiguration Condition="'$(UseDebugLibraries)' == 'true'">Debug</IceConfiguration> + <IceConfiguration Condition="'$(UseDebugLibraries)' != 'true'">Release</IceConfiguration> + <LocalDebuggerEnvironment>PATH=$(MSBuildThisFileDirectory)bin\$(Platform)\$(IceConfiguration);$(IceToolsPath);$(Path)</LocalDebuggerEnvironment> </PropertyGroup> <ItemDefinitionGroup Condition="'$(PlatformToolset)' == 'v140'"> <Link> - <AdditionalLibraryDirectories>$(MSBuildThisFileDirectory)lib\$(Platform)\$(Ice_Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> + <AdditionalLibraryDirectories>$(MSBuildThisFileDirectory)lib\$(Platform)\$(IceConfiguration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> </Link> </ItemDefinitionGroup> diff --git a/cpp/msbuild/zeroc.ice.v141.targets b/cpp/msbuild/zeroc.ice.v141.targets index 442102cbdb9..4949eef06d3 100644 --- a/cpp/msbuild/zeroc.ice.v141.targets +++ b/cpp/msbuild/zeroc.ice.v141.targets @@ -11,14 +11,14 @@ <!-- Use bin and lib directories that match the used platform toolset --> <PropertyGroup Condition="'$(PlatformToolset)' == 'v141'"> - <Ice_Configuration Condition="'$(UseDebugLibraries)' == 'true'">Debug</Ice_Configuration> - <Ice_Configuration Condition="'$(UseDebugLibraries)' != 'true'">Release</Ice_Configuration> - <LocalDebuggerEnvironment>PATH=$(MSBuildThisFileDirectory)bin\$(Platform)\$(Ice_Configuration);$(IceToolsPath);$(Path)</LocalDebuggerEnvironment> + <IceConfiguration Condition="'$(UseDebugLibraries)' == 'true'">Debug</IceConfiguration> + <IceConfiguration Condition="'$(UseDebugLibraries)' != 'true'">Release</IceConfiguration> + <LocalDebuggerEnvironment>PATH=$(MSBuildThisFileDirectory)bin\$(Platform)\$(IceConfiguration);$(IceToolsPath);$(Path)</LocalDebuggerEnvironment> </PropertyGroup> <ItemDefinitionGroup Condition="'$(PlatformToolset)' == 'v141'"> <Link> - <AdditionalLibraryDirectories>$(MSBuildThisFileDirectory)lib\$(Platform)\$(Ice_Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> + <AdditionalLibraryDirectories>$(MSBuildThisFileDirectory)lib\$(Platform)\$(IceConfiguration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> </Link> </ItemDefinitionGroup> diff --git a/cpp/src/Glacier2Lib/msbuild/glacier2++11/glacier2++11.vcxproj b/cpp/src/Glacier2Lib/msbuild/glacier2++11/glacier2++11.vcxproj index 865d9f1a24a..68a33ea2840 100644 --- a/cpp/src/Glacier2Lib/msbuild/glacier2++11/glacier2++11.vcxproj +++ b/cpp/src/Glacier2Lib/msbuild/glacier2++11/glacier2++11.vcxproj @@ -67,7 +67,7 @@ </ImportGroup> <PropertyGroup Label="UserMacros" /> <PropertyGroup Label="IceBuilder"> - <IceBuilderHeaderOutputDir>$(Ice_SrcRootDir)\include\generated\cpp11\$(Platform)\$(Configuration)\Glacier2\</IceBuilderHeaderOutputDir> + <IceBuilderHeaderOutputDir>$(IceSrcRootDir)\include\generated\cpp11\$(Platform)\$(Configuration)\Glacier2\</IceBuilderHeaderOutputDir> <IceBuilderBaseDirectoryForGeneratedInclude>Glacier2</IceBuilderBaseDirectoryForGeneratedInclude> </PropertyGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> diff --git a/cpp/src/Glacier2Lib/msbuild/glacier2/glacier2.vcxproj b/cpp/src/Glacier2Lib/msbuild/glacier2/glacier2.vcxproj index 20a6c4e0772..e8ef47d3af1 100644 --- a/cpp/src/Glacier2Lib/msbuild/glacier2/glacier2.vcxproj +++ b/cpp/src/Glacier2Lib/msbuild/glacier2/glacier2.vcxproj @@ -74,7 +74,7 @@ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" /> <PropertyGroup Label="IceBuilder"> - <IceBuilderHeaderOutputDir>$(Ice_SrcRootDir)\include\generated\cpp98\$(Platform)\$(Configuration)\Glacier2\</IceBuilderHeaderOutputDir> + <IceBuilderHeaderOutputDir>$(IceSrcRootDir)\include\generated\cpp98\$(Platform)\$(Configuration)\Glacier2\</IceBuilderHeaderOutputDir> <IceBuilderBaseDirectoryForGeneratedInclude>Glacier2</IceBuilderBaseDirectoryForGeneratedInclude> </PropertyGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> diff --git a/cpp/src/Glacier2Lib/msbuild/glacier2uwp++11/glacier2uwp++11.vcxproj b/cpp/src/Glacier2Lib/msbuild/glacier2uwp++11/glacier2uwp++11.vcxproj index d81b7370219..48cb03a58a6 100644 --- a/cpp/src/Glacier2Lib/msbuild/glacier2uwp++11/glacier2uwp++11.vcxproj +++ b/cpp/src/Glacier2Lib/msbuild/glacier2uwp++11/glacier2uwp++11.vcxproj @@ -99,7 +99,7 @@ <PropertyGroup Label="UserMacros" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" /> <PropertyGroup Label="IceBuilder"> - <IceBuilderHeaderOutputDir>$(Ice_SrcRootDir)\include\generated\uwp\$(Platform)\$(Configuration)\Glacier2\</IceBuilderHeaderOutputDir> + <IceBuilderHeaderOutputDir>$(IceSrcRootDir)\include\generated\uwp\$(Platform)\$(Configuration)\Glacier2\</IceBuilderHeaderOutputDir> <IceBuilderBaseDirectoryForGeneratedInclude>Glacier2</IceBuilderBaseDirectoryForGeneratedInclude> </PropertyGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> diff --git a/cpp/src/Ice/msbuild/ice++11/ice++11.vcxproj b/cpp/src/Ice/msbuild/ice++11/ice++11.vcxproj index 5424bffb4f6..678d2096630 100644 --- a/cpp/src/Ice/msbuild/ice++11/ice++11.vcxproj +++ b/cpp/src/Ice/msbuild/ice++11/ice++11.vcxproj @@ -66,7 +66,7 @@ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> </ImportGroup> <PropertyGroup Label="IceBuilder"> - <IceBuilderHeaderOutputDir>$(Ice_SrcRootDir)\include\generated\cpp11\$(Platform)\$(Configuration)\Ice\</IceBuilderHeaderOutputDir> + <IceBuilderHeaderOutputDir>$(IceSrcRootDir)\include\generated\cpp11\$(Platform)\$(Configuration)\Ice\</IceBuilderHeaderOutputDir> <IceBuilderBaseDirectoryForGeneratedInclude>Ice</IceBuilderBaseDirectoryForGeneratedInclude> </PropertyGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> @@ -172,22 +172,22 @@ <ItemGroup> <CustomBuild Include="..\..\EventLoggerMsg.mc"> <FileType>Document</FileType> - <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">mc -r $(Platform)\$(Configuration)\ ..\..\EventLoggerMsg.mc && move EventLoggerMsg.h $(Ice_SrcRootDir)\include\generated\cpp11\$(Platform)\$(Configuration)\Ice\EventLoggerMsg.h</Command> + <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">mc -r $(Platform)\$(Configuration)\ ..\..\EventLoggerMsg.mc && move EventLoggerMsg.h $(IceSrcRootDir)\include\generated\cpp11\$(Platform)\$(Configuration)\Ice\EventLoggerMsg.h</Command> <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> </AdditionalInputs> - <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">mc -r $(Platform)\$(Configuration)\ ..\..\EventLoggerMsg.mc && move EventLoggerMsg.h $(Ice_SrcRootDir)\include\generated\cpp11\$(Platform)\$(Configuration)\Ice\EventLoggerMsg.h</Command> + <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">mc -r $(Platform)\$(Configuration)\ ..\..\EventLoggerMsg.mc && move EventLoggerMsg.h $(IceSrcRootDir)\include\generated\cpp11\$(Platform)\$(Configuration)\Ice\EventLoggerMsg.h</Command> <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> </AdditionalInputs> - <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">mc -r $(Platform)\$(Configuration)\ ..\..\EventLoggerMsg.mc && move EventLoggerMsg.h $(Ice_SrcRootDir)\include\generated\cpp11\$(Platform)\$(Configuration)\Ice\EventLoggerMsg.h</Command> + <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">mc -r $(Platform)\$(Configuration)\ ..\..\EventLoggerMsg.mc && move EventLoggerMsg.h $(IceSrcRootDir)\include\generated\cpp11\$(Platform)\$(Configuration)\Ice\EventLoggerMsg.h</Command> <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> </AdditionalInputs> - <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">mc -r $(Platform)\$(Configuration)\ ..\..\EventLoggerMsg.mc && move EventLoggerMsg.h $(Ice_SrcRootDir)\include\generated\cpp11\$(Platform)\$(Configuration)\Ice\EventLoggerMsg.h</Command> + <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">mc -r $(Platform)\$(Configuration)\ ..\..\EventLoggerMsg.mc && move EventLoggerMsg.h $(IceSrcRootDir)\include\generated\cpp11\$(Platform)\$(Configuration)\Ice\EventLoggerMsg.h</Command> <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> </AdditionalInputs> - <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Ice_SrcRootDir)\include\generated\cpp11\$(Platform)\$(Configuration)\Ice\EventLoggerMsg.h;$(Platform)\$(Configuration)\EventLoggerMsg.rc</Outputs> - <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Ice_SrcRootDir)\include\generated\cpp11\$(Platform)\$(Configuration)\Ice\EventLoggerMsg.h;$(Platform)\$(Configuration)\EventLoggerMsg.rc</Outputs> - <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(Ice_SrcRootDir)\include\generated\cpp11\$(Platform)\$(Configuration)\Ice\EventLoggerMsg.h;$(Platform)\$(Configuration)\EventLoggerMsg.rc</Outputs> - <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(Ice_SrcRootDir)\include\generated\cpp11\$(Platform)\$(Configuration)\Ice\EventLoggerMsg.h;$(Platform)\$(Configuration)\EventLoggerMsg.rc</Outputs> + <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(IceSrcRootDir)\include\generated\cpp11\$(Platform)\$(Configuration)\Ice\EventLoggerMsg.h;$(Platform)\$(Configuration)\EventLoggerMsg.rc</Outputs> + <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(IceSrcRootDir)\include\generated\cpp11\$(Platform)\$(Configuration)\Ice\EventLoggerMsg.h;$(Platform)\$(Configuration)\EventLoggerMsg.rc</Outputs> + <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(IceSrcRootDir)\include\generated\cpp11\$(Platform)\$(Configuration)\Ice\EventLoggerMsg.h;$(Platform)\$(Configuration)\EventLoggerMsg.rc</Outputs> + <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(IceSrcRootDir)\include\generated\cpp11\$(Platform)\$(Configuration)\Ice\EventLoggerMsg.h;$(Platform)\$(Configuration)\EventLoggerMsg.rc</Outputs> </CustomBuild> </ItemGroup> <ItemGroup> diff --git a/cpp/src/Ice/msbuild/ice/ice.vcxproj b/cpp/src/Ice/msbuild/ice/ice.vcxproj index 2bbc4b9fe2a..5fbcd874564 100644 --- a/cpp/src/Ice/msbuild/ice/ice.vcxproj +++ b/cpp/src/Ice/msbuild/ice/ice.vcxproj @@ -74,7 +74,7 @@ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" /> <PropertyGroup Label="IceBuilder"> - <IceBuilderHeaderOutputDir>$(Ice_SrcRootDir)\include\generated\cpp98\$(Platform)\$(Configuration)\Ice\</IceBuilderHeaderOutputDir> + <IceBuilderHeaderOutputDir>$(IceSrcRootDir)\include\generated\cpp98\$(Platform)\$(Configuration)\Ice\</IceBuilderHeaderOutputDir> <IceBuilderBaseDirectoryForGeneratedInclude>Ice</IceBuilderBaseDirectoryForGeneratedInclude> </PropertyGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> @@ -180,22 +180,22 @@ <ItemGroup> <CustomBuild Include="..\..\EventLoggerMsg.mc"> <FileType>Document</FileType> - <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">mc -r $(Platform)\$(Configuration)\ ..\..\EventLoggerMsg.mc && move EventLoggerMsg.h $(Ice_SrcRootDir)\include\generated\cpp98\$(Platform)\$(Configuration)\Ice\EventLoggerMsg.h</Command> + <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">mc -r $(Platform)\$(Configuration)\ ..\..\EventLoggerMsg.mc && move EventLoggerMsg.h $(IceSrcRootDir)\include\generated\cpp98\$(Platform)\$(Configuration)\Ice\EventLoggerMsg.h</Command> <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> </AdditionalInputs> - <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">mc -r $(Platform)\$(Configuration)\ ..\..\EventLoggerMsg.mc && move EventLoggerMsg.h $(Ice_SrcRootDir)\include\generated\cpp98\$(Platform)\$(Configuration)\Ice\EventLoggerMsg.h</Command> + <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">mc -r $(Platform)\$(Configuration)\ ..\..\EventLoggerMsg.mc && move EventLoggerMsg.h $(IceSrcRootDir)\include\generated\cpp98\$(Platform)\$(Configuration)\Ice\EventLoggerMsg.h</Command> <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> </AdditionalInputs> - <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">mc -r $(Platform)\$(Configuration)\ ..\..\EventLoggerMsg.mc && move EventLoggerMsg.h $(Ice_SrcRootDir)\include\generated\cpp98\$(Platform)\$(Configuration)\Ice\EventLoggerMsg.h</Command> + <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">mc -r $(Platform)\$(Configuration)\ ..\..\EventLoggerMsg.mc && move EventLoggerMsg.h $(IceSrcRootDir)\include\generated\cpp98\$(Platform)\$(Configuration)\Ice\EventLoggerMsg.h</Command> <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> </AdditionalInputs> - <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">mc -r $(Platform)\$(Configuration)\ ..\..\EventLoggerMsg.mc && move EventLoggerMsg.h $(Ice_SrcRootDir)\include\generated\cpp98\$(Platform)\$(Configuration)\Ice\EventLoggerMsg.h</Command> + <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">mc -r $(Platform)\$(Configuration)\ ..\..\EventLoggerMsg.mc && move EventLoggerMsg.h $(IceSrcRootDir)\include\generated\cpp98\$(Platform)\$(Configuration)\Ice\EventLoggerMsg.h</Command> <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> </AdditionalInputs> - <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Ice_SrcRootDir)\include\generated\cpp98\$(Platform)\$(Configuration)\Ice\EventLoggerMsg.h;$(Platform)\$(Configuration)\EventLoggerMsg.rc</Outputs> - <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Ice_SrcRootDir)\include\generated\cpp98\$(Platform)\$(Configuration)\Ice\EventLoggerMsg.h;$(Platform)\$(Configuration)\EventLoggerMsg.rc</Outputs> - <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(Ice_SrcRootDir)\include\generated\cpp98\$(Platform)\$(Configuration)\Ice\EventLoggerMsg.h;$(Platform)\$(Configuration)\EventLoggerMsg.rc</Outputs> - <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(Ice_SrcRootDir)\include\generated\cpp98\$(Platform)\$(Configuration)\Ice\EventLoggerMsg.h;$(Platform)\$(Configuration)\EventLoggerMsg.rc</Outputs> + <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(IceSrcRootDir)\include\generated\cpp98\$(Platform)\$(Configuration)\Ice\EventLoggerMsg.h;$(Platform)\$(Configuration)\EventLoggerMsg.rc</Outputs> + <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(IceSrcRootDir)\include\generated\cpp98\$(Platform)\$(Configuration)\Ice\EventLoggerMsg.h;$(Platform)\$(Configuration)\EventLoggerMsg.rc</Outputs> + <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(IceSrcRootDir)\include\generated\cpp98\$(Platform)\$(Configuration)\Ice\EventLoggerMsg.h;$(Platform)\$(Configuration)\EventLoggerMsg.rc</Outputs> + <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(IceSrcRootDir)\include\generated\cpp98\$(Platform)\$(Configuration)\Ice\EventLoggerMsg.h;$(Platform)\$(Configuration)\EventLoggerMsg.rc</Outputs> </CustomBuild> </ItemGroup> <ItemGroup> diff --git a/cpp/src/Ice/msbuild/iceuwp++11/iceuwp++11.vcxproj b/cpp/src/Ice/msbuild/iceuwp++11/iceuwp++11.vcxproj index 40b940717c9..616bdf10d34 100644 --- a/cpp/src/Ice/msbuild/iceuwp++11/iceuwp++11.vcxproj +++ b/cpp/src/Ice/msbuild/iceuwp++11/iceuwp++11.vcxproj @@ -99,7 +99,7 @@ <PropertyGroup Label="UserMacros" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" /> <PropertyGroup Label="IceBuilder"> - <IceBuilderHeaderOutputDir>$(Ice_SrcRootDir)\include\generated\uwp\$(Platform)\$(Configuration)\Ice\</IceBuilderHeaderOutputDir> + <IceBuilderHeaderOutputDir>$(IceSrcRootDir)\include\generated\uwp\$(Platform)\$(Configuration)\Ice\</IceBuilderHeaderOutputDir> <IceBuilderBaseDirectoryForGeneratedInclude>Ice</IceBuilderBaseDirectoryForGeneratedInclude> </PropertyGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> diff --git a/cpp/src/IceBox/msbuild/iceboxlib++11/iceboxlib++11.vcxproj b/cpp/src/IceBox/msbuild/iceboxlib++11/iceboxlib++11.vcxproj index 9be71168884..67e127d9351 100644 --- a/cpp/src/IceBox/msbuild/iceboxlib++11/iceboxlib++11.vcxproj +++ b/cpp/src/IceBox/msbuild/iceboxlib++11/iceboxlib++11.vcxproj @@ -79,7 +79,7 @@ <TargetName>icebox$(IceSoVersion)++11</TargetName> </PropertyGroup> <PropertyGroup Label="IceBuilder"> - <IceBuilderHeaderOutputDir>$(Ice_SrcRootDir)\include\generated\cpp11\$(Platform)\$(Configuration)\IceBox\</IceBuilderHeaderOutputDir> + <IceBuilderHeaderOutputDir>$(IceSrcRootDir)\include\generated\cpp11\$(Platform)\$(Configuration)\IceBox\</IceBuilderHeaderOutputDir> <IceBuilderBaseDirectoryForGeneratedInclude>IceBox</IceBuilderBaseDirectoryForGeneratedInclude> </PropertyGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> diff --git a/cpp/src/IceBox/msbuild/iceboxlib/iceboxlib.vcxproj b/cpp/src/IceBox/msbuild/iceboxlib/iceboxlib.vcxproj index 22d9c159242..bd0d8265bdc 100644 --- a/cpp/src/IceBox/msbuild/iceboxlib/iceboxlib.vcxproj +++ b/cpp/src/IceBox/msbuild/iceboxlib/iceboxlib.vcxproj @@ -82,7 +82,7 @@ <TargetName>icebox$(IceSoVersion)</TargetName> </PropertyGroup> <PropertyGroup Label="IceBuilder"> - <IceBuilderHeaderOutputDir>$(Ice_SrcRootDir)\include\generated\cpp98\$(Platform)\$(Configuration)\IceBox\</IceBuilderHeaderOutputDir> + <IceBuilderHeaderOutputDir>$(IceSrcRootDir)\include\generated\cpp98\$(Platform)\$(Configuration)\IceBox\</IceBuilderHeaderOutputDir> <IceBuilderBaseDirectoryForGeneratedInclude>IceBox</IceBuilderBaseDirectoryForGeneratedInclude> </PropertyGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> diff --git a/cpp/src/IceDiscovery/msbuild/icediscovery++11/icediscovery++11.vcxproj b/cpp/src/IceDiscovery/msbuild/icediscovery++11/icediscovery++11.vcxproj index 070e9c3ac52..72b61e0a232 100644 --- a/cpp/src/IceDiscovery/msbuild/icediscovery++11/icediscovery++11.vcxproj +++ b/cpp/src/IceDiscovery/msbuild/icediscovery++11/icediscovery++11.vcxproj @@ -67,7 +67,7 @@ </ImportGroup> <PropertyGroup Label="UserMacros" /> <PropertyGroup Label="IceBuilder"> - <IceBuilderHeaderOutputDir>$(Ice_SrcRootDir)\include\generated\cpp11\$(Platform)\$(Configuration)\IceDiscovery\</IceBuilderHeaderOutputDir> + <IceBuilderHeaderOutputDir>$(IceSrcRootDir)\include\generated\cpp11\$(Platform)\$(Configuration)\IceDiscovery\</IceBuilderHeaderOutputDir> <IceBuilderBaseDirectoryForGeneratedInclude>IceDiscovery</IceBuilderBaseDirectoryForGeneratedInclude> </PropertyGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> diff --git a/cpp/src/IceDiscovery/msbuild/icediscovery/icediscovery.vcxproj b/cpp/src/IceDiscovery/msbuild/icediscovery/icediscovery.vcxproj index a3752ecb89f..2be31abb469 100644 --- a/cpp/src/IceDiscovery/msbuild/icediscovery/icediscovery.vcxproj +++ b/cpp/src/IceDiscovery/msbuild/icediscovery/icediscovery.vcxproj @@ -74,7 +74,7 @@ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" /> <PropertyGroup Label="IceBuilder"> - <IceBuilderHeaderOutputDir>$(Ice_SrcRootDir)\include\generated\cpp98\$(Platform)\$(Configuration)\IceDiscovery\</IceBuilderHeaderOutputDir> + <IceBuilderHeaderOutputDir>$(IceSrcRootDir)\include\generated\cpp98\$(Platform)\$(Configuration)\IceDiscovery\</IceBuilderHeaderOutputDir> <IceBuilderBaseDirectoryForGeneratedInclude>IceDiscovery</IceBuilderBaseDirectoryForGeneratedInclude> </PropertyGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> diff --git a/cpp/src/IceDiscovery/msbuild/icediscoveryuwp++11/icediscoveryuwp++11.vcxproj b/cpp/src/IceDiscovery/msbuild/icediscoveryuwp++11/icediscoveryuwp++11.vcxproj index 5d237334b37..832da1ffbf1 100644 --- a/cpp/src/IceDiscovery/msbuild/icediscoveryuwp++11/icediscoveryuwp++11.vcxproj +++ b/cpp/src/IceDiscovery/msbuild/icediscoveryuwp++11/icediscoveryuwp++11.vcxproj @@ -99,7 +99,7 @@ <PropertyGroup Label="UserMacros" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" /> <PropertyGroup Label="IceBuilder"> - <IceBuilderHeaderOutputDir>$(Ice_SrcRootDir)\include\generated\uwp\$(Platform)\$(Configuration)\IceDiscovery\</IceBuilderHeaderOutputDir> + <IceBuilderHeaderOutputDir>$(IceSrcRootDir)\include\generated\uwp\$(Platform)\$(Configuration)\IceDiscovery\</IceBuilderHeaderOutputDir> <IceBuilderBaseDirectoryForGeneratedInclude>IceDiscovery</IceBuilderBaseDirectoryForGeneratedInclude> </PropertyGroup> <ItemGroup> diff --git a/cpp/src/IceGrid/msbuild/icegridadmin/icegridadmin.vcxproj b/cpp/src/IceGrid/msbuild/icegridadmin/icegridadmin.vcxproj index 3ab7e551d3e..e71d6b08d27 100644 --- a/cpp/src/IceGrid/msbuild/icegridadmin/icegridadmin.vcxproj +++ b/cpp/src/IceGrid/msbuild/icegridadmin/icegridadmin.vcxproj @@ -90,7 +90,7 @@ </ClCompile> </ItemDefinitionGroup> <PropertyGroup Label="IceBuilder"> - <IceBuilderIncludeDirectories>$(Ice_SrcRootDir)\src\;$(IceBuilderIncludeDirectories)</IceBuilderIncludeDirectories> + <IceBuilderIncludeDirectories>$(IceSrcRootDir)\src\;$(IceBuilderIncludeDirectories)</IceBuilderIncludeDirectories> <IceBuilderHeaderOutputDir>$(Platform)\$(Configuration)\IceGrid</IceBuilderHeaderOutputDir> <IceBuilderBaseDirectoryForGeneratedInclude>IceGrid</IceBuilderBaseDirectoryForGeneratedInclude> </PropertyGroup> diff --git a/cpp/src/IceGrid/msbuild/icegridnode/icegridnode.vcxproj b/cpp/src/IceGrid/msbuild/icegridnode/icegridnode.vcxproj index ed072e6f865..008bb10f589 100644 --- a/cpp/src/IceGrid/msbuild/icegridnode/icegridnode.vcxproj +++ b/cpp/src/IceGrid/msbuild/icegridnode/icegridnode.vcxproj @@ -70,7 +70,7 @@ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" /> <PropertyGroup Label="IceBuilder"> - <IceBuilderIncludeDirectories>$(Ice_SrcRootDir)\src\;$(IceBuilderIncludeDirectories)</IceBuilderIncludeDirectories> + <IceBuilderIncludeDirectories>$(IceSrcRootDir)\src\;$(IceBuilderIncludeDirectories)</IceBuilderIncludeDirectories> <IceBuilderHeaderOutputDir>$(Platform)\$(Configuration)\IceGrid</IceBuilderHeaderOutputDir> <IceBuilderBaseDirectoryForGeneratedInclude>IceGrid</IceBuilderBaseDirectoryForGeneratedInclude> </PropertyGroup> diff --git a/cpp/src/IceGrid/msbuild/icegridregistry/icegridregistry.vcxproj b/cpp/src/IceGrid/msbuild/icegridregistry/icegridregistry.vcxproj index 57bfd9b9eed..d826ce8d15f 100644 --- a/cpp/src/IceGrid/msbuild/icegridregistry/icegridregistry.vcxproj +++ b/cpp/src/IceGrid/msbuild/icegridregistry/icegridregistry.vcxproj @@ -70,7 +70,7 @@ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" /> <PropertyGroup Label="IceBuilder"> - <IceBuilderIncludeDirectories>$(Ice_SrcRootDir)\src\;$(IceBuilderIncludeDirectories)</IceBuilderIncludeDirectories> + <IceBuilderIncludeDirectories>$(IceSrcRootDir)\src\;$(IceBuilderIncludeDirectories)</IceBuilderIncludeDirectories> <IceBuilderHeaderOutputDir>$(Platform)\$(Configuration)\IceGrid</IceBuilderHeaderOutputDir> <IceBuilderBaseDirectoryForGeneratedInclude>IceGrid</IceBuilderBaseDirectoryForGeneratedInclude> </PropertyGroup> diff --git a/cpp/src/IceGridLib/msbuild/icegrid++11/icegrid++11.vcxproj b/cpp/src/IceGridLib/msbuild/icegrid++11/icegrid++11.vcxproj index 73fab8a3dea..459ff7c56d6 100644 --- a/cpp/src/IceGridLib/msbuild/icegrid++11/icegrid++11.vcxproj +++ b/cpp/src/IceGridLib/msbuild/icegrid++11/icegrid++11.vcxproj @@ -67,7 +67,7 @@ </ImportGroup> <PropertyGroup Label="UserMacros" /> <PropertyGroup Label="IceBuilder"> - <IceBuilderHeaderOutputDir>$(Ice_SrcRootDir)\include\generated\cpp11\$(Platform)\$(Configuration)\IceGrid\</IceBuilderHeaderOutputDir> + <IceBuilderHeaderOutputDir>$(IceSrcRootDir)\include\generated\cpp11\$(Platform)\$(Configuration)\IceGrid\</IceBuilderHeaderOutputDir> <IceBuilderBaseDirectoryForGeneratedInclude>IceGrid</IceBuilderBaseDirectoryForGeneratedInclude> </PropertyGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> diff --git a/cpp/src/IceGridLib/msbuild/icegrid/icegrid.vcxproj b/cpp/src/IceGridLib/msbuild/icegrid/icegrid.vcxproj index 9f09fbe0787..f3959948653 100644 --- a/cpp/src/IceGridLib/msbuild/icegrid/icegrid.vcxproj +++ b/cpp/src/IceGridLib/msbuild/icegrid/icegrid.vcxproj @@ -74,7 +74,7 @@ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" /> <PropertyGroup Label="IceBuilder"> - <IceBuilderHeaderOutputDir>$(Ice_SrcRootDir)\include\generated\cpp98\$(Platform)\$(Configuration)\IceGrid\</IceBuilderHeaderOutputDir> + <IceBuilderHeaderOutputDir>$(IceSrcRootDir)\include\generated\cpp98\$(Platform)\$(Configuration)\IceGrid\</IceBuilderHeaderOutputDir> <IceBuilderBaseDirectoryForGeneratedInclude>IceGrid</IceBuilderBaseDirectoryForGeneratedInclude> </PropertyGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> diff --git a/cpp/src/IceGridLib/msbuild/icegriduwp++11/icegriduwp++11.vcxproj b/cpp/src/IceGridLib/msbuild/icegriduwp++11/icegriduwp++11.vcxproj index 6c23c7768b9..35eaba56f9f 100644 --- a/cpp/src/IceGridLib/msbuild/icegriduwp++11/icegriduwp++11.vcxproj +++ b/cpp/src/IceGridLib/msbuild/icegriduwp++11/icegriduwp++11.vcxproj @@ -99,7 +99,7 @@ <PropertyGroup Label="UserMacros" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" /> <PropertyGroup Label="IceBuilder"> - <IceBuilderHeaderOutputDir>$(Ice_SrcRootDir)\include\generated\uwp\$(Platform)\$(Configuration)\IceGrid\</IceBuilderHeaderOutputDir> + <IceBuilderHeaderOutputDir>$(IceSrcRootDir)\include\generated\uwp\$(Platform)\$(Configuration)\IceGrid\</IceBuilderHeaderOutputDir> <IceBuilderBaseDirectoryForGeneratedInclude>IceGrid</IceBuilderBaseDirectoryForGeneratedInclude> </PropertyGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> diff --git a/cpp/src/IceLocatorDiscovery/msbuild/icelocatordiscovery++11/icelocatordiscovery++11.vcxproj b/cpp/src/IceLocatorDiscovery/msbuild/icelocatordiscovery++11/icelocatordiscovery++11.vcxproj index c6f4db31c3a..d71b6ddf883 100644 --- a/cpp/src/IceLocatorDiscovery/msbuild/icelocatordiscovery++11/icelocatordiscovery++11.vcxproj +++ b/cpp/src/IceLocatorDiscovery/msbuild/icelocatordiscovery++11/icelocatordiscovery++11.vcxproj @@ -67,7 +67,7 @@ </ImportGroup> <PropertyGroup Label="UserMacros" /> <PropertyGroup Label="IceBuilder"> - <IceBuilderHeaderOutputDir>$(Ice_SrcRootDir)\include\generated\cpp11\$(Platform)\$(Configuration)\IceLocatorDiscovery\</IceBuilderHeaderOutputDir> + <IceBuilderHeaderOutputDir>$(IceSrcRootDir)\include\generated\cpp11\$(Platform)\$(Configuration)\IceLocatorDiscovery\</IceBuilderHeaderOutputDir> <IceBuilderBaseDirectoryForGeneratedInclude>IceLocatorDiscovery</IceBuilderBaseDirectoryForGeneratedInclude> </PropertyGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> diff --git a/cpp/src/IceLocatorDiscovery/msbuild/icelocatordiscovery/icelocatordiscovery.vcxproj b/cpp/src/IceLocatorDiscovery/msbuild/icelocatordiscovery/icelocatordiscovery.vcxproj index 083ad72ff00..0444dbfdcbb 100644 --- a/cpp/src/IceLocatorDiscovery/msbuild/icelocatordiscovery/icelocatordiscovery.vcxproj +++ b/cpp/src/IceLocatorDiscovery/msbuild/icelocatordiscovery/icelocatordiscovery.vcxproj @@ -74,7 +74,7 @@ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" /> <PropertyGroup Label="IceBuilder"> - <IceBuilderHeaderOutputDir>$(Ice_SrcRootDir)\include\generated\cpp98\$(Platform)\$(Configuration)\IceLocatorDiscovery\</IceBuilderHeaderOutputDir> + <IceBuilderHeaderOutputDir>$(IceSrcRootDir)\include\generated\cpp98\$(Platform)\$(Configuration)\IceLocatorDiscovery\</IceBuilderHeaderOutputDir> <IceBuilderBaseDirectoryForGeneratedInclude>IceLocatorDiscovery</IceBuilderBaseDirectoryForGeneratedInclude> </PropertyGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> diff --git a/cpp/src/IceLocatorDiscovery/msbuild/icelocatordiscoveryuwp++11/icelocatordiscoveryuwp++11.vcxproj b/cpp/src/IceLocatorDiscovery/msbuild/icelocatordiscoveryuwp++11/icelocatordiscoveryuwp++11.vcxproj index cc3d7e454d7..6139e560c92 100644 --- a/cpp/src/IceLocatorDiscovery/msbuild/icelocatordiscoveryuwp++11/icelocatordiscoveryuwp++11.vcxproj +++ b/cpp/src/IceLocatorDiscovery/msbuild/icelocatordiscoveryuwp++11/icelocatordiscoveryuwp++11.vcxproj @@ -99,7 +99,7 @@ <PropertyGroup Label="UserMacros" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" /> <PropertyGroup Label="IceBuilder"> - <IceBuilderHeaderOutputDir>$(Ice_SrcRootDir)\include\generated\uwp\$(Platform)\$(Configuration)\IceLocatorDiscovery\</IceBuilderHeaderOutputDir> + <IceBuilderHeaderOutputDir>$(IceSrcRootDir)\include\generated\uwp\$(Platform)\$(Configuration)\IceLocatorDiscovery\</IceBuilderHeaderOutputDir> <IceBuilderBaseDirectoryForGeneratedInclude>IceLocatorDiscovery</IceBuilderBaseDirectoryForGeneratedInclude> </PropertyGroup> <ItemGroup> diff --git a/cpp/src/IcePatch2Lib/msbuild/icepatch2.vcxproj b/cpp/src/IcePatch2Lib/msbuild/icepatch2.vcxproj index b322d7a32c9..f18e1ae6800 100644 --- a/cpp/src/IcePatch2Lib/msbuild/icepatch2.vcxproj +++ b/cpp/src/IcePatch2Lib/msbuild/icepatch2.vcxproj @@ -69,7 +69,7 @@ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> </ImportGroup> <PropertyGroup Label="IceBuilder"> - <IceBuilderHeaderOutputDir>$(Ice_SrcRootDir)\include\generated\cpp98\$(Platform)\$(Configuration)\IcePatch2\</IceBuilderHeaderOutputDir> + <IceBuilderHeaderOutputDir>$(IceSrcRootDir)\include\generated\cpp98\$(Platform)\$(Configuration)\IcePatch2\</IceBuilderHeaderOutputDir> <IceBuilderBaseDirectoryForGeneratedInclude>IcePatch2</IceBuilderBaseDirectoryForGeneratedInclude> </PropertyGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> diff --git a/cpp/src/IceSSL/msbuild/icessl++11/icessl++11.vcxproj b/cpp/src/IceSSL/msbuild/icessl++11/icessl++11.vcxproj index a8157309f11..41fbe3e81c4 100644 --- a/cpp/src/IceSSL/msbuild/icessl++11/icessl++11.vcxproj +++ b/cpp/src/IceSSL/msbuild/icessl++11/icessl++11.vcxproj @@ -66,7 +66,7 @@ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> </ImportGroup> <PropertyGroup Label="IceBuilder"> - <IceBuilderHeaderOutputDir>$(Ice_SrcRootDir)\include\generated\cpp11\$(Platform)\$(Configuration)\IceSSL\</IceBuilderHeaderOutputDir> + <IceBuilderHeaderOutputDir>$(IceSrcRootDir)\include\generated\cpp11\$(Platform)\$(Configuration)\IceSSL\</IceBuilderHeaderOutputDir> <IceBuilderBaseDirectoryForGeneratedInclude>IceSSL</IceBuilderBaseDirectoryForGeneratedInclude> </PropertyGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> diff --git a/cpp/src/IceSSL/msbuild/icessl/icessl.vcxproj b/cpp/src/IceSSL/msbuild/icessl/icessl.vcxproj index e47d34fe195..295aa359e79 100644 --- a/cpp/src/IceSSL/msbuild/icessl/icessl.vcxproj +++ b/cpp/src/IceSSL/msbuild/icessl/icessl.vcxproj @@ -74,7 +74,7 @@ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" /> <PropertyGroup Label="IceBuilder"> - <IceBuilderHeaderOutputDir>$(Ice_SrcRootDir)\include\generated\cpp98\$(Platform)\$(Configuration)\IceSSL\</IceBuilderHeaderOutputDir> + <IceBuilderHeaderOutputDir>$(IceSrcRootDir)\include\generated\cpp98\$(Platform)\$(Configuration)\IceSSL\</IceBuilderHeaderOutputDir> <IceBuilderBaseDirectoryForGeneratedInclude>IceSSL</IceBuilderBaseDirectoryForGeneratedInclude> </PropertyGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> diff --git a/cpp/src/IceSSL/msbuild/icesslopenssl++11/icesslopenssl++11.vcxproj b/cpp/src/IceSSL/msbuild/icesslopenssl++11/icesslopenssl++11.vcxproj index 7f485476695..8df1906d289 100644 --- a/cpp/src/IceSSL/msbuild/icesslopenssl++11/icesslopenssl++11.vcxproj +++ b/cpp/src/IceSSL/msbuild/icesslopenssl++11/icesslopenssl++11.vcxproj @@ -65,7 +65,7 @@ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> </ImportGroup> <PropertyGroup Label="IceBuilder"> - <IceBuilderHeaderOutputDir>$(Ice_SrcRootDir)\include\generated\cpp11\$(Platform)\$(Configuration)\IceSSL\</IceBuilderHeaderOutputDir> + <IceBuilderHeaderOutputDir>$(IceSrcRootDir)\include\generated\cpp11\$(Platform)\$(Configuration)\IceSSL\</IceBuilderHeaderOutputDir> <IceBuilderBaseDirectoryForGeneratedInclude>IceSSL</IceBuilderBaseDirectoryForGeneratedInclude> </PropertyGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> diff --git a/cpp/src/IceSSL/msbuild/icesslopenssl/icesslopenssl.vcxproj b/cpp/src/IceSSL/msbuild/icesslopenssl/icesslopenssl.vcxproj index 36b7c68692a..734443e3964 100644 --- a/cpp/src/IceSSL/msbuild/icesslopenssl/icesslopenssl.vcxproj +++ b/cpp/src/IceSSL/msbuild/icesslopenssl/icesslopenssl.vcxproj @@ -70,7 +70,7 @@ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" /> <PropertyGroup Label="IceBuilder"> - <IceBuilderHeaderOutputDir>$(Ice_SrcRootDir)\include\generated\cpp98\$(Platform)\$(Configuration)\IceSSL\</IceBuilderHeaderOutputDir> + <IceBuilderHeaderOutputDir>$(IceSrcRootDir)\include\generated\cpp98\$(Platform)\$(Configuration)\IceSSL\</IceBuilderHeaderOutputDir> <IceBuilderBaseDirectoryForGeneratedInclude>IceSSL</IceBuilderBaseDirectoryForGeneratedInclude> </PropertyGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> diff --git a/cpp/src/IceSSL/msbuild/icessluwp++11/icessluwp++11.vcxproj b/cpp/src/IceSSL/msbuild/icessluwp++11/icessluwp++11.vcxproj index d793eaa704d..6fe477211d0 100644 --- a/cpp/src/IceSSL/msbuild/icessluwp++11/icessluwp++11.vcxproj +++ b/cpp/src/IceSSL/msbuild/icessluwp++11/icessluwp++11.vcxproj @@ -99,7 +99,7 @@ <PropertyGroup Label="UserMacros" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" /> <PropertyGroup Label="IceBuilder"> - <IceBuilderHeaderOutputDir>$(Ice_SrcRootDir)\include\generated\uwp\$(Platform)\$(Configuration)\IceSSL\</IceBuilderHeaderOutputDir> + <IceBuilderHeaderOutputDir>$(IceSrcRootDir)\include\generated\uwp\$(Platform)\$(Configuration)\IceSSL\</IceBuilderHeaderOutputDir> <IceBuilderBaseDirectoryForGeneratedInclude>IceSSL</IceBuilderBaseDirectoryForGeneratedInclude> </PropertyGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> diff --git a/cpp/src/IceStorm/msbuild/icestormadmin/icestormadmin.vcxproj b/cpp/src/IceStorm/msbuild/icestormadmin/icestormadmin.vcxproj index cd90da9c7df..a0e771400c9 100644 --- a/cpp/src/IceStorm/msbuild/icestormadmin/icestormadmin.vcxproj +++ b/cpp/src/IceStorm/msbuild/icestormadmin/icestormadmin.vcxproj @@ -85,7 +85,7 @@ </ClCompile> </ItemDefinitionGroup> <PropertyGroup Label="IceBuilder"> - <IceBuilderIncludeDirectories>$(Ice_SrcRootDir)\src\;$(IceBuilderIncludeDirectories)</IceBuilderIncludeDirectories> + <IceBuilderIncludeDirectories>$(IceSrcRootDir)\src\;$(IceBuilderIncludeDirectories)</IceBuilderIncludeDirectories> <IceBuilderHeaderOutputDir>$(Platform)\$(Configuration)\IceStorm</IceBuilderHeaderOutputDir> <IceBuilderBaseDirectoryForGeneratedInclude>IceStorm</IceBuilderBaseDirectoryForGeneratedInclude> </PropertyGroup> diff --git a/cpp/src/IceStorm/msbuild/icestormdb/icestormdb.vcxproj b/cpp/src/IceStorm/msbuild/icestormdb/icestormdb.vcxproj index f425ca62c75..a20704761b8 100644 --- a/cpp/src/IceStorm/msbuild/icestormdb/icestormdb.vcxproj +++ b/cpp/src/IceStorm/msbuild/icestormdb/icestormdb.vcxproj @@ -85,7 +85,7 @@ </ClCompile> </ItemDefinitionGroup> <PropertyGroup Label="IceBuilder"> - <IceBuilderIncludeDirectories>$(Ice_SrcRootDir)\src\;$(IceBuilderIncludeDirectories)</IceBuilderIncludeDirectories> + <IceBuilderIncludeDirectories>$(IceSrcRootDir)\src\;$(IceBuilderIncludeDirectories)</IceBuilderIncludeDirectories> <IceBuilderHeaderOutputDir>$(Platform)\$(Configuration)\IceStorm</IceBuilderHeaderOutputDir> <IceBuilderBaseDirectoryForGeneratedInclude>IceStorm</IceBuilderBaseDirectoryForGeneratedInclude> </PropertyGroup> diff --git a/cpp/src/IceStorm/msbuild/icestormservice/icestormservice.vcxproj b/cpp/src/IceStorm/msbuild/icestormservice/icestormservice.vcxproj index 76c5bfbf43b..55d489ff598 100644 --- a/cpp/src/IceStorm/msbuild/icestormservice/icestormservice.vcxproj +++ b/cpp/src/IceStorm/msbuild/icestormservice/icestormservice.vcxproj @@ -73,7 +73,7 @@ <PropertyGroup Label="IceBuilder"> <IceBuilderHeaderOutputDir>$(Platform)\$(Configuration)\IceStorm\</IceBuilderHeaderOutputDir> <IceBuilderBaseDirectoryForGeneratedInclude>IceStorm</IceBuilderBaseDirectoryForGeneratedInclude> - <IceBuilderIncludeDirectories>$(Ice_SrcRootDir)\src;$(IceBuilderIncludeDirectories)</IceBuilderIncludeDirectories> + <IceBuilderIncludeDirectories>$(IceSrcRootDir)\src;$(IceBuilderIncludeDirectories)</IceBuilderIncludeDirectories> </PropertyGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <ClCompile> diff --git a/cpp/src/IceStormLib/msbuild/icestorm++11/icestorm++11.vcxproj b/cpp/src/IceStormLib/msbuild/icestorm++11/icestorm++11.vcxproj index c45aa156ade..9056bb954bc 100644 --- a/cpp/src/IceStormLib/msbuild/icestorm++11/icestorm++11.vcxproj +++ b/cpp/src/IceStormLib/msbuild/icestorm++11/icestorm++11.vcxproj @@ -66,7 +66,7 @@ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> </ImportGroup> <PropertyGroup Label="IceBuilder"> - <IceBuilderHeaderOutputDir>$(Ice_SrcRootDir)\include\generated\cpp11\$(Platform)\$(Configuration)\IceStorm\</IceBuilderHeaderOutputDir> + <IceBuilderHeaderOutputDir>$(IceSrcRootDir)\include\generated\cpp11\$(Platform)\$(Configuration)\IceStorm\</IceBuilderHeaderOutputDir> <IceBuilderBaseDirectoryForGeneratedInclude>IceStorm</IceBuilderBaseDirectoryForGeneratedInclude> </PropertyGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> diff --git a/cpp/src/IceStormLib/msbuild/icestorm/icestorm.vcxproj b/cpp/src/IceStormLib/msbuild/icestorm/icestorm.vcxproj index 92b04ac7ad8..b6f0f82e0e1 100644 --- a/cpp/src/IceStormLib/msbuild/icestorm/icestorm.vcxproj +++ b/cpp/src/IceStormLib/msbuild/icestorm/icestorm.vcxproj @@ -69,7 +69,7 @@ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> </ImportGroup> <PropertyGroup Label="IceBuilder"> - <IceBuilderHeaderOutputDir>$(Ice_SrcRootDir)\include\generated\cpp98\$(Platform)\$(Configuration)\IceStorm\</IceBuilderHeaderOutputDir> + <IceBuilderHeaderOutputDir>$(IceSrcRootDir)\include\generated\cpp98\$(Platform)\$(Configuration)\IceStorm\</IceBuilderHeaderOutputDir> <IceBuilderBaseDirectoryForGeneratedInclude>IceStorm</IceBuilderBaseDirectoryForGeneratedInclude> </PropertyGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> diff --git a/cpp/src/IceStormLib/msbuild/icestormuwp++11/icestormuwp++11.vcxproj b/cpp/src/IceStormLib/msbuild/icestormuwp++11/icestormuwp++11.vcxproj index fdef840f65f..64ebc088f9c 100644 --- a/cpp/src/IceStormLib/msbuild/icestormuwp++11/icestormuwp++11.vcxproj +++ b/cpp/src/IceStormLib/msbuild/icestormuwp++11/icestormuwp++11.vcxproj @@ -99,7 +99,7 @@ <PropertyGroup Label="UserMacros" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" /> <PropertyGroup Label="IceBuilder"> - <IceBuilderHeaderOutputDir>$(Ice_SrcRootDir)\include\generated\uwp\$(Platform)\$(Configuration)\IceStorm\</IceBuilderHeaderOutputDir> + <IceBuilderHeaderOutputDir>$(IceSrcRootDir)\include\generated\uwp\$(Platform)\$(Configuration)\IceStorm\</IceBuilderHeaderOutputDir> <IceBuilderBaseDirectoryForGeneratedInclude>IceStorm</IceBuilderBaseDirectoryForGeneratedInclude> </PropertyGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> diff --git a/cpp/src/icegriddb/msbuild/icegriddb.vcxproj b/cpp/src/icegriddb/msbuild/icegriddb.vcxproj index 9e18376a571..acd653cf4da 100644 --- a/cpp/src/icegriddb/msbuild/icegriddb.vcxproj +++ b/cpp/src/icegriddb/msbuild/icegriddb.vcxproj @@ -94,7 +94,7 @@ </ClCompile> </ItemDefinitionGroup> <PropertyGroup Label="IceBuilder"> - <IceBuilderIncludeDirectories>$(Ice_SrcRootDir)\src\;$(IceBuilderIncludeDirectories)</IceBuilderIncludeDirectories> + <IceBuilderIncludeDirectories>$(IceSrcRootDir)\src\;$(IceBuilderIncludeDirectories)</IceBuilderIncludeDirectories> <IceBuilderHeaderOutputDir>$(Platform)\$(Configuration)\IceGrid\</IceBuilderHeaderOutputDir> <IceBuilderBaseDirectoryForGeneratedInclude>IceGrid</IceBuilderBaseDirectoryForGeneratedInclude> <IceBuilderAdditionalOptions>-DICE_BUILDING_ICEGRIDDB</IceBuilderAdditionalOptions> diff --git a/csharp/msbuild/ice.nuget.targets b/csharp/msbuild/ice.nuget.targets index 940372433d7..57beda23d8a 100644 --- a/csharp/msbuild/ice.nuget.targets +++ b/csharp/msbuild/ice.nuget.targets @@ -1,17 +1,17 @@ <Project DefaultTargets="NugetPack" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <PropertyGroup> - <Ice_SrcRootDir>$(MSBuildThisFileDirectory)..\</Ice_SrcRootDir> + <IceSrcRootDir>$(MSBuildThisFileDirectory)..\</IceSrcRootDir> </PropertyGroup> <!-- For CSharp we use Slice compiler from x64 Release builds --> <ItemGroup> - <Tools Include="$(Ice_SrcRootDir)..\cpp\bin\x64\Release\slice2cs.exe; - $(Ice_SrcRootDir)..\cpp\bin\x64\Release\slice2html.exe; - $(Ice_SrcRootDir)bin\iceboxnet.exe" /> - <Assemblies Include="$(Ice_SrcRootDir)Assemblies\*.dll" /> - <Assemblies Include="$(Ice_SrcRootDir)Assemblies\*.pdb" /> - <Assemblies Include="$(Ice_SrcRootDir)Assemblies\*.xml" /> - <Slices Include="$(Ice_SrcRootDir)..\slice\**\*.ice" /> + <Tools Include="$(IceSrcRootDir)..\cpp\bin\x64\Release\slice2cs.exe; + $(IceSrcRootDir)..\cpp\bin\x64\Release\slice2html.exe; + $(IceSrcRootDir)bin\iceboxnet.exe" /> + <Assemblies Include="$(IceSrcRootDir)Assemblies\*.dll" /> + <Assemblies Include="$(IceSrcRootDir)Assemblies\*.pdb" /> + <Assemblies Include="$(IceSrcRootDir)Assemblies\*.xml" /> + <Slices Include="$(IceSrcRootDir)..\slice\**\*.ice" /> </ItemGroup> <!-- Copy required files to the package specific directories --> diff --git a/php/msbuild/ice.props b/php/msbuild/ice.props index f6948638d81..8cc19d8f66d 100644 --- a/php/msbuild/ice.props +++ b/php/msbuild/ice.props @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <PropertyGroup> - <Ice_LanguageMapping>php</Ice_LanguageMapping> + <IceLanguageMapping>php</IceLanguageMapping> </PropertyGroup> <Import Project="..\..\cpp\msbuild\Ice.Cpp98.props" /> diff --git a/python/msbuild/ice.props b/python/msbuild/ice.props index ac9848daaa3..3968601e6f1 100644 --- a/python/msbuild/ice.props +++ b/python/msbuild/ice.props @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <PropertyGroup> - <Ice_LanguageMapping>python</Ice_LanguageMapping> + <IceLanguageMapping>python</IceLanguageMapping> </PropertyGroup> <Import Project="..\..\cpp\msbuild\Ice.Cpp98.props" /> <PropertyGroup Label="UserMacros" Condition="'$(Platform)'=='Win32'"> |