summaryrefslogtreecommitdiff
path: root/cpp/src
diff options
context:
space:
mode:
Diffstat (limited to 'cpp/src')
-rw-r--r--cpp/src/IceGrid/Makefile.mk6
-rw-r--r--cpp/src/IceStorm/IceStormDB.cpp1
-rw-r--r--cpp/src/icegriddb/DBTypes.ice (renamed from cpp/src/IceGrid/DBTypes.ice)0
-rw-r--r--cpp/src/icegriddb/IceGridDB.cpp (renamed from cpp/src/IceGrid/IceGridDB.cpp)31
-rw-r--r--cpp/src/icegriddb/IceGridDB.rc (renamed from cpp/src/IceGrid/IceGridDB.rc)0
-rw-r--r--cpp/src/icegriddb/Makefile.mk24
-rw-r--r--cpp/src/icegriddb/msbuild/icegriddb.vcxproj (renamed from cpp/src/IceGrid/msbuild/icegriddb/icegriddb.vcxproj)112
-rw-r--r--cpp/src/icegriddb/msbuild/icegriddb.vcxproj.filters (renamed from cpp/src/IceGrid/msbuild/icegriddb/icegriddb.vcxproj.filters)56
-rw-r--r--cpp/src/icegriddb/msbuild/packages.config (renamed from cpp/src/IceGrid/msbuild/icegriddb/packages.config)2
9 files changed, 201 insertions, 31 deletions
diff --git a/cpp/src/IceGrid/Makefile.mk b/cpp/src/IceGrid/Makefile.mk
index 9df3222c8b5..ba4515e1642 100644
--- a/cpp/src/IceGrid/Makefile.mk
+++ b/cpp/src/IceGrid/Makefile.mk
@@ -64,7 +64,7 @@ local_admin_srcs = Internal.ice \
Scanner.cpp \
Util.cpp
-$(project)_programs = icegridnode icegridregistry icegridadmin icegriddb
+$(project)_programs = icegridnode icegridregistry icegridadmin
$(project)_sliceflags := -Isrc --include-dir IceGrid
$(project)_generated_includedir := $(project)/generated/IceGrid
$(project)_dependencies := IceGrid Glacier2 Ice
@@ -82,8 +82,4 @@ icegridadmin_dependencies := IcePatch2 IceBox IceXML
icegridadmin_sources := $(slicedir)/IceLocatorDiscovery/IceLocatorDiscovery.ice \
$(addprefix $(currentdir)/,$(local_admin_srcs))
-icegriddb_dependencies := IcePatch2 IceDB
-icegriddb_libs := lmdb
-icegriddb_sources := $(addprefix $(currentdir)/,IceGridDB.cpp DBTypes.ice)
-
projects += $(project)
diff --git a/cpp/src/IceStorm/IceStormDB.cpp b/cpp/src/IceStorm/IceStormDB.cpp
index d6d29630fa5..20ff33ed6a6 100644
--- a/cpp/src/IceStorm/IceStormDB.cpp
+++ b/cpp/src/IceStorm/IceStormDB.cpp
@@ -11,7 +11,6 @@
#include <Ice/Application.h>
#include <IceDB/IceDB.h>
#include <IceStorm/DBTypes.h>
-#include <IcePatch2Lib/Util.h>
#include <IceUtil/DisableWarnings.h>
using namespace std;
diff --git a/cpp/src/IceGrid/DBTypes.ice b/cpp/src/icegriddb/DBTypes.ice
index 6729a6bf434..6729a6bf434 100644
--- a/cpp/src/IceGrid/DBTypes.ice
+++ b/cpp/src/icegriddb/DBTypes.ice
diff --git a/cpp/src/IceGrid/IceGridDB.cpp b/cpp/src/icegriddb/IceGridDB.cpp
index f6d4317df5b..55fc370fa8f 100644
--- a/cpp/src/IceGrid/IceGridDB.cpp
+++ b/cpp/src/icegriddb/IceGridDB.cpp
@@ -12,7 +12,6 @@
#include <IceDB/IceDB.h>
#include <IceGrid/Admin.h>
#include <IceGrid/DBTypes.h>
-#include <IcePatch2Lib/Util.h>
#include <IceUtil/DisableWarnings.h>
using namespace std;
@@ -22,7 +21,7 @@ using namespace IceGrid;
namespace
{
-bool skipFilter = false;
+bool skipReplicaGroupFilter = false;
class ServerDescriptorI : public IceGrid::ServerDescriptor
{
@@ -95,26 +94,34 @@ private:
}
+
+//
+// This custom version of the StreamReader allows us to customize the
+// reading of ReplicaGroupDescriptor
+//
namespace Ice
{
+
template<>
-struct StreamReader< ::IceGrid::ReplicaGroupDescriptor, Ice::InputStream>
+struct StreamReader<IceGrid::ReplicaGroupDescriptor, Ice::InputStream>
{
- static void read(Ice::InputStream* __is, ::IceGrid::ReplicaGroupDescriptor& v)
+ static void read(Ice::InputStream* is, IceGrid::ReplicaGroupDescriptor& v)
{
- __is->read(v.id);
- __is->read(v.loadBalancing);
- __is->read(v.proxyOptions);
- __is->read(v.objects);
- __is->read(v.description);
- if(!skipFilter)
+ // cerr << "Custom read" << endl;
+ is->read(v.id);
+ is->read(v.loadBalancing);
+ is->read(v.proxyOptions);
+ is->read(v.objects);
+ is->read(v.description);
+ if(!skipReplicaGroupFilter)
{
- __is->read(v.filter);
+ is->read(v.filter);
}
}
};
}
+
class Client : public Application
{
public:
@@ -308,7 +315,7 @@ Client::run(int argc, char* argv[])
{
cout << "Reading Ice 3.5.x data" << endl;
}
- skipFilter = true;
+ skipReplicaGroupFilter = true;
}
stream.read(data);
diff --git a/cpp/src/IceGrid/IceGridDB.rc b/cpp/src/icegriddb/IceGridDB.rc
index 43ac678be1e..43ac678be1e 100644
--- a/cpp/src/IceGrid/IceGridDB.rc
+++ b/cpp/src/icegriddb/IceGridDB.rc
diff --git a/cpp/src/icegriddb/Makefile.mk b/cpp/src/icegriddb/Makefile.mk
new file mode 100644
index 00000000000..e021aeda53f
--- /dev/null
+++ b/cpp/src/icegriddb/Makefile.mk
@@ -0,0 +1,24 @@
+# **********************************************************************
+#
+# Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved.
+#
+# This copy of Ice is licensed to you under the terms described in the
+# ICE_LICENSE file included in this distribution.
+#
+# **********************************************************************
+
+$(project)_programs := icegriddb
+$(project)_generated_includedir := $(project)/generated/IceGrid
+$(project)_sliceflags := -Isrc --include-dir IceGrid
+
+$(project)/IceGridDB.cpp: $(includedir)/generated/IceGrid/Admin.h
+$(project)/generated/DBTypes.cpp: $(includedir)/generated/IceGrid/Admin.h
+
+icegriddb_targetdir := $(bindir)
+icegriddb_dependencies := Ice IceDB Glacier2
+icegriddb_libs := lmdb
+icegriddb_sources := $(addprefix $(slicedir)/IceGrid/,Descriptor.ice Exception.ice) \
+ $(addprefix $(currentdir)/,IceGridDB.cpp DBTypes.ice)
+
+
+projects += $(project)
diff --git a/cpp/src/IceGrid/msbuild/icegriddb/icegriddb.vcxproj b/cpp/src/icegriddb/msbuild/icegriddb.vcxproj
index b5a95bc38c6..2ab0f884902 100644
--- a/cpp/src/IceGrid/msbuild/icegriddb/icegriddb.vcxproj
+++ b/cpp/src/icegriddb/msbuild/icegriddb.vcxproj
@@ -21,6 +21,8 @@
<PropertyGroup Label="Globals">
<ProjectGuid>{369524F4-D374-44F4-BCFD-408934595701}</ProjectGuid>
<WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
+ <IceBuilderCppProps Condition="!Exists('$(IceBuilderCppProps)')">$([System.IO.Directory]::GetFiles('$(LocalAppData)\Microsoft\VisualStudio\$(VisualStudioVersion)\Extensions', 'IceBuilder.Cpp.props', SearchOption.AllDirectories))</IceBuilderCppProps>
+ <IceBuilderCppTargets Condition="!Exists('$(IceBuilderCppTargets)')">$([System.IO.Directory]::GetFiles('$(LocalAppData)\Microsoft\VisualStudio\$(VisualStudioVersion)\Extensions', 'IceBuilder.Cpp.targets', SearchOption.AllDirectories))</IceBuilderCppTargets>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
@@ -44,8 +46,8 @@
<PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
- <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\msbuild\ice.cpp98.props" />
- <Import Project="$(LOCALAPPDATA)\ZeroC\IceBuilder\IceBuilder.Cpp.props" />
+ <Import Project="$(MSBuildThisFileDirectory)\..\..\..\msbuild\ice.cpp98.props" />
+ <Import Project="$(IceBuilderCppProps)" Condition="Exists('$(IceBuilderCppProps)')" />
<ImportGroup Label="ExtensionSettings">
</ImportGroup>
<ImportGroup Label="Shared">
@@ -70,56 +72,104 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
<AdditionalIncludeDirectories>$(Platform)\$(Configuration)\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>ICE_BUILDING_SRC;ICE_BUILDING_ICE_GRID;%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ClCompile>
<AdditionalIncludeDirectories>$(Platform)\$(Configuration)\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>ICE_BUILDING_SRC;ICE_BUILDING_ICE_GRID;%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<ClCompile>
<AdditionalIncludeDirectories>$(Platform)\$(Configuration)\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>ICE_BUILDING_SRC;ICE_BUILDING_ICE_GRID;%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<ClCompile>
<AdditionalIncludeDirectories>$(Platform)\$(Configuration)\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>ICE_BUILDING_SRC;ICE_BUILDING_ICE_GRID;%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
</ItemDefinitionGroup>
<PropertyGroup Label="IceBuilder">
<IceBuilderIncludeDirectories>$(Ice_SrcRootDir)\src\;$(IceBuilderIncludeDirectories)</IceBuilderIncludeDirectories>
<IceBuilderHeaderOutputDir>$(Platform)\$(Configuration)\IceGrid\</IceBuilderHeaderOutputDir>
<IceBuilderBaseDirectoryForGeneratedInclude>IceGrid</IceBuilderBaseDirectoryForGeneratedInclude>
+ <IceBuilderAdditionalOptions>
+ </IceBuilderAdditionalOptions>
</PropertyGroup>
<ItemGroup>
- <ResourceCompile Include="..\..\IceGridDB.rc" />
+ <ResourceCompile Include="..\IceGridDB.rc" />
</ItemGroup>
<ItemGroup>
- <IceBuilder Include="..\..\DBTypes.ice" />
+ <IceBuilder Include="..\..\..\..\slice\IceGrid\Descriptor.ice" />
+ <IceBuilder Include="..\..\..\..\slice\IceGrid\Exception.ice" />
+ <IceBuilder Include="..\DBTypes.ice" />
</ItemGroup>
<ItemGroup>
- <ClCompile Include="..\..\IceGridDB.cpp" />
+ <ClCompile Include="..\IceGridDB.cpp" />
<ClCompile Include="Win32\Debug\DBTypes.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
</ClCompile>
+ <ClCompile Include="Win32\Debug\Descriptor.cpp">
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+ </ClCompile>
+ <ClCompile Include="Win32\Debug\Exception.cpp">
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+ </ClCompile>
<ClCompile Include="Win32\Release\DBTypes.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
</ClCompile>
+ <ClCompile Include="Win32\Release\Descriptor.cpp">
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+ </ClCompile>
+ <ClCompile Include="Win32\Release\Exception.cpp">
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+ </ClCompile>
<ClCompile Include="x64\Debug\DBTypes.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
</ClCompile>
+ <ClCompile Include="x64\Debug\Descriptor.cpp">
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+ </ClCompile>
+ <ClCompile Include="x64\Debug\Exception.cpp">
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+ </ClCompile>
<ClCompile Include="x64\Release\DBTypes.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
</ClCompile>
+ <ClCompile Include="x64\Release\Descriptor.cpp">
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+ </ClCompile>
+ <ClCompile Include="x64\Release\Exception.cpp">
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+ </ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="Win32\Debug\IceGrid\DBTypes.h">
@@ -127,36 +177,76 @@
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
</ClInclude>
+ <ClInclude Include="Win32\Debug\IceGrid\Descriptor.h">
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+ </ClInclude>
+ <ClInclude Include="Win32\Debug\IceGrid\Exception.h">
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+ </ClInclude>
<ClInclude Include="Win32\Release\IceGrid\DBTypes.h">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
</ClInclude>
+ <ClInclude Include="Win32\Release\IceGrid\Descriptor.h">
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+ </ClInclude>
+ <ClInclude Include="Win32\Release\IceGrid\Exception.h">
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+ </ClInclude>
<ClInclude Include="x64\Debug\IceGrid\DBTypes.h">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
</ClInclude>
+ <ClInclude Include="x64\Debug\IceGrid\Descriptor.h">
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+ </ClInclude>
+ <ClInclude Include="x64\Debug\IceGrid\Exception.h">
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+ </ClInclude>
<ClInclude Include="x64\Release\IceGrid\DBTypes.h">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
</ClInclude>
+ <ClInclude Include="x64\Release\IceGrid\Descriptor.h">
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+ </ClInclude>
+ <ClInclude Include="x64\Release\IceGrid\Exception.h">
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+ </ClInclude>
</ItemGroup>
<ItemGroup>
<None Include="packages.config" />
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
- <Import Project="$(LOCALAPPDATA)\ZeroC\IceBuilder\IceBuilder.Cpp.targets" />
+ <Import Project="$(IceBuilderCppTargets)" Condition="Exists('$(IceBuilderCppTargets)')" />
<ImportGroup Label="ExtensionTargets">
- <Import Project="..\..\..\..\msbuild\packages\lmdb.v120.0.9.18.0\build\native\lmdb.v120.targets" Condition="Exists('..\..\..\..\msbuild\packages\lmdb.v120.0.9.18.0\build\native\lmdb.v120.targets')" />
- <Import Project="..\..\..\..\msbuild\packages\lmdb.v140.0.9.18.0\build\native\lmdb.v140.targets" Condition="Exists('..\..\..\..\msbuild\packages\lmdb.v140.0.9.18.0\build\native\lmdb.v140.targets')" />
+ <Import Project="..\..\..\msbuild\packages\lmdb.v120.0.9.18.0\build\native\lmdb.v120.targets" Condition="Exists('..\..\..\msbuild\packages\lmdb.v120.0.9.18.0\build\native\lmdb.v120.targets')" />
+ <Import Project="..\..\..\msbuild\packages\lmdb.v140.0.9.18.0\build\native\lmdb.v140.targets" Condition="Exists('..\..\..\msbuild\packages\lmdb.v140.0.9.18.0\build\native\lmdb.v140.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\lmdb.v120.0.9.18.0\build\native\lmdb.v120.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\lmdb.v120.0.9.18.0\build\native\lmdb.v120.targets'))" />
- <Error Condition="!Exists('..\..\..\..\msbuild\packages\lmdb.v140.0.9.18.0\build\native\lmdb.v140.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\lmdb.v140.0.9.18.0\build\native\lmdb.v140.targets'))" />
+ <Error Condition="!Exists('..\..\..\msbuild\packages\lmdb.v120.0.9.18.0\build\native\lmdb.v120.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\msbuild\packages\lmdb.v120.0.9.18.0\build\native\lmdb.v120.targets'))" />
+ <Error Condition="!Exists('..\..\..\msbuild\packages\lmdb.v140.0.9.18.0\build\native\lmdb.v140.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\msbuild\packages\lmdb.v140.0.9.18.0\build\native\lmdb.v140.targets'))" />
</Target>
-</Project>
+</Project> \ No newline at end of file
diff --git a/cpp/src/IceGrid/msbuild/icegriddb/icegriddb.vcxproj.filters b/cpp/src/icegriddb/msbuild/icegriddb.vcxproj.filters
index 76b4f604548..20bf3556d94 100644
--- a/cpp/src/IceGrid/msbuild/icegriddb/icegriddb.vcxproj.filters
+++ b/cpp/src/icegriddb/msbuild/icegriddb.vcxproj.filters
@@ -60,7 +60,13 @@
</ResourceCompile>
</ItemGroup>
<ItemGroup>
- <IceBuilder Include="..\..\DBTypes.ice">
+ <IceBuilder Include="..\..\..\..\slice\IceGrid\Descriptor.ice">
+ <Filter>Slice Files</Filter>
+ </IceBuilder>
+ <IceBuilder Include="..\..\..\..\slice\IceGrid\Exception.ice">
+ <Filter>Slice Files</Filter>
+ </IceBuilder>
+ <IceBuilder Include="..\DBTypes.ice">
<Filter>Slice Files</Filter>
</IceBuilder>
</ItemGroup>
@@ -68,6 +74,30 @@
<ClCompile Include="..\..\IceGridDB.cpp">
<Filter>Source Files</Filter>
</ClCompile>
+ <ClCompile Include="Win32\Debug\Descriptor.cpp">
+ <Filter>Source Files\Win32\Debug</Filter>
+ </ClCompile>
+ <ClCompile Include="x64\Debug\Descriptor.cpp">
+ <Filter>Source Files\x64\Debug</Filter>
+ </ClCompile>
+ <ClCompile Include="Win32\Release\Descriptor.cpp">
+ <Filter>Source Files\Win32\Release</Filter>
+ </ClCompile>
+ <ClCompile Include="x64\Release\Descriptor.cpp">
+ <Filter>Source Files\x64\Release</Filter>
+ </ClCompile>
+ <ClCompile Include="Win32\Debug\Exception.cpp">
+ <Filter>Source Files\Win32\Debug</Filter>
+ </ClCompile>
+ <ClCompile Include="x64\Debug\Exception.cpp">
+ <Filter>Source Files\x64\Debug</Filter>
+ </ClCompile>
+ <ClCompile Include="Win32\Release\Exception.cpp">
+ <Filter>Source Files\Win32\Release</Filter>
+ </ClCompile>
+ <ClCompile Include="x64\Release\Exception.cpp">
+ <Filter>Source Files\x64\Release</Filter>
+ </ClCompile>
<ClCompile Include="Win32\Debug\DBTypes.cpp">
<Filter>Source Files\Win32\Debug</Filter>
</ClCompile>
@@ -82,6 +112,30 @@
</ClCompile>
</ItemGroup>
<ItemGroup>
+ <ClInclude Include="Win32\Debug\IceGrid\Descriptor.h">
+ <Filter>Header Files\Win32\Debug</Filter>
+ </ClInclude>
+ <ClInclude Include="x64\Debug\IceGrid\Descriptor.h">
+ <Filter>Header Files\x64\Debug</Filter>
+ </ClInclude>
+ <ClInclude Include="Win32\Release\IceGrid\Descriptor.h">
+ <Filter>Header Files\Win32\Release</Filter>
+ </ClInclude>
+ <ClInclude Include="x64\Release\IceGrid\Descriptor.h">
+ <Filter>Header Files\x64\Release</Filter>
+ </ClInclude>
+ <ClInclude Include="Win32\Debug\IceGrid\Exception.h">
+ <Filter>Header Files\Win32\Debug</Filter>
+ </ClInclude>
+ <ClInclude Include="x64\Debug\IceGrid\Exception.h">
+ <Filter>Header Files\x64\Debug</Filter>
+ </ClInclude>
+ <ClInclude Include="Win32\Release\IceGrid\Exception.h">
+ <Filter>Header Files\Win32\Release</Filter>
+ </ClInclude>
+ <ClInclude Include="x64\Release\IceGrid\Exception.h">
+ <Filter>Header Files\x64\Release</Filter>
+ </ClInclude>
<ClInclude Include="Win32\Debug\IceGrid\DBTypes.h">
<Filter>Header Files\Win32\Debug</Filter>
</ClInclude>
diff --git a/cpp/src/IceGrid/msbuild/icegriddb/packages.config b/cpp/src/icegriddb/msbuild/packages.config
index 3f680df025a..156dcc9c14e 100644
--- a/cpp/src/IceGrid/msbuild/icegriddb/packages.config
+++ b/cpp/src/icegriddb/msbuild/packages.config
@@ -2,4 +2,4 @@
<packages>
<package id="lmdb.v120" version="0.9.18.0" targetFramework="native" />
<package id="lmdb.v140" version="0.9.18.0" targetFramework="native" />
-</packages>
+</packages> \ No newline at end of file
generated by cgit v1.2.3 (git 2.46.0) at 2025-08-04 23:56:32 +0000