Skip to content

Commit

Permalink
- Setup for Visual Studio 2022
Browse files Browse the repository at this point in the history
- Referenzdaten PerfTest Delphi und netstd
- "custom build" added to version info
- workaround for some strange LNK error in go validation code
  • Loading branch information
Jens-G committed Jun 11, 2024
1 parent 30dd782 commit 027192e
Show file tree
Hide file tree
Showing 8 changed files with 206 additions and 5 deletions.
13 changes: 12 additions & 1 deletion compiler/cpp/compiler.vcxproj
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|Win32">
<Configuration>Debug</Configuration>
Expand All @@ -23,8 +23,11 @@
<ClInclude Include="src\thrift\common.h" />
<ClInclude Include="src\thrift\generate\t_generator.h" />
<ClInclude Include="src\thrift\generate\t_generator_registry.h" />
<ClInclude Include="src\thrift\generate\t_go_generator.h" />
<ClInclude Include="src\thrift\generate\t_oop_generator.h" />
<ClInclude Include="src\thrift\generate\t_html_generator.h" />
<ClCompile Include="src\thrift\generate\go_validator_generator.h" />
<ClInclude Include="src\thrift\generate\validator_parser.h" />
<ClInclude Include="src\thrift\globals.h" />
<ClInclude Include="src\thrift\main.h" />
<ClInclude Include="src\thrift\parse\t_base_type.h" />
Expand Down Expand Up @@ -53,6 +56,8 @@
<ItemGroup>
<ClCompile Include="src\thrift\audit\t_audit.cpp" />
<ClCompile Include="src\thrift\common.cc" />
<ClCompile Include="src\thrift\generate\go_validator_generator.cc" />
<ClInclude Include="src\thrift\generate\validator_parser.cc" />
<ClCompile Include="src\thrift\generate\t_c_glib_generator.cc" />
<ClCompile Include="src\thrift\generate\t_cl_generator.cc" />
<ClCompile Include="src\thrift\generate\t_cpp_generator.cc" />
Expand Down Expand Up @@ -98,29 +103,34 @@
<ProjectGuid>{89975A1A-F799-4556-98B8-64E30AB39A90}</ProjectGuid>
<Keyword>Win32Proj</Keyword>
<RootNamespace>compiler</RootNamespace>
<WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
<CharacterSet>MultiByte</CharacterSet>
<PlatformToolset>v143</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
<CharacterSet>MultiByte</CharacterSet>
<PlatformToolset>v143</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>MultiByte</CharacterSet>
<PlatformToolset>v143</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>MultiByte</CharacterSet>
<PlatformToolset>v143</PlatformToolset>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
Expand All @@ -143,6 +153,7 @@
<IncludePath>$(ProjectDir)\src\;$(ProjectDir)\src\windows\;$(IncludePath)</IncludePath>
<TargetName>thrift</TargetName>
<ExecutablePath>$(ExecutablePath);C:\Program Files (x86)\Git\bin</ExecutablePath>
<OutDir>E:\D\TOOLS\Thrift\</OutDir>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<LinkIncremental>true</LinkIncremental>
Expand Down
15 changes: 15 additions & 0 deletions compiler/cpp/compiler.vcxproj.filters
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,15 @@
<ClInclude Include="src\generate\t_oop_generator.h">
<Filter>generate</Filter>
</ClInclude>
<ClInclude Include="src\generate\t_go_generator.h">
<Filter>generate</Filter>
</ClInclude>
<ClInclude Include="src\generate\go_validator_generator.h">
<Filter>generate</Filter>
</ClInclude>
<ClInclude Include="src\generate\validator_parser.h">
<Filter>generate</Filter>
</ClInclude>
<ClInclude Include="src\generate\t_html_generator.h">
<Filter>generate</Filter>
</ClInclude>
Expand Down Expand Up @@ -92,6 +101,12 @@
</ItemGroup>
<ItemGroup>
<ClCompile Include="src\audit\t_audit.cpp"/>
<ClCompile Include="src\generate\go_validator_generator.cc">
<Filter>generate</Filter>
</ClCompile>
<ClCompile Include="src\generate\validator_parser.cc">
<Filter>generate</Filter>
</ClCompile>
<ClCompile Include="src\generate\t_cocoa_generator.cc">
<Filter>generate</Filter>
</ClCompile>
Expand Down
2 changes: 1 addition & 1 deletion compiler/cpp/src/thrift/generate/t_go_generator.cc
Original file line number Diff line number Diff line change
Expand Up @@ -1190,7 +1190,7 @@ void t_go_generator::generate_go_struct(t_struct* tstruct, bool is_exception) {
std::string tstruct_name(publicize(tstruct->get_name(), false));
f_types_ << "func (p *" << tstruct_name << ") Validate() error {" << '\n';
indent_up();
go_validator_generator(this).generate_struct_validator(f_types_, tstruct);
//go_validator_generator(this).generate_struct_validator(f_types_, tstruct); -- causes LNK2019 in VC
f_types_ << indent() << "return nil" << '\n';
indent_down();
f_types_ << "}" << '\n' << '\n';
Expand Down
2 changes: 1 addition & 1 deletion compiler/cpp/src/thrift/main.cc
Original file line number Diff line number Diff line change
Expand Up @@ -656,7 +656,7 @@ void error_unsupported_namespace_decl(const char* old_form, const char* new_form
* Prints the version number
*/
void version() {
printf("Thrift version %s\n", THRIFT_VERSION);
printf("Thrift version %s (custom build)\n", THRIFT_VERSION);
}

/**
Expand Down
120 changes: 120 additions & 0 deletions lib/delphi/Thrift.groupproj
Original file line number Diff line number Diff line change
@@ -0,0 +1,120 @@
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<ProjectGuid>{86AE16E4-18D4-4C07-B06C-491E22A26C74}</ProjectGuid>
</PropertyGroup>
<ItemGroup>
<Projects Include="test\client.dproj">
<Dependencies/>
</Projects>
<Projects Include="test\server.dproj">
<Dependencies/>
</Projects>
<Projects Include="test\multiplexed\Multiplex.Test.Client.dproj">
<Dependencies/>
</Projects>
<Projects Include="test\multiplexed\Multiplex.Test.Server.dproj">
<Dependencies/>
</Projects>
<Projects Include="test\serializer\TestSerializer.dproj">
<Dependencies/>
</Projects>
<Projects Include="test\skip\skiptest_version2.dproj">
<Dependencies/>
</Projects>
<Projects Include="test\skip\skiptest_version1.dproj">
<Dependencies/>
</Projects>
<Projects Include="test\typeregistry\TestTypeRegistry.dproj">
<Dependencies/>
</Projects>
</ItemGroup>
<ProjectExtensions>
<Borland.Personality>Default.Personality.12</Borland.Personality>
<Borland.ProjectType/>
<BorlandProject>
<Default.Personality/>
</BorlandProject>
</ProjectExtensions>
<Target Name="client">
<MSBuild Projects="test\client.dproj"/>
</Target>
<Target Name="client:Clean">
<MSBuild Projects="test\client.dproj" Targets="Clean"/>
</Target>
<Target Name="client:Make">
<MSBuild Projects="test\client.dproj" Targets="Make"/>
</Target>
<Target Name="server">
<MSBuild Projects="test\server.dproj"/>
</Target>
<Target Name="server:Clean">
<MSBuild Projects="test\server.dproj" Targets="Clean"/>
</Target>
<Target Name="server:Make">
<MSBuild Projects="test\server.dproj" Targets="Make"/>
</Target>
<Target Name="Multiplex_Test_Client">
<MSBuild Projects="test\multiplexed\Multiplex.Test.Client.dproj"/>
</Target>
<Target Name="Multiplex_Test_Client:Clean">
<MSBuild Projects="test\multiplexed\Multiplex.Test.Client.dproj" Targets="Clean"/>
</Target>
<Target Name="Multiplex_Test_Client:Make">
<MSBuild Projects="test\multiplexed\Multiplex.Test.Client.dproj" Targets="Make"/>
</Target>
<Target Name="Multiplex_Test_Server">
<MSBuild Projects="test\multiplexed\Multiplex.Test.Server.dproj"/>
</Target>
<Target Name="Multiplex_Test_Server:Clean">
<MSBuild Projects="test\multiplexed\Multiplex.Test.Server.dproj" Targets="Clean"/>
</Target>
<Target Name="Multiplex_Test_Server:Make">
<MSBuild Projects="test\multiplexed\Multiplex.Test.Server.dproj" Targets="Make"/>
</Target>
<Target Name="TestSerializer">
<MSBuild Projects="test\serializer\TestSerializer.dproj"/>
</Target>
<Target Name="TestSerializer:Clean">
<MSBuild Projects="test\serializer\TestSerializer.dproj" Targets="Clean"/>
</Target>
<Target Name="TestSerializer:Make">
<MSBuild Projects="test\serializer\TestSerializer.dproj" Targets="Make"/>
</Target>
<Target Name="skiptest_version2">
<MSBuild Projects="test\skip\skiptest_version2.dproj"/>
</Target>
<Target Name="skiptest_version2:Clean">
<MSBuild Projects="test\skip\skiptest_version2.dproj" Targets="Clean"/>
</Target>
<Target Name="skiptest_version2:Make">
<MSBuild Projects="test\skip\skiptest_version2.dproj" Targets="Make"/>
</Target>
<Target Name="skiptest_version1">
<MSBuild Projects="test\skip\skiptest_version1.dproj"/>
</Target>
<Target Name="skiptest_version1:Clean">
<MSBuild Projects="test\skip\skiptest_version1.dproj" Targets="Clean"/>
</Target>
<Target Name="skiptest_version1:Make">
<MSBuild Projects="test\skip\skiptest_version1.dproj" Targets="Make"/>
</Target>
<Target Name="TestTypeRegistry">
<MSBuild Projects="test\typeregistry\TestTypeRegistry.dproj"/>
</Target>
<Target Name="TestTypeRegistry:Clean">
<MSBuild Projects="test\typeregistry\TestTypeRegistry.dproj" Targets="Clean"/>
</Target>
<Target Name="TestTypeRegistry:Make">
<MSBuild Projects="test\typeregistry\TestTypeRegistry.dproj" Targets="Make"/>
</Target>
<Target Name="Build">
<CallTarget Targets="client;server;Multiplex_Test_Client;Multiplex_Test_Server;TestSerializer;skiptest_version2;skiptest_version1;TestTypeRegistry"/>
</Target>
<Target Name="Clean">
<CallTarget Targets="client:Clean;server:Clean;Multiplex_Test_Client:Clean;Multiplex_Test_Server:Clean;TestSerializer:Clean;skiptest_version2:Clean;skiptest_version1:Clean;TestTypeRegistry:Clean"/>
</Target>
<Target Name="Make">
<CallTarget Targets="client:Make;server:Make;Multiplex_Test_Client:Make;Multiplex_Test_Server:Make;TestSerializer:Make;skiptest_version2:Make;skiptest_version1:Make;TestTypeRegistry:Make"/>
</Target>
<Import Condition="Exists('$(BDS)\Bin\CodeGear.Group.Targets')" Project="$(BDS)\Bin\CodeGear.Group.Targets"/>
</Project>
21 changes: 21 additions & 0 deletions lib/delphi/test/testsuite/client/Performance/Referenz.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
Delphi TestClient 0.14.0
Setting up for ProtocolPeformanceTest ...
RunTest(binary): write = 2650 msec
RunTest(binary): read = 3135 msec
RunTest(compact): write = 2807 msec
RunTest(compact): read = 3053 msec
RunTest(JSON): write = 13251 msec
RunTest(JSON): read = 18759 msec
RunTest(binary + buffered): write = 2635 msec
RunTest(binary + buffered): read = 3109 msec
RunTest(compact + buffered): write = 2788 msec
RunTest(compact + buffered): read = 3069 msec
RunTest(JSON + buffered): write = 13604 msec
RunTest(JSON + buffered): read = 21537 msec
RunTest(binary + framed): write = 3019 msec
RunTest(binary + framed): read = 3573 msec
RunTest(compact + framed): write = 3201 msec
RunTest(compact + framed): read = 3504 msec
RunTest(JSON + framed): write = 15093 msec
RunTest(JSON + framed): read = 21548 msec
Hit ENTER ...
20 changes: 20 additions & 0 deletions test/netstd/Referenz.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
E:\D\TPCPP\Thrift\wc-XE-all\wc-JensG-haxe\test\netstd\Client\bin\Release\netcoreapp3.1>Client.exe --performance
Setting up for ProtocolPeformanceTestAsync ...
RunTestAsync(TBinaryProtocol): write = 1982 msec
RunTestAsync(TBinaryProtocol): read = 4995 msec
RunTestAsync(TCompactProtocol): write = 1240 msec
RunTestAsync(TCompactProtocol): read = 3964 msec
RunTestAsync(TJsonProtocol): write = 5206 msec
RunTestAsync(TJsonProtocol): read = 23249 msec
RunTestAsync(TBinaryProtocol + TBufferedTransport): write = 1990 msec
RunTestAsync(TBinaryProtocol + TBufferedTransport): read = 5777 msec
RunTestAsync(TCompactProtocol + TBufferedTransport): write = 1453 msec
RunTestAsync(TCompactProtocol + TBufferedTransport): read = 4761 msec
RunTestAsync(TJsonProtocol + TBufferedTransport): write = 8859 msec
RunTestAsync(TJsonProtocol + TBufferedTransport): read = 30925 msec
RunTestAsync(TBinaryProtocol + TFramedTransport): write = 2042 msec
RunTestAsync(TBinaryProtocol + TFramedTransport): read = 5726 msec
RunTestAsync(TCompactProtocol + TFramedTransport): write = 1480 msec
RunTestAsync(TCompactProtocol + TFramedTransport): read = 4818 msec
RunTestAsync(TJsonProtocol + TFramedTransport): write = 8612 msec
RunTestAsync(TJsonProtocol + TFramedTransport): read = 30810 msec
18 changes: 16 additions & 2 deletions test/netstd/ThriftTest.sln
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio Version 16
VisualStudioVersion = 16.0.30104.148
# Visual Studio Version 17
VisualStudioVersion = 17.0.32112.339
MinimumVisualStudioVersion = 10.0.40219.1
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Thrift", "..\..\lib\netstd\Thrift\Thrift.csproj", "{C20EA2A9-7660-47DE-9A49-D1EF12FB2895}"
EndProject
Expand All @@ -17,6 +17,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Thrift.Tests", "..\..\lib\n
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Thrift.Benchmarks", "..\..\lib\netstd\Benchmarks\Thrift.Benchmarks\Thrift.Benchmarks.csproj", "{66946544-8DE7-45E9-8D0E-93EADA028D44}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Interfaces", "..\..\tutorial\netstd\Interfaces\Interfaces.csproj", "{A360CB0A-7EBF-460C-AF10-3048DC205215}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Expand Down Expand Up @@ -111,6 +113,18 @@ Global
{66946544-8DE7-45E9-8D0E-93EADA028D44}.Release|x64.Build.0 = Release|Any CPU
{66946544-8DE7-45E9-8D0E-93EADA028D44}.Release|x86.ActiveCfg = Release|Any CPU
{66946544-8DE7-45E9-8D0E-93EADA028D44}.Release|x86.Build.0 = Release|Any CPU
{A360CB0A-7EBF-460C-AF10-3048DC205215}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{A360CB0A-7EBF-460C-AF10-3048DC205215}.Debug|Any CPU.Build.0 = Debug|Any CPU
{A360CB0A-7EBF-460C-AF10-3048DC205215}.Debug|x64.ActiveCfg = Debug|Any CPU
{A360CB0A-7EBF-460C-AF10-3048DC205215}.Debug|x64.Build.0 = Debug|Any CPU
{A360CB0A-7EBF-460C-AF10-3048DC205215}.Debug|x86.ActiveCfg = Debug|Any CPU
{A360CB0A-7EBF-460C-AF10-3048DC205215}.Debug|x86.Build.0 = Debug|Any CPU
{A360CB0A-7EBF-460C-AF10-3048DC205215}.Release|Any CPU.ActiveCfg = Release|Any CPU
{A360CB0A-7EBF-460C-AF10-3048DC205215}.Release|Any CPU.Build.0 = Release|Any CPU
{A360CB0A-7EBF-460C-AF10-3048DC205215}.Release|x64.ActiveCfg = Release|Any CPU
{A360CB0A-7EBF-460C-AF10-3048DC205215}.Release|x64.Build.0 = Release|Any CPU
{A360CB0A-7EBF-460C-AF10-3048DC205215}.Release|x86.ActiveCfg = Release|Any CPU
{A360CB0A-7EBF-460C-AF10-3048DC205215}.Release|x86.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand Down

0 comments on commit 027192e

Please sign in to comment.