Skip to content

Commit

Permalink
Additional Windows build fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
@pepone
pepone committed Oct 16, 2024
1 parent 4bd1bbd commit 59949e8
Show file tree
Hide file tree
Showing 29 changed files with 264 additions and 162 deletions.
166 changes: 166 additions & 0 deletions cpp/msbuild/ice.test.sln
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1143,6 +1143,48 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "server", "..\test\Ice\maxCo
{C7223CC8-0AAA-470B-ACB3-12B9DE75525C} = {C7223CC8-0AAA-470B-ACB3-12B9DE75525C}
EndProjectSection
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "DataStorm", "DataStorm", "{8050D625-A26F-4EA0-A74D-6095A1F13B92}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "api", "api", "{834A92DD-5964-4F16-8A9B-77F764620F55}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "callbacks", "callbacks", "{4564A657-073F-470E-A4AD-A5D947DFFEE3}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "config", "config", "{C5A4D258-2623-42C0-95AB-8CF48ACECE56}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "events", "events", "{3A4E17C2-28FB-46AF-BE15-E1D8DBC232C9}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "partial", "partial", "{7D50B677-D295-4CAF-B555-9C87FAF4E8D6}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "reliability", "reliability", "{E435395E-2CFB-4933-941D-69EE60805093}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "types", "types", "{2618669B-54B1-4013-B6EC-C1389391E3AA}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "writer", "..\test\DataStorm\api\msbuild\writer\writer.vcxproj", "{85F74421-2B78-448B-91F0-496526EB365F}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "reader", "..\test\DataStorm\callbacks\msbuild\reader\reader.vcxproj", "{783EE047-9119-4412-960A-600729D1A0F1}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "writer", "..\test\DataStorm\callbacks\msbuild\writer\writer.vcxproj", "{8ADD3C14-F6A9-4683-94BE-EB87C60078F1}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "reader", "..\test\DataStorm\config\msbuild\reader\reader.vcxproj", "{735292B7-70CB-43B2-B7BB-D123B7497CC7}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "writer", "..\test\DataStorm\config\msbuild\writer\writer.vcxproj", "{1C5D0A06-731C-4FBB-8250-0B09E7D5BF55}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "reader", "..\test\DataStorm\events\msbuild\reader\reader.vcxproj", "{5EE1FFB1-A9CF-4737-A1FA-575B51F8AE00}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "writer", "..\test\DataStorm\events\msbuild\writer\writer.vcxproj", "{A368BD9C-2CBC-4302-9A7F-C96BA11D62BB}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "reader", "..\test\DataStorm\partial\msbuild\reader\reader.vcxproj", "{3EAAF1DE-8673-4D16-AA36-F522C5C21F79}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "writer", "..\test\DataStorm\partial\msbuild\writer\writer.vcxproj", "{71506AF2-B7C4-48D7-AE6E-4ADA8B72A87C}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "reader", "..\test\DataStorm\reliability\msbuild\reader\reader.vcxproj", "{18B9E886-A355-4CCC-8E27-84900C516DA8}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "writer", "..\test\DataStorm\reliability\msbuild\writer\writer.vcxproj", "{71A33CBC-71F6-434B-BB90-620710269310}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "reader", "..\test\DataStorm\types\msbuild\reader\reader.vcxproj", "{924B7545-4B49-41E6-9FAC-30F7BAB7A518}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "writer", "..\test\DataStorm\types\msbuild\writer\writer.vcxproj", "{6CFEBEB6-88C6-4A41-847E-E02CFDCD12C8}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Win32 = Debug|Win32
Expand Down Expand Up @@ -2663,6 +2705,110 @@ Global
{2750A8E9-34AB-4A5E-ABC4-78CE41328A12}.Release|Win32.Build.0 = Release|Win32
{2750A8E9-34AB-4A5E-ABC4-78CE41328A12}.Release|x64.ActiveCfg = Release|x64
{2750A8E9-34AB-4A5E-ABC4-78CE41328A12}.Release|x64.Build.0 = Release|x64
{85F74421-2B78-448B-91F0-496526EB365F}.Debug|Win32.ActiveCfg = Debug|Win32
{85F74421-2B78-448B-91F0-496526EB365F}.Debug|Win32.Build.0 = Debug|Win32
{85F74421-2B78-448B-91F0-496526EB365F}.Debug|x64.ActiveCfg = Debug|x64
{85F74421-2B78-448B-91F0-496526EB365F}.Debug|x64.Build.0 = Debug|x64
{85F74421-2B78-448B-91F0-496526EB365F}.Release|Win32.ActiveCfg = Release|Win32
{85F74421-2B78-448B-91F0-496526EB365F}.Release|Win32.Build.0 = Release|Win32
{85F74421-2B78-448B-91F0-496526EB365F}.Release|x64.ActiveCfg = Release|x64
{85F74421-2B78-448B-91F0-496526EB365F}.Release|x64.Build.0 = Release|x64
{783EE047-9119-4412-960A-600729D1A0F1}.Debug|Win32.ActiveCfg = Debug|Win32
{783EE047-9119-4412-960A-600729D1A0F1}.Debug|Win32.Build.0 = Debug|Win32
{783EE047-9119-4412-960A-600729D1A0F1}.Debug|x64.ActiveCfg = Debug|x64
{783EE047-9119-4412-960A-600729D1A0F1}.Debug|x64.Build.0 = Debug|x64
{783EE047-9119-4412-960A-600729D1A0F1}.Release|Win32.ActiveCfg = Release|Win32
{783EE047-9119-4412-960A-600729D1A0F1}.Release|Win32.Build.0 = Release|Win32
{783EE047-9119-4412-960A-600729D1A0F1}.Release|x64.ActiveCfg = Release|x64
{783EE047-9119-4412-960A-600729D1A0F1}.Release|x64.Build.0 = Release|x64
{8ADD3C14-F6A9-4683-94BE-EB87C60078F1}.Debug|Win32.ActiveCfg = Debug|Win32
{8ADD3C14-F6A9-4683-94BE-EB87C60078F1}.Debug|Win32.Build.0 = Debug|Win32
{8ADD3C14-F6A9-4683-94BE-EB87C60078F1}.Debug|x64.ActiveCfg = Debug|x64
{8ADD3C14-F6A9-4683-94BE-EB87C60078F1}.Debug|x64.Build.0 = Debug|x64
{8ADD3C14-F6A9-4683-94BE-EB87C60078F1}.Release|Win32.ActiveCfg = Release|Win32
{8ADD3C14-F6A9-4683-94BE-EB87C60078F1}.Release|Win32.Build.0 = Release|Win32
{8ADD3C14-F6A9-4683-94BE-EB87C60078F1}.Release|x64.ActiveCfg = Release|x64
{8ADD3C14-F6A9-4683-94BE-EB87C60078F1}.Release|x64.Build.0 = Release|x64
{735292B7-70CB-43B2-B7BB-D123B7497CC7}.Debug|Win32.ActiveCfg = Debug|Win32
{735292B7-70CB-43B2-B7BB-D123B7497CC7}.Debug|Win32.Build.0 = Debug|Win32
{735292B7-70CB-43B2-B7BB-D123B7497CC7}.Debug|x64.ActiveCfg = Debug|x64
{735292B7-70CB-43B2-B7BB-D123B7497CC7}.Debug|x64.Build.0 = Debug|x64
{735292B7-70CB-43B2-B7BB-D123B7497CC7}.Release|Win32.ActiveCfg = Release|Win32
{735292B7-70CB-43B2-B7BB-D123B7497CC7}.Release|Win32.Build.0 = Release|Win32
{735292B7-70CB-43B2-B7BB-D123B7497CC7}.Release|x64.ActiveCfg = Release|x64
{735292B7-70CB-43B2-B7BB-D123B7497CC7}.Release|x64.Build.0 = Release|x64
{1C5D0A06-731C-4FBB-8250-0B09E7D5BF55}.Debug|Win32.ActiveCfg = Debug|Win32
{1C5D0A06-731C-4FBB-8250-0B09E7D5BF55}.Debug|Win32.Build.0 = Debug|Win32
{1C5D0A06-731C-4FBB-8250-0B09E7D5BF55}.Debug|x64.ActiveCfg = Debug|x64
{1C5D0A06-731C-4FBB-8250-0B09E7D5BF55}.Debug|x64.Build.0 = Debug|x64
{1C5D0A06-731C-4FBB-8250-0B09E7D5BF55}.Release|Win32.ActiveCfg = Release|Win32
{1C5D0A06-731C-4FBB-8250-0B09E7D5BF55}.Release|Win32.Build.0 = Release|Win32
{1C5D0A06-731C-4FBB-8250-0B09E7D5BF55}.Release|x64.ActiveCfg = Release|x64
{1C5D0A06-731C-4FBB-8250-0B09E7D5BF55}.Release|x64.Build.0 = Release|x64
{5EE1FFB1-A9CF-4737-A1FA-575B51F8AE00}.Debug|Win32.ActiveCfg = Debug|Win32
{5EE1FFB1-A9CF-4737-A1FA-575B51F8AE00}.Debug|Win32.Build.0 = Debug|Win32
{5EE1FFB1-A9CF-4737-A1FA-575B51F8AE00}.Debug|x64.ActiveCfg = Debug|x64
{5EE1FFB1-A9CF-4737-A1FA-575B51F8AE00}.Debug|x64.Build.0 = Debug|x64
{5EE1FFB1-A9CF-4737-A1FA-575B51F8AE00}.Release|Win32.ActiveCfg = Release|Win32
{5EE1FFB1-A9CF-4737-A1FA-575B51F8AE00}.Release|Win32.Build.0 = Release|Win32
{5EE1FFB1-A9CF-4737-A1FA-575B51F8AE00}.Release|x64.ActiveCfg = Release|x64
{5EE1FFB1-A9CF-4737-A1FA-575B51F8AE00}.Release|x64.Build.0 = Release|x64
{A368BD9C-2CBC-4302-9A7F-C96BA11D62BB}.Debug|Win32.ActiveCfg = Debug|Win32
{A368BD9C-2CBC-4302-9A7F-C96BA11D62BB}.Debug|Win32.Build.0 = Debug|Win32
{A368BD9C-2CBC-4302-9A7F-C96BA11D62BB}.Debug|x64.ActiveCfg = Debug|x64
{A368BD9C-2CBC-4302-9A7F-C96BA11D62BB}.Debug|x64.Build.0 = Debug|x64
{A368BD9C-2CBC-4302-9A7F-C96BA11D62BB}.Release|Win32.ActiveCfg = Release|Win32
{A368BD9C-2CBC-4302-9A7F-C96BA11D62BB}.Release|Win32.Build.0 = Release|Win32
{A368BD9C-2CBC-4302-9A7F-C96BA11D62BB}.Release|x64.ActiveCfg = Release|x64
{A368BD9C-2CBC-4302-9A7F-C96BA11D62BB}.Release|x64.Build.0 = Release|x64
{3EAAF1DE-8673-4D16-AA36-F522C5C21F79}.Debug|Win32.ActiveCfg = Debug|Win32
{3EAAF1DE-8673-4D16-AA36-F522C5C21F79}.Debug|Win32.Build.0 = Debug|Win32
{3EAAF1DE-8673-4D16-AA36-F522C5C21F79}.Debug|x64.ActiveCfg = Debug|x64
{3EAAF1DE-8673-4D16-AA36-F522C5C21F79}.Debug|x64.Build.0 = Debug|x64
{3EAAF1DE-8673-4D16-AA36-F522C5C21F79}.Release|Win32.ActiveCfg = Release|Win32
{3EAAF1DE-8673-4D16-AA36-F522C5C21F79}.Release|Win32.Build.0 = Release|Win32
{3EAAF1DE-8673-4D16-AA36-F522C5C21F79}.Release|x64.ActiveCfg = Release|x64
{3EAAF1DE-8673-4D16-AA36-F522C5C21F79}.Release|x64.Build.0 = Release|x64
{71506AF2-B7C4-48D7-AE6E-4ADA8B72A87C}.Debug|Win32.ActiveCfg = Debug|Win32
{71506AF2-B7C4-48D7-AE6E-4ADA8B72A87C}.Debug|Win32.Build.0 = Debug|Win32
{71506AF2-B7C4-48D7-AE6E-4ADA8B72A87C}.Debug|x64.ActiveCfg = Debug|x64
{71506AF2-B7C4-48D7-AE6E-4ADA8B72A87C}.Debug|x64.Build.0 = Debug|x64
{71506AF2-B7C4-48D7-AE6E-4ADA8B72A87C}.Release|Win32.ActiveCfg = Release|Win32
{71506AF2-B7C4-48D7-AE6E-4ADA8B72A87C}.Release|Win32.Build.0 = Release|Win32
{71506AF2-B7C4-48D7-AE6E-4ADA8B72A87C}.Release|x64.ActiveCfg = Release|x64
{71506AF2-B7C4-48D7-AE6E-4ADA8B72A87C}.Release|x64.Build.0 = Release|x64
{18B9E886-A355-4CCC-8E27-84900C516DA8}.Debug|Win32.ActiveCfg = Debug|Win32
{18B9E886-A355-4CCC-8E27-84900C516DA8}.Debug|Win32.Build.0 = Debug|Win32
{18B9E886-A355-4CCC-8E27-84900C516DA8}.Debug|x64.ActiveCfg = Debug|x64
{18B9E886-A355-4CCC-8E27-84900C516DA8}.Debug|x64.Build.0 = Debug|x64
{18B9E886-A355-4CCC-8E27-84900C516DA8}.Release|Win32.ActiveCfg = Release|Win32
{18B9E886-A355-4CCC-8E27-84900C516DA8}.Release|Win32.Build.0 = Release|Win32
{18B9E886-A355-4CCC-8E27-84900C516DA8}.Release|x64.ActiveCfg = Release|x64
{18B9E886-A355-4CCC-8E27-84900C516DA8}.Release|x64.Build.0 = Release|x64
{71A33CBC-71F6-434B-BB90-620710269310}.Debug|Win32.ActiveCfg = Debug|Win32
{71A33CBC-71F6-434B-BB90-620710269310}.Debug|Win32.Build.0 = Debug|Win32
{71A33CBC-71F6-434B-BB90-620710269310}.Debug|x64.ActiveCfg = Debug|x64
{71A33CBC-71F6-434B-BB90-620710269310}.Debug|x64.Build.0 = Debug|x64
{71A33CBC-71F6-434B-BB90-620710269310}.Release|Win32.ActiveCfg = Release|Win32
{71A33CBC-71F6-434B-BB90-620710269310}.Release|Win32.Build.0 = Release|Win32
{71A33CBC-71F6-434B-BB90-620710269310}.Release|x64.ActiveCfg = Release|x64
{71A33CBC-71F6-434B-BB90-620710269310}.Release|x64.Build.0 = Release|x64
{924B7545-4B49-41E6-9FAC-30F7BAB7A518}.Debug|Win32.ActiveCfg = Debug|Win32
{924B7545-4B49-41E6-9FAC-30F7BAB7A518}.Debug|Win32.Build.0 = Debug|Win32
{924B7545-4B49-41E6-9FAC-30F7BAB7A518}.Debug|x64.ActiveCfg = Debug|x64
{924B7545-4B49-41E6-9FAC-30F7BAB7A518}.Debug|x64.Build.0 = Debug|x64
{924B7545-4B49-41E6-9FAC-30F7BAB7A518}.Release|Win32.ActiveCfg = Release|Win32
{924B7545-4B49-41E6-9FAC-30F7BAB7A518}.Release|Win32.Build.0 = Release|Win32
{924B7545-4B49-41E6-9FAC-30F7BAB7A518}.Release|x64.ActiveCfg = Release|x64
{924B7545-4B49-41E6-9FAC-30F7BAB7A518}.Release|x64.Build.0 = Release|x64
{6CFEBEB6-88C6-4A41-847E-E02CFDCD12C8}.Debug|Win32.ActiveCfg = Debug|Win32
{6CFEBEB6-88C6-4A41-847E-E02CFDCD12C8}.Debug|Win32.Build.0 = Debug|Win32
{6CFEBEB6-88C6-4A41-847E-E02CFDCD12C8}.Debug|x64.ActiveCfg = Debug|x64
{6CFEBEB6-88C6-4A41-847E-E02CFDCD12C8}.Debug|x64.Build.0 = Debug|x64
{6CFEBEB6-88C6-4A41-847E-E02CFDCD12C8}.Release|Win32.ActiveCfg = Release|Win32
{6CFEBEB6-88C6-4A41-847E-E02CFDCD12C8}.Release|Win32.Build.0 = Release|Win32
{6CFEBEB6-88C6-4A41-847E-E02CFDCD12C8}.Release|x64.ActiveCfg = Release|x64
{6CFEBEB6-88C6-4A41-847E-E02CFDCD12C8}.Release|x64.Build.0 = Release|x64
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand Down Expand Up @@ -2944,6 +3090,26 @@ Global
{286A7273-091A-4C8A-84ED-8CBB52D790A6} = {2CAF9731-CB18-498C-A3EF-24F3D8A334AC}
{9A7E939A-DE60-431B-ABD2-5A44EE2CABD6} = {286A7273-091A-4C8A-84ED-8CBB52D790A6}
{2750A8E9-34AB-4A5E-ABC4-78CE41328A12} = {286A7273-091A-4C8A-84ED-8CBB52D790A6}
{834A92DD-5964-4F16-8A9B-77F764620F55} = {8050D625-A26F-4EA0-A74D-6095A1F13B92}
{4564A657-073F-470E-A4AD-A5D947DFFEE3} = {8050D625-A26F-4EA0-A74D-6095A1F13B92}
{C5A4D258-2623-42C0-95AB-8CF48ACECE56} = {8050D625-A26F-4EA0-A74D-6095A1F13B92}
{3A4E17C2-28FB-46AF-BE15-E1D8DBC232C9} = {8050D625-A26F-4EA0-A74D-6095A1F13B92}
{7D50B677-D295-4CAF-B555-9C87FAF4E8D6} = {8050D625-A26F-4EA0-A74D-6095A1F13B92}
{E435395E-2CFB-4933-941D-69EE60805093} = {8050D625-A26F-4EA0-A74D-6095A1F13B92}
{2618669B-54B1-4013-B6EC-C1389391E3AA} = {8050D625-A26F-4EA0-A74D-6095A1F13B92}
{85F74421-2B78-448B-91F0-496526EB365F} = {834A92DD-5964-4F16-8A9B-77F764620F55}
{783EE047-9119-4412-960A-600729D1A0F1} = {4564A657-073F-470E-A4AD-A5D947DFFEE3}
{8ADD3C14-F6A9-4683-94BE-EB87C60078F1} = {4564A657-073F-470E-A4AD-A5D947DFFEE3}
{735292B7-70CB-43B2-B7BB-D123B7497CC7} = {C5A4D258-2623-42C0-95AB-8CF48ACECE56}
{1C5D0A06-731C-4FBB-8250-0B09E7D5BF55} = {C5A4D258-2623-42C0-95AB-8CF48ACECE56}
{5EE1FFB1-A9CF-4737-A1FA-575B51F8AE00} = {3A4E17C2-28FB-46AF-BE15-E1D8DBC232C9}
{A368BD9C-2CBC-4302-9A7F-C96BA11D62BB} = {3A4E17C2-28FB-46AF-BE15-E1D8DBC232C9}
{3EAAF1DE-8673-4D16-AA36-F522C5C21F79} = {7D50B677-D295-4CAF-B555-9C87FAF4E8D6}
{71506AF2-B7C4-48D7-AE6E-4ADA8B72A87C} = {7D50B677-D295-4CAF-B555-9C87FAF4E8D6}
{18B9E886-A355-4CCC-8E27-84900C516DA8} = {E435395E-2CFB-4933-941D-69EE60805093}
{71A33CBC-71F6-434B-BB90-620710269310} = {E435395E-2CFB-4933-941D-69EE60805093}
{924B7545-4B49-41E6-9FAC-30F7BAB7A518} = {2618669B-54B1-4013-B6EC-C1389391E3AA}
{6CFEBEB6-88C6-4A41-847E-E02CFDCD12C8} = {2618669B-54B1-4013-B6EC-C1389391E3AA}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {E6FDB68A-64BA-4577-ABCD-40A01257F8AB}
Expand Down
7 changes: 4 additions & 3 deletions cpp/src/dsnode/Node.cpp
View file
Original file line number Diff line number Diff line change
@@ -1,13 +1,14 @@
//
// Copyright (c) ZeroC, Inc. All rights reserved.
//
#include <DataStorm/DataStorm.h>

#include "DataStorm/DataStorm.h"

#include <iostream>

using namespace std;

void
static void
usage(const string& n)
{
cerr << "Usage: " << n << " [options]\n";
Expand All @@ -29,7 +30,7 @@ main(int argc, char* argv[])
string arg = argv[i];
if (arg == "-v" || arg == "--version")
{
cout << DATASTORM_STRING_VERSION << endl;
cout << ICE_STRING_VERSION << endl;
return 0;
}
else if (arg == "-h" || arg == "--help")
Expand Down
3 changes: 1 addition & 2 deletions cpp/test/DataStorm/api/msbuild/writer/packages.config
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="zeroc.datastorm.v143" version="1.1.0" targetFramework="native" />
<package id="zeroc.ice.v143" version="3.8.0-alpha0" targetFramework="native" />
<package id="zeroc.icebuilder.msbuild" version="5.0.9" targetFramework="native" />
</packages>
</packages>
Loading

0 comments on commit 59949e8

Please sign in to comment.