summaryrefslogtreecommitdiff
path: root/cpp
diff options
context:
space:
mode:
Diffstat (limited to 'cpp')
-rw-r--r--cpp/msbuild/ice.nuget.html.targets23
-rw-r--r--cpp/msbuild/ice.nuget.java.targets23
-rw-r--r--cpp/msbuild/ice.nuget.targets29
-rw-r--r--cpp/msbuild/ice.nuget.uwp.targets13
-rw-r--r--cpp/msbuild/ice.proj22
-rw-r--r--cpp/msbuild/zeroc.ice.html.nuspec16
-rw-r--r--cpp/msbuild/zeroc.ice.java.nuspec16
-rw-r--r--cpp/msbuild/zeroc.ice.props2
8 files changed, 19 insertions, 125 deletions
diff --git a/cpp/msbuild/ice.nuget.html.targets b/cpp/msbuild/ice.nuget.html.targets
deleted file mode 100644
index 1788aefb58c..00000000000
--- a/cpp/msbuild/ice.nuget.html.targets
+++ /dev/null
@@ -1,23 +0,0 @@
-<Project DefaultTargets="NugetPack" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-
- <PropertyGroup>
- <Ice_SrcRootDir>$(MSBuildThisFileDirectory)..\</Ice_SrcRootDir>
- </PropertyGroup>
-
- <!-- slice2html Release binaries & Slice files -->
- <ItemGroup>
-
- <Executables Include="$(Ice_SrcRootDir)bin\Win32\Release\slice2html.exe;
- $(Ice_SrcRootDir)bin\Win32\Release\slice2html.pdb" />
- <Slices Include="$(Ice_SrcRootDir)..\slice\**\*.ice" />
-
- </ItemGroup>
-
- <!-- Copy required files to the package specific directories -->
- <Target Name="NugetPack">
- <RemoveDir Directories="$(PackageDirectory)" />
- <Copy SourceFiles="zeroc.ice.html.nuspec" DestinationFolder="$(PackageDirectory)" />
- <Copy SourceFiles="@(Slices)" DestinationFolder="$(PackageDirectory)\slice\%(Slices.RecursiveDir)" />
- <Copy SourceFiles="@(Executables)" DestinationFolder="$(PackageDirectory)\build\native\bin\Win32\Release" />
- </Target>
-</Project>
diff --git a/cpp/msbuild/ice.nuget.java.targets b/cpp/msbuild/ice.nuget.java.targets
deleted file mode 100644
index 4ae0d9746c8..00000000000
--- a/cpp/msbuild/ice.nuget.java.targets
+++ /dev/null
@@ -1,23 +0,0 @@
-<Project DefaultTargets="NugetPack" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-
- <PropertyGroup>
- <Ice_SrcRootDir>$(MSBuildThisFileDirectory)..\</Ice_SrcRootDir>
- </PropertyGroup>
-
- <!-- slice2java Release binaries & Slice files -->
- <ItemGroup>
-
- <Executables Include="$(Ice_SrcRootDir)bin\Win32\Release\slice2java.exe;
- $(Ice_SrcRootDir)bin\Win32\Release\slice2java.pdb" />
- <Slices Include="$(Ice_SrcRootDir)..\slice\**\*.ice" />
-
- </ItemGroup>
-
- <!-- Copy required files to the package specific directories -->
- <Target Name="NugetPack">
- <RemoveDir Directories="$(PackageDirectory)" />
- <Copy SourceFiles="zeroc.ice.java.nuspec" DestinationFolder="$(PackageDirectory)" />
- <Copy SourceFiles="@(Slices)" DestinationFolder="$(PackageDirectory)\slice\%(Slices.RecursiveDir)" />
- <Copy SourceFiles="@(Executables)" DestinationFolder="$(PackageDirectory)\build\native\bin\Win32\Release" />
- </Target>
-</Project>
diff --git a/cpp/msbuild/ice.nuget.targets b/cpp/msbuild/ice.nuget.targets
index cbf4ced7b9a..1af7fb5485d 100644
--- a/cpp/msbuild/ice.nuget.targets
+++ b/cpp/msbuild/ice.nuget.targets
@@ -16,11 +16,11 @@
<!-- Win32 Release binaries -->
<ItemGroup Condition="'$(Platform)|$(Configuration)' == 'Win32|Release'">
- <Executables Include="$(Ice_SrcRootDir)bin\$(Platform)\$(Configuration)\*.exe"
- Exclude="$(Ice_SrcRootDir)bin\$(Platform)\$(Configuration)\slice2*.exe" />
+ <Executables Include="$(Ice_SrcRootDir)bin\Win32\Release\*.exe"
+ Exclude="$(Ice_SrcRootDir)bin\Win32\Release\slice2*.exe" />
- <Executables Include="$(Ice_SrcRootDir)bin\$(Platform)\$(Configuration)\slice2cpp.exe;
- $(Ice_SrcRootDir)bin\$(Platform)\$(Configuration)\slice2cpp.pdb" />
+ <Tools Include="$(Ice_SrcRootDir)bin\Win32\Release\slice2cpp.exe;
+ $(Ice_SrcRootDir)bin\Win32\Release\slice2html.exe" />
</ItemGroup>
<!-- x64 Release binaries -->
@@ -39,7 +39,7 @@
$(Ice_SrcRootDir)bin\$(Platform)\$(Configuration)\glacier2router.exe"/>
</ItemGroup>
- <!-- public header files and sources -->
+ <!-- public C++ header and Slice files -->
<ItemGroup>
<Headers Include="$(Ice_SrcRootDir)include\**\*.h"
Exclude="$(Ice_SrcRootDir)include\generated\**\*.h;
@@ -49,19 +49,14 @@
<Slices Include="$(Ice_SrcRootDir)..\slice\**\*.ice" />
</ItemGroup>
- <!-- Copy header files in Win32 Release, the files are identical in all configurations -->
- <Target Name="CopyHeaders" Condition="'$(Platform)|$(Configuration)' == 'Win32|Release'">
- <Copy SourceFiles="@(Headers)" DestinationFolder="$(PackageDirectory)\build\native\include\%(Headers.RecursiveDir)" />
- </Target>
-
- <!-- Copy slice files -->
- <Target Name="CopySlices" Condition="'$(Platform)|$(Configuration)' == 'Win32|Release'">
- <Copy SourceFiles="@(Slices)" DestinationFolder="$(PackageDirectory)\slice\%(Slices.RecursiveDir)" />
- </Target>
-
-
<!-- Copy required files to the package specific directories -->
- <Target Name="NugetPack" DependsOnTargets="CopyHeaders;CopySlices">
+ <Target Name="NugetPack">
+ <Copy Condition="'$(Platform)|$(Configuration)' == 'Win32|Release'"
+ SourceFiles="@(Headers)" DestinationFolder="$(PackageDirectory)\build\native\include\%(Headers.RecursiveDir)" />
+ <Copy Condition="'$(Platform)|$(Configuration)' == 'Win32|Release'"
+ SourceFiles="@(Slices)" DestinationFolder="$(PackageDirectory)\slice\%(Slices.RecursiveDir)" />
+ <Copy Condition="'$(Platform)|$(Configuration)' == 'Win32|Release'"
+ SourceFiles="@(Tools)" DestinationFolder="$(PackageDirectory)\tools" />
<Copy SourceFiles="@(Executables)" DestinationFolder="$(PackageDirectory)\build\native\bin\$(Platform)\$(Configuration)" />
<Copy SourceFiles="@(Libraries)" DestinationFolder="$(PackageDirectory)\build\native\bin\$(Platform)\$(Configuration)" />
<Copy SourceFiles="@(ImportLibraries)" DestinationFolder="$(PackageDirectory)\build\native\lib\$(Platform)\$(Configuration)" />
diff --git a/cpp/msbuild/ice.nuget.uwp.targets b/cpp/msbuild/ice.nuget.uwp.targets
index d41a03f13bb..51e5ee1add7 100644
--- a/cpp/msbuild/ice.nuget.uwp.targets
+++ b/cpp/msbuild/ice.nuget.uwp.targets
@@ -3,14 +3,13 @@
<PropertyGroup>
<Ice_SrcRootDir>$(MSBuildThisFileDirectory)..\</Ice_SrcRootDir>
</PropertyGroup>
-
- <!-- For UWP we use Slice compiler from Win32 Release builds -->
+
<ItemGroup>
- <Executables Include="$(Ice_SrcRootDir)bin\Win32\Release\slice2cpp.*"/>
- </ItemGroup>
+ <!-- Slice compiler from Win32 Release builds -->
+ <Tools Include="$(Ice_SrcRootDir)bin\Win32\Release\slice2cpp.exe;
+ $(Ice_SrcRootDir)bin\Win32\Release\slice2html.exe" />
- <!-- public header files and sources -->
- <ItemGroup>
+ <!-- public header files and sources -->
<Headers Include="$(Ice_SrcRootDir)include\**\*.h"
Exclude="$(Ice_SrcRootDir)include\generated\**\*.h;
$(Ice_SrcRootDir)include\IceBT\*.h"/>
@@ -21,7 +20,7 @@
<!-- Copy required files to the package specific directories -->
<Target Name="NugetPack">
- <Copy SourceFiles="@(Executables)" DestinationFolder="$(PackageDirectory)\build\native\bin\Win32\Release" />
+ <Copy SourceFiles="@(Tools)" DestinationFolder="$(PackageDirectory)\tools" />
<Copy SourceFiles="@(Headers)" DestinationFolder="$(PackageDirectory)\build\native\include\%(Headers.RecursiveDir)" />
<Copy SourceFiles="@(Slices)" DestinationFolder="$(PackageDirectory)\slice\%(Slices.RecursiveDir)" />
</Target>
diff --git a/cpp/msbuild/ice.proj b/cpp/msbuild/ice.proj
index 41d975c0902..eb116e49ef1 100644
--- a/cpp/msbuild/ice.proj
+++ b/cpp/msbuild/ice.proj
@@ -312,27 +312,5 @@
<Exec Command="$(NugetExe) pack -NoPackageAnalysis -NonInteractive"
WorkingDirectory="zeroc.ice.uwp"/>
</Target>
-
- <!-- Create zeroc.ice.java Nuget package -->
- <Target Name="JavaNugetPack"
- DependsOnTargets="BuildDist"
- Condition="$(BuildAllConfigurations) == 'yes' and '$(DefaultPlatformToolset)' == 'v140'">
-
- <MSBuild Projects="ice.nuget.java.targets"
- Properties="PackageDirectory=zeroc.ice.java" />
- <Exec Command="$(NugetExe) pack -NoPackageAnalysis -NonInteractive"
- WorkingDirectory="zeroc.ice.java"/>
- </Target>
-
- <!-- Create zeroc.ice.html Nuget package -->
- <Target Name="HtmlNugetPack"
- DependsOnTargets="BuildDist"
- Condition="$(BuildAllConfigurations) == 'yes' and '$(DefaultPlatformToolset)' == 'v140'">
-
- <MSBuild Projects="ice.nuget.html.targets"
- Properties="PackageDirectory=zeroc.ice.html" />
- <Exec Command="$(NugetExe) pack -NoPackageAnalysis -NonInteractive"
- WorkingDirectory="zeroc.ice.html"/>
- </Target>
</Project>
diff --git a/cpp/msbuild/zeroc.ice.html.nuspec b/cpp/msbuild/zeroc.ice.html.nuspec
deleted file mode 100644
index ed424efbd44..00000000000
--- a/cpp/msbuild/zeroc.ice.html.nuspec
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0"?>
-<package >
- <metadata>
- <id>zeroc.ice.html</id>
- <title>ZeroC Ice Html</title>
- <version>3.7.0-alpha3</version>
- <authors>ZeroC, Inc</authors>
- <licenseUrl>https://zeroc.com/licensing</licenseUrl>
- <projectUrl>http://www.zeroc.com</projectUrl>
- <iconUrl>https://zeroc.com/images/logos/zeroc/zeroc_logo-64x64.png</iconUrl>
- <requireLicenseAcceptance>false</requireLicenseAcceptance>
- <description>This package contains the slice2html compiler and the required Slice files to generate HTML documentation from Slice files. Ice is a comprehensive RPC framework that helps you network your software with minimal effort. Ice takes care of all interactions with low-level network programming interfaces and allows you to focus your efforts on your application logic.</description>
- <releaseNotes>https://doc.zeroc.com/display/Ice37/Ice+Release+Notes</releaseNotes>
- <tags>ice native</tags>
- </metadata>
-</package>
diff --git a/cpp/msbuild/zeroc.ice.java.nuspec b/cpp/msbuild/zeroc.ice.java.nuspec
deleted file mode 100644
index 8b75377687a..00000000000
--- a/cpp/msbuild/zeroc.ice.java.nuspec
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0"?>
-<package >
- <metadata>
- <id>zeroc.ice.java</id>
- <title>ZeroC Ice Java</title>
- <version>3.7.0-alpha3</version>
- <authors>ZeroC, Inc</authors>
- <licenseUrl>https://zeroc.com/licensing</licenseUrl>
- <projectUrl>http://www.zeroc.com</projectUrl>
- <iconUrl>https://zeroc.com/images/logos/zeroc/zeroc_logo-64x64.png</iconUrl>
- <requireLicenseAcceptance>false</requireLicenseAcceptance>
- <description>This package contains the slice2java compiler and the required Slice files to develop Ice for Java applications. Ice is a comprehensive RPC framework that helps you network your software with minimal effort. Ice takes care of all interactions with low-level network programming interfaces and allows you to focus your efforts on your application logic.</description>
- <releaseNotes>https://doc.zeroc.com/display/Ice37/Ice+Release+Notes</releaseNotes>
- <tags>ice native</tags>
- </metadata>
-</package>
diff --git a/cpp/msbuild/zeroc.ice.props b/cpp/msbuild/zeroc.ice.props
index 34d30595272..4fac9179289 100644
--- a/cpp/msbuild/zeroc.ice.props
+++ b/cpp/msbuild/zeroc.ice.props
@@ -14,7 +14,7 @@
<Ice_Configuration Condition="'$(UseDebugLibraries)' == 'true'">Debug</Ice_Configuration>
<Ice_Configuration Condition="'$(UseDebugLibraries)' != 'true'">Release</Ice_Configuration>
- <IceToolsPath>$(IceHome)\build\native\bin\Win32\Release</IceToolsPath>
+ <IceToolsPath>$(IceHome)\tools</IceToolsPath>
<IceBinPath>$(IceHome)\build\native\bin\$(Platform)\$(Ice_Configuration)</IceBinPath>
<Path>$(IceBinPath);$(IceToolsPath);%(Path)</Path>
generated by cgit v1.2.3 (git 2.46.0) at 2025-08-05 11:38:14 +0000