Skip to content

Commit d2e6641

Browse files
stefankuengstefankueng
committed
add an ARM64 build
1 parent 404172d commit d2e6641

12 files changed

+448
-81
lines changed

‎.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -27,3 +27,4 @@
2727
/Debug/Tests.exe
2828
/buildlog.txt
2929
*.aps
30+
/Tests/ARM64

‎CryptSync.sln

+12
Original file line numberDiff line numberDiff line change
@@ -10,32 +10,44 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Tests", "Tests\Tests.vcxpro
1010
EndProject
1111
Global
1212
GlobalSection(SolutionConfigurationPlatforms) = preSolution
13+
Debug|ARM64 = Debug|ARM64
1314
Debug|Win32 = Debug|Win32
1415
Debug|x64 = Debug|x64
16+
Release|ARM64 = Release|ARM64
1517
Release|Win32 = Release|Win32
1618
Release|x64 = Release|x64
1719
EndGlobalSection
1820
GlobalSection(ProjectConfigurationPlatforms) = postSolution
21+
{ADA7AFAD-86D9-4690-AEEF-065B86B244A1}.Debug|ARM64.ActiveCfg = Debug|ARM64
22+
{ADA7AFAD-86D9-4690-AEEF-065B86B244A1}.Debug|ARM64.Build.0 = Debug|ARM64
1923
{ADA7AFAD-86D9-4690-AEEF-065B86B244A1}.Debug|Win32.ActiveCfg = Debug|Win32
2024
{ADA7AFAD-86D9-4690-AEEF-065B86B244A1}.Debug|Win32.Build.0 = Debug|Win32
2125
{ADA7AFAD-86D9-4690-AEEF-065B86B244A1}.Debug|x64.ActiveCfg = Debug|x64
2226
{ADA7AFAD-86D9-4690-AEEF-065B86B244A1}.Debug|x64.Build.0 = Debug|x64
27+
{ADA7AFAD-86D9-4690-AEEF-065B86B244A1}.Release|ARM64.ActiveCfg = Release|ARM64
28+
{ADA7AFAD-86D9-4690-AEEF-065B86B244A1}.Release|ARM64.Build.0 = Release|ARM64
2329
{ADA7AFAD-86D9-4690-AEEF-065B86B244A1}.Release|Win32.ActiveCfg = Release|Win32
2430
{ADA7AFAD-86D9-4690-AEEF-065B86B244A1}.Release|Win32.Build.0 = Release|Win32
2531
{ADA7AFAD-86D9-4690-AEEF-065B86B244A1}.Release|x64.ActiveCfg = Release|x64
2632
{ADA7AFAD-86D9-4690-AEEF-065B86B244A1}.Release|x64.Build.0 = Release|x64
33+
{1EB8B4AF-2F14-4379-8875-B75C1EC7C9F2}.Debug|ARM64.ActiveCfg = Debug|ARM64
34+
{1EB8B4AF-2F14-4379-8875-B75C1EC7C9F2}.Debug|ARM64.Build.0 = Debug|ARM64
2735
{1EB8B4AF-2F14-4379-8875-B75C1EC7C9F2}.Debug|Win32.ActiveCfg = Debug|Win32
2836
{1EB8B4AF-2F14-4379-8875-B75C1EC7C9F2}.Debug|Win32.Build.0 = Debug|Win32
2937
{1EB8B4AF-2F14-4379-8875-B75C1EC7C9F2}.Debug|x64.ActiveCfg = Debug|x64
3038
{1EB8B4AF-2F14-4379-8875-B75C1EC7C9F2}.Debug|x64.Build.0 = Debug|x64
39+
{1EB8B4AF-2F14-4379-8875-B75C1EC7C9F2}.Release|ARM64.ActiveCfg = Release|ARM64
40+
{1EB8B4AF-2F14-4379-8875-B75C1EC7C9F2}.Release|ARM64.Build.0 = Release|ARM64
3141
{1EB8B4AF-2F14-4379-8875-B75C1EC7C9F2}.Release|Win32.ActiveCfg = Release|Win32
3242
{1EB8B4AF-2F14-4379-8875-B75C1EC7C9F2}.Release|Win32.Build.0 = Release|Win32
3343
{1EB8B4AF-2F14-4379-8875-B75C1EC7C9F2}.Release|x64.ActiveCfg = Release|x64
3444
{1EB8B4AF-2F14-4379-8875-B75C1EC7C9F2}.Release|x64.Build.0 = Release|x64
45+
{8E4A5CD5-3B72-4FA1-915D-03C1E97F9752}.Debug|ARM64.ActiveCfg = Debug|Win32
3546
{8E4A5CD5-3B72-4FA1-915D-03C1E97F9752}.Debug|Win32.ActiveCfg = Debug|Win32
3647
{8E4A5CD5-3B72-4FA1-915D-03C1E97F9752}.Debug|Win32.Build.0 = Debug|Win32
3748
{8E4A5CD5-3B72-4FA1-915D-03C1E97F9752}.Debug|x64.ActiveCfg = Debug|x64
3849
{8E4A5CD5-3B72-4FA1-915D-03C1E97F9752}.Debug|x64.Build.0 = Debug|x64
50+
{8E4A5CD5-3B72-4FA1-915D-03C1E97F9752}.Release|ARM64.ActiveCfg = Release|x64
3951
{8E4A5CD5-3B72-4FA1-915D-03C1E97F9752}.Release|Win32.ActiveCfg = Release|Win32
4052
{8E4A5CD5-3B72-4FA1-915D-03C1E97F9752}.Release|Win32.Build.0 = Release|Win32
4153
{8E4A5CD5-3B72-4FA1-915D-03C1E97F9752}.Release|x64.ActiveCfg = Release|x64

‎Tests/Tests.vcxproj

+2-2
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@
9393
<ItemDefinitionGroup />
9494
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
9595
<ImportGroup Label="ExtensionTargets">
96-
<Import Project="..\packages\Microsoft.googletest.v140.windesktop.msvcstl.static.rt-static.1.8.1.5\build\native\Microsoft.googletest.v140.windesktop.msvcstl.static.rt-static.targets" Condition="Exists('..\packages\Microsoft.googletest.v140.windesktop.msvcstl.static.rt-static.1.8.1.5\build\native\Microsoft.googletest.v140.windesktop.msvcstl.static.rt-static.targets')" />
96+
<Import Project="..\packages\Microsoft.googletest.v140.windesktop.msvcstl.static.rt-static.1.8.1.7\build\native\Microsoft.googletest.v140.windesktop.msvcstl.static.rt-static.targets" Condition="Exists('..\packages\Microsoft.googletest.v140.windesktop.msvcstl.static.rt-static.1.8.1.7\build\native\Microsoft.googletest.v140.windesktop.msvcstl.static.rt-static.targets')" />
9797
</ImportGroup>
9898
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
9999
<ClCompile>
@@ -173,6 +173,6 @@
173173
<PropertyGroup>
174174
<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>
175175
</PropertyGroup>
176-
<Error Condition="!Exists('..\packages\Microsoft.googletest.v140.windesktop.msvcstl.static.rt-static.1.8.1.5\build\native\Microsoft.googletest.v140.windesktop.msvcstl.static.rt-static.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.googletest.v140.windesktop.msvcstl.static.rt-static.1.8.1.5\build\native\Microsoft.googletest.v140.windesktop.msvcstl.static.rt-static.targets'))" />
176+
<Error Condition="!Exists('..\packages\Microsoft.googletest.v140.windesktop.msvcstl.static.rt-static.1.8.1.7\build\native\Microsoft.googletest.v140.windesktop.msvcstl.static.rt-static.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.googletest.v140.windesktop.msvcstl.static.rt-static.1.8.1.7\build\native\Microsoft.googletest.v140.windesktop.msvcstl.static.rt-static.targets'))" />
177177
</Target>
178178
</Project>

‎Tests/packages.config

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="Microsoft.googletest.v140.windesktop.msvcstl.static.rt-static" version="1.8.1.5" targetFramework="native" />
3+
<package id="Microsoft.googletest.v140.windesktop.msvcstl.static.rt-static" version="1.8.1.7" targetFramework="native" />
44
</packages>

‎default.build

+24-2
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33

44
<include buildfile="default.build.user" />
55

6+
<property name="signtool" value="signtool.exe" />
67
<property name="configuration" value="release" />
78

89
<!-- the signinfo.txt file has to contain one line with parameters for signtool.exe,
@@ -44,6 +45,14 @@
4445
<arg value="/verbosity:quiet" />
4546
<arg value="/maxcpucount" />
4647
</exec>
48+
<exec program="msbuild.exe" >
49+
<arg value="CryptSync.sln" />
50+
<arg value="/t:Clean" />
51+
<arg value="/p:Configuration=${configuration}" />
52+
<arg value="/p:Platform=ARM64" />
53+
<arg value="/verbosity:quiet" />
54+
<arg value="/maxcpucount" />
55+
</exec>
4756
</target>
4857

4958
<target name="VersionInfo" depends="VSNET,env">
@@ -94,17 +103,30 @@
94103
<arg value="/verbosity:minimal" />
95104
<arg value="/maxcpucount" />
96105
</exec>
106+
<exec program="msbuild.exe" >
107+
<arg value="CryptSync.sln" />
108+
<arg value="/t:rebuild" />
109+
<arg value="/p:Configuration=${configuration}" />
110+
<arg value="/p:Platform=ARM64" />
111+
<arg value="/verbosity:minimal" />
112+
<arg value="/maxcpucount" />
113+
</exec>
97114
<if test="${file::exists('signinfo.txt')}">
98-
<exec program="signtool">
115+
<exec program="${signtool}">
99116
<arg value="sign" />
100117
<arg value="${signinfo}" />
101118
<arg value="bin\${configuration}\Win32\CryptSync.exe" />
102119
</exec>
103-
<exec program="signtool">
120+
<exec program="${signtool}">
104121
<arg value="sign" />
105122
<arg value="${signinfo}" />
106123
<arg value="bin\${configuration}\x64\CryptSync64.exe" />
107124
</exec>
125+
<exec program="${signtool}">
126+
<arg value="sign" />
127+
<arg value="${signinfo}" />
128+
<arg value="bin\${configuration}\ARM64\CryptSyncARM64.exe" />
129+
</exec>
108130
</if>
109131
</target>
110132

‎default.build.user.tmpl

+8-2
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@
1818
<!-- These two targets have to exist in doc.build.user -->
1919
<!-- ====================================================================== -->
2020

21-
<target name="VSNET" description="Checks if the env variables for VS2015 are set">
21+
<target name="VSNET" description="Checks if the env variables for VS2013 are set">
2222
<if test="${not environment::variable-exists('VCINSTALLDIR')}">
23-
<fail>You must first call "%VS140COMNTOOLS%\vsvars32.bat"</fail>
23+
<fail>You must first call "%VS120COMNTOOLS%\vsvars32.bat"</fail>
2424
</if>
2525
<!-- Uncomment the line below to allow limited building using VC Express instead of VS.NET. -->
2626
<!-- <property name="buildtool" value="vcexpress.exe" /> -->
@@ -47,12 +47,18 @@
4747
<variable name="WIX" value="%WIX%\bin" />
4848
</setenv>
4949
</if>
50+
<!--
51+
specifies the tool to use for signing the binaries.
52+
change to "scsigntool.exe" in case you're using a smart card and have scsigntool set up
53+
-->
54+
<property name="signtool" value="scsigntool.exe" />
5055

5156
<!--
5257
Update environment & we are good to go.
5358
-->
5459

5560
<setenv>
61+
<variable name="PATH" value="D:\smartcardtools\x64;%PATH%" />
5662
<variable name="PATH" value="%WIX%;%PATH%" />
5763
<variable name="WIXUI" value="%WIX%" />
5864
</setenv>

0 commit comments

Comments
 (0)