From 1dd80333bf47572a843ee3f59227df46faf528a1 Mon Sep 17 00:00:00 2001
From: Reinhard Pointner <reinhard.pointner@gmail.com>
Date: Sun, 12 Aug 2018 12:32:38 +0700
Subject: [PATCH] Try to fix 32-bit MWS support

---
 build.xml                       | 6 +++---
 installer/appx/AppxManifest.xml | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/build.xml b/build.xml
index 901226e9..e7135505 100644
--- a/build.xml
+++ b/build.xml
@@ -261,7 +261,8 @@
 
 	<target name="appx" depends="revision" description="Build Windows 10 package">
 		<property name="appx.arch" value="x64" />
-		<property name="dir.staging" location="${dir.dist}/appx" />
+
+		<property name="dir.staging" location="${dir.dist}/appx/${appx.arch}" />
 
 		<copy todir="${dir.staging}">
 			<fileset dir="${dir.installer}/appx/${appx.arch}" includes="*.exe" />
@@ -278,7 +279,7 @@
 
 		<!-- copy files and resolve ant variables -->
 		<copy-replace todir="${dir.staging}">
-			<fileset dir="${dir.installer}/appx" includes="*.xml, *.ini" excludes="*.l4j.xml" />
+			<fileset dir="${dir.installer}/appx" includes="*.xml, *.ini" />
 		</copy-replace>
 
 		<!-- fetch latest JRE -->
@@ -289,7 +290,6 @@
 			<fileset dir="${dir.staging}/jre" includes="**/*120*.dll" />
 		</delete>
 
-
 		<!-- package APPX -->
 		<exec executable="makepri" dir="${dir.staging}" failonerror="yes">
 			<arg line="createconfig /o /pv 10.0.0 /cf priconfig.xml /dq en-US" />
diff --git a/installer/appx/AppxManifest.xml b/installer/appx/AppxManifest.xml
index 8a8817e9..743cea03 100644
--- a/installer/appx/AppxManifest.xml
+++ b/installer/appx/AppxManifest.xml
@@ -9,7 +9,7 @@
 
 	<Identity
 		Name="@{microsoft.application.name}"
-		ProcessorArchitecture="x64"
+		ProcessorArchitecture="@{appx.arch}"
 		Publisher="@{microsoft.application.publisher}"
 		Version="@{application.version}.0"
 	/>