From c713294a0769038d836b06872713aeb811a1cdbc Mon Sep 17 00:00:00 2001
From: Mat Sutcliffe <oktal3700@gmail.com>
Date: Sun, 9 Aug 2020 01:45:16 +0100
Subject: [PATCH] Issue #69 Add CSL2XSB to the installer

Uses PyInstaller to bundle together with a
self-contained minimal Python environment.
---
 .github/workflows/build.yml          |  1 +
 install.pri                          | 12 +++++++++++
 installer/installbuilder/csl2xsb.xml | 31 ++++++++++++++++++++++++++++
 installer/installbuilder/project.xml |  3 +++
 4 files changed, 47 insertions(+)
 create mode 100644 installer/installbuilder/csl2xsb.xml

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 4111e1fc7..41702aabf 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -176,6 +176,7 @@ jobs:
       - name: Install dependencies
         run: |
           choco install jom --yes
+          pip install PyInstaller
       - name: Checkout repository
         uses: actions/checkout@v2
         with:
diff --git a/install.pri b/install.pri
index 4b6f8cb69..f5a0a16a5 100644
--- a/install.pri
+++ b/install.pri
@@ -190,6 +190,18 @@ win32-g++ {
     INSTALLS += vc_runtime_target
 }
 
+############### Install csl2xsb ###############
+
+win32:swiftConfig(sims.xswiftbus) {
+    PYINST_BIN = $$system($$(SYSTEMROOT)\system32\where pyinstaller 2> nul)
+    !isEmpty(PYINST_BIN) {
+        CSL2XSB = $$shell_path($$SourceRoot/scripts/csl2xsb/CSL2XSB.py)
+        csl2xsb.path = $${PREFIX}/share/CSL2XSB
+        csl2xsb.extra = $$PYINST_BIN -y --distpath $$shell_path($${PREFIX}/share) --workpath $$shell_path($$(TEMP)) $$CSL2XSB
+        INSTALLS += csl2xsb
+    }
+}
+
 ############### Install externals ##############
 
 win32: externals_lib_target.path = $${PREFIX}/bin
diff --git a/installer/installbuilder/csl2xsb.xml b/installer/installbuilder/csl2xsb.xml
new file mode 100644
index 000000000..48ee93d75
--- /dev/null
+++ b/installer/installbuilder/csl2xsb.xml
@@ -0,0 +1,31 @@
+<component>
+    <name>csl2xsb</name>
+    <description>CSL2XSB script</description>
+    <canBeEdited>1</canBeEdited>
+    <detailedDescription>script needed to process X-CSL models for swift</detailedDescription>
+    <selected>1</selected>
+    <show>1</show>
+    <shouldPackRuleList>
+        <platformTest>
+            <type>windows</type>
+        </platformTest>
+        <compareText>
+            <logic>equals</logic>
+            <text>${architecture}</text>
+            <value>64</value>
+        </compareText>
+    </shouldPackRuleList>
+    <folderList>
+        <folder>
+            <description>share</description>
+            <destination>${installdir}/share</destination>
+            <name>share_windows</name>
+            <platforms>windows</platforms>
+            <distributionFileList>
+                <distributionFile>
+                    <origin>../../dist/share/CSL2XSB</origin>
+                </distributionFile>
+            </distributionFileList>
+        </folder>
+    </folderList>
+</component>
diff --git a/installer/installbuilder/project.xml b/installer/installbuilder/project.xml
index cd38d4209..aa307438a 100644
--- a/installer/installbuilder/project.xml
+++ b/installer/installbuilder/project.xml
@@ -22,6 +22,9 @@
         <include>
             <file>vcredist-x64.xml</file>
         </include>
+        <include>
+            <file>csl2xsb.xml</file>
+        </include>
     </componentList>
     <functionDefinitionList>
         <actionDefinition>