Build tweaks for ARM64.

wixtoolset · Feb 27, 2020 · 90c9809 · 90c9809
1 parent 2785c70
commit 90c9809
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 12 deletions.
diff --git a/history/5558.md b/history/5558.md
@@ -0,0 +1 @@
+* BobArnson: WIXFEATURE:5558 - Implement ARM64 support in core toolset
diff --git a/src/Setup/NativeSdkMsi/Libs.wxs b/src/Setup/NativeSdkMsi/Libs.wxs
@@ -45,7 +45,7 @@
 
     <Fragment>
         <ComponentGroup Id="LibARM64Components" Directory="SdkARM64LibFolder">
-            <?if $(var.BuildARM64) = true ?>
+            <?if $(var.BuildARM64) = true and $(var.VisualStudioTargetVersion) = 2017 ?>
                 <Component>
                     <File Id="dutil_arm64.lib" Source="!(bindpath.arm64)\$(var.VisualStudioTargetVersion)\dutil.lib"/>
                 </Component>

diff --git a/src/libs/libs.proj b/src/libs/libs.proj
@@ -10,9 +10,6 @@
     <ProjectReference Include="libs_multitarget.proj">
       <Properties>Platform=x64</Properties>
     </ProjectReference>
-    <ProjectReference Include="libs_multitarget.proj" Condition="$(BuildARM)">
-      <Properties>Platform=arm</Properties>
-    </ProjectReference>
     <ProjectReference Include="libs_multitarget.proj" Condition="$(BuildARM64)">
       <Properties>Platform=arm64</Properties>
     </ProjectReference>

diff --git a/src/libs/libs_multitarget.proj b/src/libs/libs_multitarget.proj
@@ -3,7 +3,7 @@
 
 
 <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
-  <ItemGroup Condition=" $(VS2010Available) ">
+  <ItemGroup Condition=" $(VS2010Available) AND '$(Platform)'!='arm64' ">
     <ProjectReference Include="dutil\dutil.vcxproj">
       <Properties>PlatformToolset=v100</Properties>
     </ProjectReference>
@@ -18,7 +18,7 @@
     </ProjectReference>
   </ItemGroup>
 
-  <ItemGroup Condition=" $(VS2012Available) ">
+  <ItemGroup Condition=" $(VS2012Available) AND '$(Platform)'!='arm64' ">
     <ProjectReference Include="dutil\dutil.vcxproj">
       <Properties>PlatformToolset=v110_xp</Properties>
     </ProjectReference>
@@ -33,7 +33,7 @@
     </ProjectReference>
   </ItemGroup>
 
-  <ItemGroup Condition=" $(VS2013Available) and !$(StaticAnalysisEnabled) ">
+  <ItemGroup Condition=" $(VS2013Available) and !$(StaticAnalysisEnabled) AND '$(Platform)'!='arm64' ">
     <ProjectReference Include="dutil\dutil.vcxproj">
       <Properties>PlatformToolset=v120_xp</Properties>
     </ProjectReference>
@@ -48,7 +48,7 @@
     </ProjectReference>
   </ItemGroup>
 
-  <ItemGroup Condition=" $(VS2013Available) and $(StaticAnalysisEnabled) ">
+  <ItemGroup Condition=" $(VS2013Available) and $(StaticAnalysisEnabled) AND '$(Platform)'!='arm64' ">
     <ProjectReference Include="dutil\dutil.vcxproj">
       <Properties>PlatformToolset=v120</Properties>
     </ProjectReference>
@@ -63,7 +63,7 @@
     </ProjectReference>
   </ItemGroup>
 
-  <ItemGroup Condition=" $(VS2015Available) and !$(StaticAnalysisEnabled) ">
+  <ItemGroup Condition=" $(VS2015Available) and !$(StaticAnalysisEnabled) AND '$(Platform)'!='arm64' ">
     <ProjectReference Include="dutil\dutil.vcxproj">
       <Properties>PlatformToolset=v140_xp</Properties>
     </ProjectReference>
@@ -78,7 +78,7 @@
     </ProjectReference>
   </ItemGroup>
 
-  <ItemGroup Condition=" $(VS2015Available) and $(StaticAnalysisEnabled) ">
+  <ItemGroup Condition=" $(VS2015Available) and $(StaticAnalysisEnabled) AND '$(Platform)'!='arm64' ">
     <ProjectReference Include="dutil\dutil.vcxproj">
       <Properties>PlatformToolset=v140</Properties>
     </ProjectReference>
@@ -100,7 +100,7 @@
     <ProjectReference Include="wcautil\wcautil.vcxproj">
       <Properties>PlatformToolset=v141_xp</Properties>
     </ProjectReference>
-    <ProjectReference Include="balutil\balutil.vcxproj" Condition=" '$(Platform)'=='x86' OR '$(Platform)'=='arm' ">
+    <ProjectReference Include="balutil\balutil.vcxproj" Condition=" '$(Platform)'=='x86' ">
       <Properties>PlatformToolset=v141_xp</Properties>
     </ProjectReference>
     <ProjectReference Include="deputil\deputil.vcxproj">
@@ -115,7 +115,7 @@
     <ProjectReference Include="wcautil\wcautil.vcxproj">
       <Properties>PlatformToolset=v141</Properties>
     </ProjectReference>
-    <ProjectReference Include="balutil\balutil.vcxproj" Condition=" '$(Platform)'=='x86' OR '$(Platform)'=='arm' ">
+    <ProjectReference Include="balutil\balutil.vcxproj" Condition=" '$(Platform)'=='arm' ">
       <Properties>PlatformToolset=v141</Properties>
     </ProjectReference>
     <ProjectReference Include="deputil\deputil.vcxproj">

diff --git a/wix.proj b/wix.proj
@@ -20,6 +20,7 @@
     <ProjectReference Include="src\chm\chm.helpproj" />
     <ProjectReference Include="src\setup\setup.proj" />
     <ProjectReference Include="test\test.proj" />
+    <!-- <ProjectReference Include="src\wixarm.proj" Condition=" $(BuildARM) " /> -->
   </ItemGroup>
 
   <Import Project="tools\Traversal.targets" />