rename macOS build dir to follow pEp standard; add 64bit Windows build

1 month ago · 1a34834f6a
parent c3e18bb6c5
commit 1a34834f6a
12 changed files with 279 additions and 0 deletions
--- a/.gitignore
+++ b/.gitignore
@ -97,3 +97,9 @@ playground.xcworkspace

 ### Xcode Patch ###
 **/xcshareddata/WorkspaceSettings.xcsettings
+
+# Visual Studio
+
+*.filters
+*.user
+
--- a/build-macOS/pEpMIME/README.md
+++ b/build-macOS/pEpMIME/README.md
--- a/build-macOS/pEpMIME/pEpMIME.xcodeproj/project.pbxproj
+++ b/build-macOS/pEpMIME/pEpMIME.xcodeproj/project.pbxproj
--- a/build-macOS/pEpMIME/pEpMIME.xcodeproj/project.xcworkspace/contents.xcworkspacedata
+++ b/build-macOS/pEpMIME/pEpMIME.xcodeproj/project.xcworkspace/contents.xcworkspacedata
--- a/build-macOS/pEpMIME/pEpMIME.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
+++ b/build-macOS/pEpMIME/pEpMIME.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
--- a/build-macOS/pEpMIME/pEpMIME.xcodeproj/xcshareddata/xcschemes/libpEpMIME.xcscheme
+++ b/build-macOS/pEpMIME/pEpMIME.xcodeproj/xcshareddata/xcschemes/libpEpMIME.xcscheme
--- a/build-win64/dllmain.cpp
+++ b/build-win64/dllmain.cpp
@ -0,0 +1,19 @@
+// dllmain.cpp : Definiert den Einstiegspunkt für die DLL-Anwendung.
+#include "pch.h"
+
+BOOL APIENTRY DllMain( HMODULE hModule,
+                       DWORD  ul_reason_for_call,
+                       LPVOID lpReserved
+                     )
+{
+    switch (ul_reason_for_call)
+    {
+    case DLL_PROCESS_ATTACH:
+    case DLL_THREAD_ATTACH:
+    case DLL_THREAD_DETACH:
+    case DLL_PROCESS_DETACH:
+        break;
+    }
+    return TRUE;
+}
+
--- a/build-win64/framework.h
+++ b/build-win64/framework.h
@ -0,0 +1,5 @@
+#pragma once
+
+#define WIN32_LEAN_AND_MEAN             // Selten verwendete Komponenten aus Windows-Headern ausschließen
+// Windows-Headerdateien
+#include <windows.h>
--- a/build-win64/pEpMIME.vcxproj
+++ b/build-win64/pEpMIME.vcxproj
@ -0,0 +1,224 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <VCProjectVersion>16.0</VCProjectVersion>
+    <Keyword>Win32Proj</Keyword>
+    <ProjectGuid>{27a589c5-5045-4393-959a-d8fbbafab24c}</ProjectGuid>
+    <RootNamespace>pEpMIME</RootNamespace>
+    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>v143</PlatformToolset>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>v143</PlatformToolset>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>v143</PlatformToolset>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>v143</PlatformToolset>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Label="Shared">
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <SDLCheck>true</SDLCheck>
+      <PreprocessorDefinitions>WIN32;_DEBUG;PEPMIME_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <ConformanceMode>true</ConformanceMode>
+      <PrecompiledHeader>Use</PrecompiledHeader>
+      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
+    </ClCompile>
+    <Link>
+      <SubSystem>Windows</SubSystem>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <EnableUAC>false</EnableUAC>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <SDLCheck>true</SDLCheck>
+      <PreprocessorDefinitions>WIN32;NDEBUG;PEPMIME_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <ConformanceMode>true</ConformanceMode>
+      <PrecompiledHeader>Use</PrecompiledHeader>
+      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
+    </ClCompile>
+    <Link>
+      <SubSystem>Windows</SubSystem>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <EnableUAC>false</EnableUAC>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <SDLCheck>true</SDLCheck>
+      <PreprocessorDefinitions>_DEBUG;PEPMIME_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <ConformanceMode>true</ConformanceMode>
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>
+      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\..\pEpEngine\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ClCompile>
+    <Link>
+      <SubSystem>Windows</SubSystem>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <EnableUAC>false</EnableUAC>
+    </Link>
+    <PreBuildEvent>
+      <Command>cd $(ProjectDir)..\..\pEpEngine\src &amp;&amp; nmake /f NMakefile install_headers</Command>
+    </PreBuildEvent>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <SDLCheck>true</SDLCheck>
+      <PreprocessorDefinitions>NDEBUG;PEPMIME_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <ConformanceMode>true</ConformanceMode>
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>
+      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\..\pEpEngine\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ClCompile>
+    <Link>
+      <SubSystem>Windows</SubSystem>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <EnableUAC>false</EnableUAC>
+    </Link>
+    <PreBuildEvent>
+      <Command>cd $(ProjectDir)..\..\pEpEngine\src &amp;&amp; nmake /f NMakefile install_headers</Command>
+    </PreBuildEvent>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClInclude Include="..\src\attachment.hh" />
+    <ClInclude Include="..\src\base64.hh" />
+    <ClInclude Include="..\src\base64.hxx" />
+    <ClInclude Include="..\src\bodygenerator.hh" />
+    <ClInclude Include="..\src\bodyparser.hh" />
+    <ClInclude Include="..\src\headerparser.hh" />
+    <ClInclude Include="..\src\header_generator.hh" />
+    <ClInclude Include="..\src\message.hh" />
+    <ClInclude Include="..\src\mime_headers.hh" />
+    <ClInclude Include="..\src\nfc.hh" />
+    <ClInclude Include="..\src\nfc_sets.hh" />
+    <ClInclude Include="..\src\nulllogger.hh" />
+    <ClInclude Include="..\src\parse_address.hh" />
+    <ClInclude Include="..\src\parse_timestamp.hh" />
+    <ClInclude Include="..\src\pEpMIME.hh" />
+    <ClInclude Include="..\src\pEpMIME_internal.hh" />
+    <ClInclude Include="..\src\print_message.hh" />
+    <ClInclude Include="..\src\quoted_printable.hh" />
+    <ClInclude Include="..\src\quoted_printable.hxx" />
+    <ClInclude Include="..\src\rules.hh" />
+    <ClInclude Include="..\src\string_case.hh" />
+    <ClInclude Include="..\src\to_utf8.hh" />
+    <ClInclude Include="framework.h" />
+    <ClInclude Include="pch.h" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="..\src\attachment.cc" />
+    <ClCompile Include="..\src\base64.cc" />
+    <ClCompile Include="..\src\bodygenerator.cc" />
+    <ClCompile Include="..\src\bodyparser.cc" />
+    <ClCompile Include="..\src\fuzz.cc" />
+    <ClCompile Include="..\src\headerparser.cc" />
+    <ClCompile Include="..\src\header_generator.cc" />
+    <ClCompile Include="..\src\message.cc" />
+    <ClCompile Include="..\src\mime_headers.cc" />
+    <ClCompile Include="..\src\nfc.cc" />
+    <ClCompile Include="..\src\nfc_sets.cc" />
+    <ClCompile Include="..\src\nulllogger.cc" />
+    <ClCompile Include="..\src\parse_address.cc" />
+    <ClCompile Include="..\src\parse_timestamp.cc" />
+    <ClCompile Include="..\src\pEpEngine_mime.cc" />
+    <ClCompile Include="..\src\pEpMIME.cc" />
+    <ClCompile Include="..\src\pEpMIME_internal.cc" />
+    <ClCompile Include="..\src\print_message.cc" />
+    <ClCompile Include="..\src\quoted_printable.cc" />
+    <ClCompile Include="..\src\rules.cc" />
+    <ClCompile Include="..\src\to_utf8.cc" />
+    <ClCompile Include="dllmain.cpp" />
+    <ClCompile Include="pch.cpp">
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Create</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Create</PrecompiledHeader>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="packages.config" />
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+    <Import Project="..\..\WindowsDesktopAdapterSolution\WindowsDesktopAdapter\packages\boost.1.81.0\build\boost.targets" Condition="Exists('..\..\WindowsDesktopAdapterSolution\WindowsDesktopAdapter\packages\boost.1.81.0\build\boost.targets')" />
+    <Import Project="..\..\WindowsDesktopAdapterSolution\WindowsDesktopAdapter\packages\libiconv.redist.1.14.0.11\build\native\libiconv.redist.targets" Condition="Exists('..\..\WindowsDesktopAdapterSolution\WindowsDesktopAdapter\packages\libiconv.redist.1.14.0.11\build\native\libiconv.redist.targets')" />
+    <Import Project="..\..\WindowsDesktopAdapterSolution\WindowsDesktopAdapter\packages\libiconv.1.14.0.11\build\native\libiconv.targets" Condition="Exists('..\..\WindowsDesktopAdapterSolution\WindowsDesktopAdapter\packages\libiconv.1.14.0.11\build\native\libiconv.targets')" />
+    <Import Project="..\..\WindowsDesktopAdapterSolution\WindowsDesktopAdapter\packages\boost_iostreams-vc143.1.81.0\build\boost_iostreams-vc143.targets" Condition="Exists('..\..\WindowsDesktopAdapterSolution\WindowsDesktopAdapter\packages\boost_iostreams-vc143.1.81.0\build\boost_iostreams-vc143.targets')" />
+  </ImportGroup>
+  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
+    <PropertyGroup>
+      <ErrorText>Dieses Projekt verweist auf mindestens ein NuGet-Paket, das auf diesem Computer fehlt. Verwenden Sie die Wiederherstellung von NuGet-Paketen, um die fehlenden Dateien herunterzuladen. Weitere Informationen finden Sie unter "http://go.microsoft.com/fwlink/?LinkID=322105". Die fehlende Datei ist "{0}".</ErrorText>
+    </PropertyGroup>
+    <Error Condition="!Exists('..\..\WindowsDesktopAdapterSolution\WindowsDesktopAdapter\packages\boost.1.81.0\build\boost.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\WindowsDesktopAdapterSolution\WindowsDesktopAdapter\packages\boost.1.81.0\build\boost.targets'))" />
+    <Error Condition="!Exists('..\..\WindowsDesktopAdapterSolution\WindowsDesktopAdapter\packages\libiconv.redist.1.14.0.11\build\native\libiconv.redist.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\WindowsDesktopAdapterSolution\WindowsDesktopAdapter\packages\libiconv.redist.1.14.0.11\build\native\libiconv.redist.targets'))" />
+    <Error Condition="!Exists('..\..\WindowsDesktopAdapterSolution\WindowsDesktopAdapter\packages\libiconv.1.14.0.11\build\native\libiconv.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\WindowsDesktopAdapterSolution\WindowsDesktopAdapter\packages\libiconv.1.14.0.11\build\native\libiconv.targets'))" />
+    <Error Condition="!Exists('..\..\WindowsDesktopAdapterSolution\WindowsDesktopAdapter\packages\boost_iostreams-vc143.1.81.0\build\boost_iostreams-vc143.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\WindowsDesktopAdapterSolution\WindowsDesktopAdapter\packages\boost_iostreams-vc143.1.81.0\build\boost_iostreams-vc143.targets'))" />
+  </Target>
+</Project>
--- a/build-win64/packages.config
+++ b/build-win64/packages.config
@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="boost" version="1.81.0" targetFramework="native" />
+  <package id="boost_iostreams-vc143" version="1.81.0" targetFramework="native" />
+  <package id="libiconv" version="1.14.0.11" targetFramework="native" />
+  <package id="libiconv.redist" version="1.14.0.11" targetFramework="native" />
+</packages>
--- a/build-win64/pch.cpp
+++ b/build-win64/pch.cpp
@ -0,0 +1,5 @@
+// pch.cpp: Quelldatei, die dem vorkompilierten Header entspricht
+
+#include "pch.h"
+
+// Bei der Verwendung vorkompilierter Header ist diese Quelldatei für eine erfolgreiche Kompilierung erforderlich.
--- a/build-win64/pch.h
+++ b/build-win64/pch.h
@ -0,0 +1,13 @@
+// pch.h: Dies ist eine vorkompilierte Headerdatei.
+// Die unten aufgeführten Dateien werden nur einmal kompiliert, um die Buildleistung für zukünftige Builds zu verbessern.
+// Dies wirkt sich auch auf die IntelliSense-Leistung aus, Codevervollständigung und viele Features zum Durchsuchen von Code eingeschlossen.
+// Die hier aufgeführten Dateien werden jedoch ALLE neu kompiliert, wenn mindestens eine davon zwischen den Builds aktualisiert wird.
+// Fügen Sie hier keine Dateien hinzu, die häufig aktualisiert werden sollen, da sich so der Leistungsvorteil ins Gegenteil verkehrt.
+
+#ifndef PCH_H
+#define PCH_H
+
+// Fügen Sie hier Header hinzu, die vorkompiliert werden sollen.
+#include "framework.h"
+
+#endif //PCH_H