Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
-convert TFM VS2019 projects to use OpenSSL from NuGet
-fix Visual Studio (all supported versions) compilation error with
 TFM's access to ares header
  • Loading branch information
sgodin committed Jan 24, 2023
1 parent ff909b5 commit 760b914
Show file tree
Hide file tree
Showing 13 changed files with 128 additions and 88 deletions.
1 change: 1 addition & 0 deletions tfm/packages.config
@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="boost" version="1.80.0" targetFramework="native" />
<package id="zeroc.openssl.v142" version="1.1.1.2" targetFramework="native" />
<package id="zeroc.openssl.v143" version="1.1.1.2" targetFramework="native" />
</packages>
1 change: 1 addition & 0 deletions tfm/repro/packages.config
@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="boost" version="1.80.0" targetFramework="native" />
<package id="zeroc.openssl.v142" version="1.1.1.2" targetFramework="native" />
<package id="zeroc.openssl.v143" version="1.1.1.2" targetFramework="native" />
</packages>
48 changes: 30 additions & 18 deletions tfm/repro/tfrepro_16_0.vcxproj
Expand Up @@ -196,7 +196,7 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
<Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>..\..\contrib\pcre;..\..\contrib\popt\win32\include;..\..\contrib\cppunit\include;..\..\contrib\Netxx-0.3.2\include\;..\..\contrib\boost;..\..\;..\..\contrib\db\build_windows;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>..\..\contrib\pcre;..\..\contrib\popt\win32\include;..\..\contrib\cppunit\include;..\..\contrib\Netxx-0.3.2\include\;..\..\;..\..\contrib\db\build_windows;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;USE_IPV6;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
Expand All @@ -206,7 +206,7 @@
<MultiProcessorCompilation>true</MultiProcessorCompilation>
</ClCompile>
<Link>
<AdditionalDependencies>Ws2_32.lib;Iphlpapi.lib;Dnsapi.lib;crypt32.lib;winmm.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalDependencies>Ws2_32.lib;Iphlpapi.lib;Dnsapi.lib;crypt32.lib;winmm.lib;Advapi32.lib</AdditionalDependencies>
<OutputFile>$(OutDir)tfrepro.exe</OutputFile>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Console</SubSystem>
Expand All @@ -218,7 +218,7 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<ClCompile>
<Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>..\..\contrib\pcre;..\..\contrib\popt\win32\include;..\..\contrib\cppunit\include;..\..\contrib\Netxx-0.3.2\include\;..\..\contrib\boost;..\..\;..\..\contrib\db\build_windows;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>..\..\contrib\pcre;..\..\contrib\popt\win32\include;..\..\contrib\cppunit\include;..\..\contrib\Netxx-0.3.2\include\;..\..\;..\..\contrib\db\build_windows;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;USE_IPV6;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
Expand All @@ -228,7 +228,7 @@
<MultiProcessorCompilation>true</MultiProcessorCompilation>
</ClCompile>
<Link>
<AdditionalDependencies>Ws2_32.lib;Iphlpapi.lib;Dnsapi.lib;crypt32.lib;winmm.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalDependencies>Ws2_32.lib;Iphlpapi.lib;Dnsapi.lib;crypt32.lib;winmm.lib;Advapi32.lib</AdditionalDependencies>
<OutputFile>$(OutDir)tfrepro.exe</OutputFile>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Console</SubSystem>
Expand All @@ -239,7 +239,7 @@
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ClCompile>
<AdditionalIncludeDirectories>..\..\contrib\pcre;..\..\contrib\popt\win32\include;..\..\contrib\cppunit\include;..\..\contrib\Netxx-0.3.2\include\;..\..\contrib\boost;..\..\;..\..\contrib\db\build_windows;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>..\..\contrib\pcre;..\..\contrib\popt\win32\include;..\..\contrib\cppunit\include;..\..\contrib\Netxx-0.3.2\include\;..\..\;..\..\contrib\db\build_windows;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;USE_IPV6;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
<RuntimeTypeInfo>true</RuntimeTypeInfo>
Expand All @@ -248,7 +248,7 @@
<MultiProcessorCompilation>true</MultiProcessorCompilation>
</ClCompile>
<Link>
<AdditionalDependencies>Ws2_32.lib;Iphlpapi.lib;Dnsapi.lib;crypt32.lib;winmm.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalDependencies>Ws2_32.lib;Iphlpapi.lib;Dnsapi.lib;crypt32.lib;winmm.lib;Advapi32.lib</AdditionalDependencies>
<OutputFile>$(OutDir)tfrepro.exe</OutputFile>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Console</SubSystem>
Expand All @@ -261,7 +261,7 @@
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<ClCompile>
<AdditionalIncludeDirectories>..\..\contrib\pcre;..\..\contrib\popt\win32\include;..\..\contrib\cppunit\include;..\..\contrib\Netxx-0.3.2\include\;..\..\contrib\boost;..\..\;..\..\contrib\db\build_windows;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>..\..\contrib\pcre;..\..\contrib\popt\win32\include;..\..\contrib\cppunit\include;..\..\contrib\Netxx-0.3.2\include\;..\..\;..\..\contrib\db\build_windows;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;USE_IPV6;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
<RuntimeTypeInfo>true</RuntimeTypeInfo>
Expand All @@ -270,7 +270,7 @@
<MultiProcessorCompilation>true</MultiProcessorCompilation>
</ClCompile>
<Link>
<AdditionalDependencies>Ws2_32.lib;Iphlpapi.lib;Dnsapi.lib;crypt32.lib;winmm.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalDependencies>Ws2_32.lib;Iphlpapi.lib;Dnsapi.lib;crypt32.lib;winmm.lib;Advapi32.lib</AdditionalDependencies>
<OutputFile>$(OutDir)tfrepro.exe</OutputFile>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Console</SubSystem>
Expand All @@ -284,7 +284,7 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='SSL-Debug|Win32'">
<ClCompile>
<Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>..\..\contrib\pcre;..\..\contrib\popt\win32\include;..\..\contrib\cppunit\include;..\..\contrib\Netxx-0.3.2\include\;..\..\contrib\boost;..\..\;..\..\contrib\db\build_windows;..\..\contrib\OpenSSL\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>..\..\contrib\pcre;..\..\contrib\popt\win32\include;..\..\contrib\cppunit\include;..\..\contrib\Netxx-0.3.2\include\;..\..\;..\..\contrib\db\build_windows;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;USE_IPV6;USE_SSL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
Expand All @@ -294,7 +294,7 @@
<MultiProcessorCompilation>true</MultiProcessorCompilation>
</ClCompile>
<Link>
<AdditionalDependencies>legacy_stdio_definitions.lib;Ws2_32.lib;Iphlpapi.lib;Dnsapi.lib;crypt32.lib;winmm.lib;$(ProjectDir)..\..\contrib\openssl\lib\vc\static\libcrypto32MD.lib;$(ProjectDir)..\..\contrib\openssl\lib\vc\static\libssl32MD.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalDependencies>Ws2_32.lib;Iphlpapi.lib;Dnsapi.lib;crypt32.lib;winmm.lib;Advapi32.lib</AdditionalDependencies>
<OutputFile>$(OutDir)tfrepro.exe</OutputFile>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Console</SubSystem>
Expand All @@ -303,13 +303,14 @@
</DataExecutionPrevention>
</Link>
<PostBuildEvent>
<Command>copy ..\..\contrib\popt\win32\*.dll .\</Command>
<Command>
</Command>
</PostBuildEvent>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='SSL-Debug|x64'">
<ClCompile>
<Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>..\..\contrib\pcre;..\..\contrib\popt\win32\include;..\..\contrib\cppunit\include;..\..\contrib\Netxx-0.3.2\include\;..\..\contrib\boost;..\..\;..\..\contrib\db\build_windows;..\..\contrib\OpenSSLx64\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>..\..\contrib\pcre;..\..\contrib\popt\win32\include;..\..\contrib\cppunit\include;..\..\contrib\Netxx-0.3.2\include\;..\..\;..\..\contrib\db\build_windows;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;USE_IPV6;USE_SSL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
Expand All @@ -319,7 +320,7 @@
<MultiProcessorCompilation>true</MultiProcessorCompilation>
</ClCompile>
<Link>
<AdditionalDependencies>legacy_stdio_definitions.lib;Ws2_32.lib;Iphlpapi.lib;Dnsapi.lib;crypt32.lib;winmm.lib;$(ProjectDir)..\..\contrib\opensslx64\lib\vc\static\libcrypto64MD.lib;$(ProjectDir)..\..\contrib\opensslx64\lib\vc\static\libssl64MD.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalDependencies>Ws2_32.lib;Iphlpapi.lib;Dnsapi.lib;crypt32.lib;winmm.lib;Advapi32.lib</AdditionalDependencies>
<OutputFile>$(OutDir)tfrepro.exe</OutputFile>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Console</SubSystem>
Expand All @@ -328,12 +329,13 @@
</DataExecutionPrevention>
</Link>
<PostBuildEvent>
<Command>copy ..\..\contrib\popt\win32\*.dll .\</Command>
<Command>
</Command>
</PostBuildEvent>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='SSL-Release|Win32'">
<ClCompile>
<AdditionalIncludeDirectories>..\..\contrib\pcre;..\..\contrib\popt\win32\include;..\..\contrib\cppunit\include;..\..\contrib\Netxx-0.3.2\include\;..\..\contrib\boost;..\..\;..\..\contrib\db\build_windows;..\..\contrib\OpenSSL\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>..\..\contrib\pcre;..\..\contrib\popt\win32\include;..\..\contrib\cppunit\include;..\..\contrib\Netxx-0.3.2\include\;..\..\;..\..\contrib\db\build_windows;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;USE_IPV6;USE_SSL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
<RuntimeTypeInfo>true</RuntimeTypeInfo>
Expand All @@ -342,7 +344,7 @@
<MultiProcessorCompilation>true</MultiProcessorCompilation>
</ClCompile>
<Link>
<AdditionalDependencies>legacy_stdio_definitions.lib;Ws2_32.lib;Iphlpapi.lib;Dnsapi.lib;winmm.lib;crypt32.lib;$(ProjectDir)..\..\contrib\openssl\lib\vc\static\libcrypto32MD.lib;$(ProjectDir)..\..\contrib\openssl\lib\vc\static\libssl32MD.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalDependencies>Ws2_32.lib;Iphlpapi.lib;Dnsapi.lib;crypt32.lib;winmm.lib;Advapi32.lib</AdditionalDependencies>
<OutputFile>$(OutDir)tfrepro.exe</OutputFile>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Console</SubSystem>
Expand All @@ -355,7 +357,7 @@
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='SSL-Release|x64'">
<ClCompile>
<AdditionalIncludeDirectories>..\..\contrib\pcre;..\..\contrib\popt\win32\include;..\..\contrib\cppunit\include;..\..\contrib\Netxx-0.3.2\include\;..\..\contrib\boost;..\..\;..\..\contrib\db\build_windows;..\..\contrib\OpenSSLx64\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>..\..\contrib\pcre;..\..\contrib\popt\win32\include;..\..\contrib\cppunit\include;..\..\contrib\Netxx-0.3.2\include\;..\..\;..\..\contrib\db\build_windows;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;USE_IPV6;USE_SSL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
<RuntimeTypeInfo>true</RuntimeTypeInfo>
Expand All @@ -364,7 +366,7 @@
<MultiProcessorCompilation>true</MultiProcessorCompilation>
</ClCompile>
<Link>
<AdditionalDependencies>legacy_stdio_definitions.lib;Ws2_32.lib;Iphlpapi.lib;Dnsapi.lib;crypt32.lib;winmm.lib;$(ProjectDir)..\..\contrib\opensslx64\lib\vc\static\libcrypto64MD.lib;$(ProjectDir)..\..\contrib\opensslx64\lib\vc\static\libssl64MD.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalDependencies>Ws2_32.lib;Iphlpapi.lib;Dnsapi.lib;crypt32.lib;winmm.lib;Advapi32.lib</AdditionalDependencies>
<OutputFile>$(OutDir)tfrepro.exe</OutputFile>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Console</SubSystem>
Expand Down Expand Up @@ -448,7 +450,17 @@
</PrecompiledHeader>
</ClCompile>
</ItemGroup>
<ItemGroup>
<None Include="packages.config" />
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
<Import Project="..\packages\zeroc.openssl.v142.1.1.1.2\build\native\zeroc.openssl.v142.targets" Condition="Exists('..\packages\zeroc.openssl.v142.1.1.1.2\build\native\zeroc.openssl.v142.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('..\packages\zeroc.openssl.v142.1.1.1.2\build\native\zeroc.openssl.v142.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\zeroc.openssl.v142.1.1.1.2\build\native\zeroc.openssl.v142.targets'))" />
</Target>
</Project>

0 comments on commit 760b914

Please sign in to comment.