From 0034d33b7762357dba0b59b2b84c91f3f5691684 Mon Sep 17 00:00:00 2001
From: Roland Winklmeier <Roland.M.Winklmeier@gmail.com>
Date: Mon, 17 Sep 2018 10:53:03 +0200
Subject: [PATCH] [Installer] Use architecture value to decide which binaries
 to package

In the previous logic, the installer would silently ignore missing binaries.
Instead it should error, if a binary is missing that should exist for
this installer architecture.

ref T344
---
 .../swift-plugin-simulators.xml               | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/installer/installbuilder/swift-plugin-simulators.xml b/installer/installbuilder/swift-plugin-simulators.xml
index 61dcc0b24..33c01e94c 100644
--- a/installer/installbuilder/swift-plugin-simulators.xml
+++ b/installer/installbuilder/swift-plugin-simulators.xml
@@ -29,9 +29,11 @@
                 <platformTest>
                     <type>windows</type>
                 </platformTest>
-                <fileExists>
-                    <path>${build_project_directory}/../../dist/bin/plugins/simulator/simulatorfs9.dll</path>
-                </fileExists>
+                <compareText>
+                    <logic>equals</logic>
+                    <text>${architecture}</text>
+                    <value>32</value>
+                </compareText>
             </shouldPackRuleList>
         </component>
         <component>
@@ -62,9 +64,11 @@ This plugin acts as the interface between swift and FSX.</detailedDescription>
                 <platformTest>
                     <type>windows</type>
                 </platformTest>
-                <fileExists>
-                    <path>${build_project_directory}/../../dist/bin/plugins/simulator/simulatorfsx.dll</path>
-                </fileExists>
+                <compareText>
+                    <logic>equals</logic>
+                    <text>${architecture}</text>
+                    <value>32</value>
+                </compareText>
             </shouldPackRuleList>
         </component>
         <component>
@@ -95,9 +99,6 @@ This plugin acts as the interface between swift and P3D.</detailedDescription>
                 <platformTest>
                     <type>windows</type>
                 </platformTest>
-                <fileExists>
-                    <path>${build_project_directory}/../../dist/bin/plugins/simulator/simulatorp3d.dll</path>
-                </fileExists>
             </shouldPackRuleList>
         </component>
         <component>