Merge pull request 'Update Windows build files with latest changes from Release_2.1 branch' (#15) from Thomas/pEpEngine:master into master

Reviewed-on: #15
pull/17/head
darthmama 2 years ago
commit 98a005ac96
  1. 5
      build-windows/generate_code.cmd
  2. 7
      build-windows/libpEpasn1/libpEpasn1.vcxproj
  3. 13
      build-windows/pEpEngine.vcxproj
  4. 10
      build-windows/pEpEngine.vcxproj.filters

@ -20,6 +20,7 @@ MOVE system.db "%ProgramData%\pEp\system.db"
CD ..\sync
:: Make sure YML2 is installed
PY -m pip install --upgrade pip
PY -m pip install wheel
PY -m pip install yml2
@ -72,10 +73,10 @@ IF %ERRORLEVEL% NEQ 0 GOTO end
DEL *-sample.c
CD %engine_directory%\..
RD /S/Q pEp
MKDIR pEp
XCOPY pEpEngine\src\*.h pEp\ /Y/F/I
XCOPY libpEpAdapter\*.hh pEp\ /Y/F/I
XCOPY libpEpAdapter\*.hxx pEp\ /Y/F/I
:end

@ -61,7 +61,7 @@
<SubSystem>Windows</SubSystem>
</Link>
<PreBuildEvent>
<Command>IF EXIST ".\Debug\libpEpasn1.tlog\unsuccessfulbuild" CALL ..\generate_code.cmd</Command>
<Command>IF NOT EXIST "..\..\..\pEp" CALL ..\generate_code.cmd</Command>
</PreBuildEvent>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@ -81,7 +81,7 @@
<OptimizeReferences>true</OptimizeReferences>
</Link>
<PreBuildEvent>
<Command>IF EXIST ".\Release\libpEpasn1.tlog\unsuccessfulbuild" CALL ..\generate_code.cmd</Command>
<Command>IF NOT EXIST "..\..\..\pEp" CALL ..\generate_code.cmd</Command>
</PreBuildEvent>
</ItemDefinitionGroup>
<ItemGroup>
@ -98,4 +98,7 @@
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets" />
<Target Name="CustomClean" BeforeTargets="Clean">
<RemoveDir Directories="..\..\..\pEp" />
</Target>
</Project>

@ -86,10 +86,11 @@
<SuppressStartupBanner>false</SuppressStartupBanner>
</Link>
<PreBuildEvent>
<Command>cargo build --manifest-path="$(SolutionDir)sequoia\Cargo.toml" -p sequoia-openpgp-ffi</Command>
<Command>cargo build --manifest-path="$(SolutionDir)sequoia\Cargo.toml"</Command>
</PreBuildEvent>
<PostBuildEvent>
<Command>xcopy "$(SolutionDir)sequoia\target\debug\sequoia_openpgp_ffi.dll" "$(TargetDir)" /Y</Command>
<Command>xcopy "$(SolutionDir)sequoia\target\debug\sq.exe" "$(TargetDir)" /Y</Command>
</PostBuildEvent>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@ -118,13 +119,15 @@
<AdditionalLibraryDirectories>$(SolutionDir)sequoia\target\release;C:\msys64\mingw32\lib</AdditionalLibraryDirectories>
</Link>
<PreBuildEvent>
<Command>cargo build --manifest-path="$(SolutionDir)sequoia\Cargo.toml" --release -p sequoia-openpgp-ffi</Command>
<Command>cargo build --manifest-path="$(SolutionDir)sequoia\Cargo.toml" --release</Command>
</PreBuildEvent>
<PostBuildEvent>
<Command>xcopy "$(SolutionDir)sequoia\target\release\sequoia_openpgp_ffi.dll" "$(TargetDir)" /Y</Command>
<Command>xcopy "$(SolutionDir)sequoia\target\release\sq.exe" "$(TargetDir)" /Y</Command>
</PostBuildEvent>
</ItemDefinitionGroup>
<ItemGroup>
<ClCompile Include="..\src\aux_mime_msg.c" />
<ClCompile Include="..\src\base64.c" />
<ClCompile Include="..\src\baseprotocol.c" />
<ClCompile Include="..\src\blacklist.c" />
@ -151,6 +154,7 @@
<ClCompile Include="..\src\pgp_sequoia.c" />
<ClCompile Include="..\src\platform_windows.cpp" />
<ClCompile Include="..\src\resource_id.c" />
<ClCompile Include="..\src\security_checks.c" />
<ClCompile Include="..\src\sqlite3.c" />
<ClCompile Include="..\src\stringlist.c" />
<ClCompile Include="..\src\stringpair.c" />
@ -166,11 +170,13 @@
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\src\asn1_helper.h" />
<ClInclude Include="..\src\aux_mime_msg.h" />
<ClInclude Include="..\src\base64.h" />
<ClInclude Include="..\src\baseprotocol.h" />
<ClInclude Include="..\src\blacklist.h" />
<ClInclude Include="..\src\bloblist.h" />
<ClInclude Include="..\src\cryptotech.h" />
<ClInclude Include="..\src\distribution_codec.h" />
<ClInclude Include="..\src\dynamic_api.h" />
<ClInclude Include="..\src\email.h" />
<ClInclude Include="..\src\etpan_mime.h" />
@ -179,6 +185,7 @@
<ClInclude Include="..\src\identity_list.h" />
<ClInclude Include="..\src\internal_format.h" />
<ClInclude Include="..\src\keymanagement.h" />
<ClInclude Include="..\src\keyreset_command.h" />
<ClInclude Include="..\src\KeySync_fsm.h" />
<ClInclude Include="..\src\key_reset.h" />
<ClInclude Include="..\src\labeled_int_list.h" />
@ -196,7 +203,9 @@
<ClInclude Include="..\src\platform_windows.h" />
<ClInclude Include="..\src\resource.h" />
<ClInclude Include="..\src\resource_id.h" />
<ClInclude Include="..\src\security_checks.h" />
<ClInclude Include="..\src\sqlite3.h" />
<ClInclude Include="..\src\status_to_string.h" />
<ClInclude Include="..\src\stringlist.h" />
<ClInclude Include="..\src\stringpair.h" />
<ClInclude Include="..\src\sync_api.h" />

@ -129,6 +129,12 @@
<ClCompile Include="..\src\internal_format.c">
<Filter>Quelldateien</Filter>
</ClCompile>
<ClCompile Include="..\src\aux_mime_msg.c">
<Filter>Quelldateien</Filter>
</ClCompile>
<ClCompile Include="..\src\security_checks.c">
<Filter>Quelldateien</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\src\keymanagement.h">
@ -292,8 +298,6 @@
<Text Include="..\LICENSE.txt" />
</ItemGroup>
<ItemGroup>
<None Include="generate_code.cmd">
<Filter>Quelldateien</Filter>
</None>
<None Include="generate_code.cmd" />
</ItemGroup>
</Project>
Loading…
Cancel
Save