From 2e126bd3d9a8e48eaa030f22ca04d51f21261667 Mon Sep 17 00:00:00 2001
From: Saleem Abdulrasool <compnerd@compnerd.org>
Date: Wed, 20 Nov 2024 13:34:48 -0800
Subject: [PATCH] WiX: restructure SDK manifests

Add a hierarchy for the SDKs as there are now two platforms that we are
packaging. This makes the structure easier to follow and adopts a
similar naming scheme.
---
 platforms/Windows/bundle/installer.wixproj         | 14 +++++++-------
 .../android_sdk.wixproj => sdk/drd/sdk.wixproj}    |  0
 .../android_sdk.wxs => sdk/drd/sdk.wxs}            |  0
 platforms/Windows/sdk/{ => win}/sdk.wixproj        | 12 ++++++------
 platforms/Windows/sdk/{ => win}/sdk.wxs            |  0
 5 files changed, 13 insertions(+), 13 deletions(-)
 rename platforms/Windows/{android_sdk/android_sdk.wixproj => sdk/drd/sdk.wixproj} (100%)
 rename platforms/Windows/{android_sdk/android_sdk.wxs => sdk/drd/sdk.wxs} (100%)
 rename platforms/Windows/sdk/{ => win}/sdk.wixproj (53%)
 rename platforms/Windows/sdk/{ => win}/sdk.wxs (100%)

diff --git a/platforms/Windows/bundle/installer.wixproj b/platforms/Windows/bundle/installer.wixproj
index 98201990..70f8d952 100644
--- a/platforms/Windows/bundle/installer.wixproj
+++ b/platforms/Windows/bundle/installer.wixproj
@@ -29,30 +29,30 @@
   </ItemGroup>
 
   <ItemGroup Condition=" '$(INCLUDE_ANDROID_ARM_SDK)' != '' ">
-    <ProjectReference Include="..\android_sdk\android_sdk.wixproj" Properties="ProductArchitecture=armv7;Platform=x86" BindName="android_armv7_sdk" />
+    <ProjectReference Include="..\sdk\drd\sdk.wixproj" Properties="ProductArchitecture=armv7;Platform=x86" BindName="android_armv7_sdk" />
   </ItemGroup>
 
   <ItemGroup Condition=" '$(INCLUDE_ANDROID_ARM64_SDK)' != '' ">
-    <ProjectReference Include="..\android_sdk\android_sdk.wixproj" Properties="ProductArchitecture=aarch64;Platform=x86" BindName="android_aarch64_sdk" />
+    <ProjectReference Include="..\sdk\drd\sdk.wixproj" Properties="ProductArchitecture=aarch64;Platform=x86" BindName="android_aarch64_sdk" />
   </ItemGroup>
 
   <ItemGroup Condition=" '$(INCLUDE_ANDROID_X86_SDK)' != '' ">
-    <ProjectReference Include="..\android_sdk\android_sdk.wixproj" Properties="ProductArchitecture=i686;Platform=x86" BindName="android_i686_sdk" />
+    <ProjectReference Include="..\sdk\drd\sdk.wixproj" Properties="ProductArchitecture=i686;Platform=x86" BindName="android_i686_sdk" />
   </ItemGroup>
 
   <ItemGroup Condition=" '$(INCLUDE_ANDROID_x86_64_SDK)' != '' ">
-    <ProjectReference Include="..\android_sdk\android_sdk.wixproj" Properties="ProductArchitecture=x86_64;Platform=x86" BindName="android_x86_64_sdk" />
+    <ProjectReference Include="..\sdk\drd\sdk.wixproj" Properties="ProductArchitecture=x86_64;Platform=x86" BindName="android_x86_64_sdk" />
   </ItemGroup>
 
   <ItemGroup Condition=" '$(INCLUDE_WINDOWS_AMD64_SDK)' != '' ">
-    <ProjectReference Include="..\sdk\sdk.wixproj" Properties="ProductArchitecture=amd64;Platform=x86" BindName="windows_amd64_sdk" />
+    <ProjectReference Include="..\sdk\win\sdk.wixproj" Properties="ProductArchitecture=amd64;Platform=x86" BindName="windows_amd64_sdk" />
   </ItemGroup>
 
   <ItemGroup Condition=" '$(INCLUDE_WINDOWS_ARM64_SDK)' != '' ">
-    <ProjectReference Include="..\sdk\sdk.wixproj" Properties="ProductArchitecture=arm64;Platform=x86" BindName="windows_arm64_sdk" />
+    <ProjectReference Include="..\sdk\win\sdk.wixproj" Properties="ProductArchitecture=arm64;Platform=x86" BindName="windows_arm64_sdk" />
   </ItemGroup>
 
   <ItemGroup Condition=" '$(INCLUDE_WINDOWS_X86_SDK)' != '' ">
-    <ProjectReference Include="..\sdk\sdk.wixproj" Properties="ProductArchitecture=x86;Platform=x86" BindName="windows_x86_sdk" />
+    <ProjectReference Include="..\sdk\win\sdk.wixproj" Properties="ProductArchitecture=x86;Platform=x86" BindName="windows_x86_sdk" />
   </ItemGroup>
 </Project>
diff --git a/platforms/Windows/android_sdk/android_sdk.wixproj b/platforms/Windows/sdk/drd/sdk.wixproj
similarity index 100%
rename from platforms/Windows/android_sdk/android_sdk.wixproj
rename to platforms/Windows/sdk/drd/sdk.wixproj
diff --git a/platforms/Windows/android_sdk/android_sdk.wxs b/platforms/Windows/sdk/drd/sdk.wxs
similarity index 100%
rename from platforms/Windows/android_sdk/android_sdk.wxs
rename to platforms/Windows/sdk/drd/sdk.wxs
diff --git a/platforms/Windows/sdk/sdk.wixproj b/platforms/Windows/sdk/win/sdk.wixproj
similarity index 53%
rename from platforms/Windows/sdk/sdk.wixproj
rename to platforms/Windows/sdk/win/sdk.wixproj
index 86378e72..cd84a9ed 100644
--- a/platforms/Windows/sdk/sdk.wixproj
+++ b/platforms/Windows/sdk/win/sdk.wixproj
@@ -22,18 +22,18 @@
   Shared .wixlibs used by other, "normal" packages.
   -->
   <ItemGroup Condition=" '$(ProductArchitecture)' == 'x86' ">
-    <ProjectReference Include="..\rtl\msm\rtlmsm.wixproj" Properties="ProductArchitecture=x86;Platform=x86" BindName="rtlmsm" />
-    <ProjectReference Include="..\shared\shared.wixproj" Properties="ProductArchitecture=x86;Platform=x86;IntermediateOutputPath=$(BaseIntermediateOutputPath)x86_$(ProductArchitecture)\$(Configuration)\;OutputPath=$(BaseOutputPath)$(Configuration)\x86_$(ProductArchitecture)\" />
+    <ProjectReference Include="..\..\rtl\msm\rtlmsm.wixproj" Properties="ProductArchitecture=x86;Platform=x86" BindName="rtlmsm" />
+    <ProjectReference Include="..\..\shared\shared.wixproj" Properties="ProductArchitecture=x86;Platform=x86;IntermediateOutputPath=$(BaseIntermediateOutputPath)x86_$(ProductArchitecture)\$(Configuration)\;OutputPath=$(BaseOutputPath)$(Configuration)\x86_$(ProductArchitecture)\" />
   </ItemGroup>
 
   <ItemGroup Condition=" '$(ProductArchitecture)' == 'amd64' ">
-    <ProjectReference Include="..\rtl\msm\rtlmsm.wixproj" Properties="ProductArchitecture=amd64;Platform=x64" BindName="rtlmsm" />
-    <ProjectReference Include="..\shared\shared.wixproj" Properties="ProductArchitecture=amd64;Platform=x86;IntermediateOutputPath=$(BaseIntermediateOutputPath)x86_$(ProductArchitecture)\$(Configuration)\;OutputPath=$(BaseOutputPath)$(Configuration)\x86_$(ProductArchitecture)\" />
+    <ProjectReference Include="..\..\rtl\msm\rtlmsm.wixproj" Properties="ProductArchitecture=amd64;Platform=x64" BindName="rtlmsm" />
+    <ProjectReference Include="..\..\shared\shared.wixproj" Properties="ProductArchitecture=amd64;Platform=x86;IntermediateOutputPath=$(BaseIntermediateOutputPath)x86_$(ProductArchitecture)\$(Configuration)\;OutputPath=$(BaseOutputPath)$(Configuration)\x86_$(ProductArchitecture)\" />
   </ItemGroup>
 
   <ItemGroup Condition=" '$(ProductArchitecture)' == 'arm64' ">
-    <ProjectReference Include="..\rtl\msm\rtlmsm.wixproj" Properties="ProductArchitecture=arm64;Platform=arm64" BindName="rtlmsm" />
-    <ProjectReference Include="..\shared\shared.wixproj" Properties="ProductArchitecture=arm64;Platform=x86;IntermediateOutputPath=$(BaseIntermediateOutputPath)x86_$(ProductArchitecture)\$(Configuration)\;OutputPath=$(BaseOutputPath)$(Configuration)\x86_$(ProductArchitecture)\" />
+    <ProjectReference Include="..\..\rtl\msm\rtlmsm.wixproj" Properties="ProductArchitecture=arm64;Platform=arm64" BindName="rtlmsm" />
+    <ProjectReference Include="..\..\shared\shared.wixproj" Properties="ProductArchitecture=arm64;Platform=x86;IntermediateOutputPath=$(BaseIntermediateOutputPath)x86_$(ProductArchitecture)\$(Configuration)\;OutputPath=$(BaseOutputPath)$(Configuration)\x86_$(ProductArchitecture)\" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/platforms/Windows/sdk/sdk.wxs b/platforms/Windows/sdk/win/sdk.wxs
similarity index 100%
rename from platforms/Windows/sdk/sdk.wxs
rename to platforms/Windows/sdk/win/sdk.wxs