add an ARM64 build

stefankueng · Dec 7, 2024 · d2e6641 · d2e6641
1 parent 404172d
commit d2e6641
Show file tree

Hide file tree

Showing 12 changed files with 448 additions and 81 deletions.
diff --git a/.gitignore b/.gitignore
@@ -27,3 +27,4 @@
 /Debug/Tests.exe
 /buildlog.txt
 *.aps
+/Tests/ARM64
diff --git a/CryptSync.sln b/CryptSync.sln
@@ -10,32 +10,44 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Tests", "Tests\Tests.vcxpro
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|ARM64 = Debug|ARM64
 		Debug|Win32 = Debug|Win32
 		Debug|x64 = Debug|x64
+		Release|ARM64 = Release|ARM64
 		Release|Win32 = Release|Win32
 		Release|x64 = Release|x64
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{ADA7AFAD-86D9-4690-AEEF-065B86B244A1}.Debug|ARM64.ActiveCfg = Debug|ARM64
+		{ADA7AFAD-86D9-4690-AEEF-065B86B244A1}.Debug|ARM64.Build.0 = Debug|ARM64
 		{ADA7AFAD-86D9-4690-AEEF-065B86B244A1}.Debug|Win32.ActiveCfg = Debug|Win32
 		{ADA7AFAD-86D9-4690-AEEF-065B86B244A1}.Debug|Win32.Build.0 = Debug|Win32
 		{ADA7AFAD-86D9-4690-AEEF-065B86B244A1}.Debug|x64.ActiveCfg = Debug|x64
 		{ADA7AFAD-86D9-4690-AEEF-065B86B244A1}.Debug|x64.Build.0 = Debug|x64
+		{ADA7AFAD-86D9-4690-AEEF-065B86B244A1}.Release|ARM64.ActiveCfg = Release|ARM64
+		{ADA7AFAD-86D9-4690-AEEF-065B86B244A1}.Release|ARM64.Build.0 = Release|ARM64
 		{ADA7AFAD-86D9-4690-AEEF-065B86B244A1}.Release|Win32.ActiveCfg = Release|Win32
 		{ADA7AFAD-86D9-4690-AEEF-065B86B244A1}.Release|Win32.Build.0 = Release|Win32
 		{ADA7AFAD-86D9-4690-AEEF-065B86B244A1}.Release|x64.ActiveCfg = Release|x64
 		{ADA7AFAD-86D9-4690-AEEF-065B86B244A1}.Release|x64.Build.0 = Release|x64
+		{1EB8B4AF-2F14-4379-8875-B75C1EC7C9F2}.Debug|ARM64.ActiveCfg = Debug|ARM64
+		{1EB8B4AF-2F14-4379-8875-B75C1EC7C9F2}.Debug|ARM64.Build.0 = Debug|ARM64
 		{1EB8B4AF-2F14-4379-8875-B75C1EC7C9F2}.Debug|Win32.ActiveCfg = Debug|Win32
 		{1EB8B4AF-2F14-4379-8875-B75C1EC7C9F2}.Debug|Win32.Build.0 = Debug|Win32
 		{1EB8B4AF-2F14-4379-8875-B75C1EC7C9F2}.Debug|x64.ActiveCfg = Debug|x64
 		{1EB8B4AF-2F14-4379-8875-B75C1EC7C9F2}.Debug|x64.Build.0 = Debug|x64
+		{1EB8B4AF-2F14-4379-8875-B75C1EC7C9F2}.Release|ARM64.ActiveCfg = Release|ARM64
+		{1EB8B4AF-2F14-4379-8875-B75C1EC7C9F2}.Release|ARM64.Build.0 = Release|ARM64
 		{1EB8B4AF-2F14-4379-8875-B75C1EC7C9F2}.Release|Win32.ActiveCfg = Release|Win32
 		{1EB8B4AF-2F14-4379-8875-B75C1EC7C9F2}.Release|Win32.Build.0 = Release|Win32
 		{1EB8B4AF-2F14-4379-8875-B75C1EC7C9F2}.Release|x64.ActiveCfg = Release|x64
 		{1EB8B4AF-2F14-4379-8875-B75C1EC7C9F2}.Release|x64.Build.0 = Release|x64
+		{8E4A5CD5-3B72-4FA1-915D-03C1E97F9752}.Debug|ARM64.ActiveCfg = Debug|Win32
 		{8E4A5CD5-3B72-4FA1-915D-03C1E97F9752}.Debug|Win32.ActiveCfg = Debug|Win32
 		{8E4A5CD5-3B72-4FA1-915D-03C1E97F9752}.Debug|Win32.Build.0 = Debug|Win32
 		{8E4A5CD5-3B72-4FA1-915D-03C1E97F9752}.Debug|x64.ActiveCfg = Debug|x64
 		{8E4A5CD5-3B72-4FA1-915D-03C1E97F9752}.Debug|x64.Build.0 = Debug|x64
+		{8E4A5CD5-3B72-4FA1-915D-03C1E97F9752}.Release|ARM64.ActiveCfg = Release|x64
 		{8E4A5CD5-3B72-4FA1-915D-03C1E97F9752}.Release|Win32.ActiveCfg = Release|Win32
 		{8E4A5CD5-3B72-4FA1-915D-03C1E97F9752}.Release|Win32.Build.0 = Release|Win32
 		{8E4A5CD5-3B72-4FA1-915D-03C1E97F9752}.Release|x64.ActiveCfg = Release|x64

diff --git a/Tests/Tests.vcxproj b/Tests/Tests.vcxproj
@@ -93,7 +93,7 @@
   <ItemDefinitionGroup />
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
-    <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')" />
+    <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')" />
   </ImportGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
@@ -173,6 +173,6 @@
     <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\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'))" />
+    <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'))" />
   </Target>
 </Project>
diff --git a/Tests/packages.config b/Tests/packages.config
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Microsoft.googletest.v140.windesktop.msvcstl.static.rt-static" version="1.8.1.5" targetFramework="native" />
+  <package id="Microsoft.googletest.v140.windesktop.msvcstl.static.rt-static" version="1.8.1.7" targetFramework="native" />
 </packages>
diff --git a/default.build b/default.build
@@ -3,6 +3,7 @@
 
   <include buildfile="default.build.user" />
 
+  <property name="signtool" value="signtool.exe" />
   <property name="configuration" value="release" />
 
   <!-- the signinfo.txt file has to contain one line with parameters for signtool.exe,
@@ -44,6 +45,14 @@
       <arg value="/verbosity:quiet" />
       <arg value="/maxcpucount" />
     </exec>
+    <exec program="msbuild.exe" >
+      <arg value="CryptSync.sln" />
+      <arg value="/t:Clean" />
+      <arg value="/p:Configuration=${configuration}" />
+      <arg value="/p:Platform=ARM64" />
+      <arg value="/verbosity:quiet" />
+      <arg value="/maxcpucount" />
+    </exec>
   </target>
 
   <target name="VersionInfo" depends="VSNET,env">
@@ -94,17 +103,30 @@
       <arg value="/verbosity:minimal" />
       <arg value="/maxcpucount" />
     </exec>
+    <exec program="msbuild.exe" >
+      <arg value="CryptSync.sln" />
+      <arg value="/t:rebuild" />
+      <arg value="/p:Configuration=${configuration}" />
+      <arg value="/p:Platform=ARM64" />
+      <arg value="/verbosity:minimal" />
+      <arg value="/maxcpucount" />
+    </exec>
     <if test="${file::exists('signinfo.txt')}">
-      <exec program="signtool">
+      <exec program="${signtool}">
         <arg value="sign" />
         <arg value="${signinfo}" />
         <arg value="bin\${configuration}\Win32\CryptSync.exe" />
       </exec>
-      <exec program="signtool">
+      <exec program="${signtool}">
         <arg value="sign" />
         <arg value="${signinfo}" />
         <arg value="bin\${configuration}\x64\CryptSync64.exe" />
       </exec>
+      <exec program="${signtool}">
+        <arg value="sign" />
+        <arg value="${signinfo}" />
+        <arg value="bin\${configuration}\ARM64\CryptSyncARM64.exe" />
+      </exec>
     </if>
   </target>
 

diff --git a/default.build.user.tmpl b/default.build.user.tmpl
@@ -18,9 +18,9 @@
   <!-- These two targets have to exist in doc.build.user                      -->
   <!-- ====================================================================== -->
 
-  <target name="VSNET" description="Checks if the env variables for VS2015 are set">
+  <target name="VSNET" description="Checks if the env variables for VS2013 are set">
     <if test="${not environment::variable-exists('VCINSTALLDIR')}">
-      <fail>You must first call "%VS140COMNTOOLS%\vsvars32.bat"</fail>
+      <fail>You must first call "%VS120COMNTOOLS%\vsvars32.bat"</fail>
     </if>
     <!-- Uncomment the line below to allow limited building using VC Express instead of VS.NET. -->
     <!-- <property name="buildtool" value="vcexpress.exe" /> -->
@@ -47,12 +47,18 @@
         <variable name="WIX" value="%WIX%\bin" />
       </setenv>
     </if>
+    <!--
+      specifies the tool to use for signing the binaries.
+      change to "scsigntool.exe" in case you're using a smart card and have scsigntool set up
+    -->
+    <property name="signtool" value="scsigntool.exe" />
 
     <!--
       Update environment & we are good to go.
     -->
 
     <setenv>
+      <variable name="PATH" value="D:\smartcardtools\x64;%PATH%" />
       <variable name="PATH" value="%WIX%;%PATH%" />
       <variable name="WIXUI" value="%WIX%" />
     </setenv>