From 270c8431f1403440b206d9dacc3b1f6839136583 Mon Sep 17 00:00:00 2001
From: Till Schneidereit <till@tillschneidereit.net>
Date: Tue, 6 Aug 2019 14:56:02 +0200
Subject: [PATCH 1/3] Add Windows installer

---
 .azure-pipelines.yml       |  9 +++++
 installer/msi/wasmtime.wxs | 76 ++++++++++++++++++++++++++++++++++++++
 2 files changed, 85 insertions(+)
 create mode 100644 installer/msi/wasmtime.wxs

diff --git a/.azure-pipelines.yml b/.azure-pipelines.yml
index 554a32695a35..e2763265c28d 100644
--- a/.azure-pipelines.yml
+++ b/.azure-pipelines.yml
@@ -196,6 +196,15 @@ jobs:
         fi
         cp LICENSE README.md target/release/{wasmtime,wasm2obj}$ext $BUILD_BINARIESDIRECTORY/$BASENAME
       displayName: Copy binaries
+
+    - bash: |
+        set -e
+        export WT_VERSION=`cat Cargo.toml | sed -n 's/^version = "\([^"]*\)".*/\1/p'`
+        "$WIX/bin/candle" -arch x64 -out target/wasmtime.wixobj installer/msi/wasmtime.wxs
+        "$WIX/bin/light" -out $BUILD_ARTIFACTSTAGINGDIRECTORY/$(basename).msi target/wasmtime.wixobj -ext WixUtilExtension
+      displayName: Create installer (Windows)
+      condition: eq(variables['Agent.OS'], 'Windows_NT')
+
     - task: ArchiveFiles@2
       inputs:
         rootFolderOrFile: $(Build.BinariesDirectory)/$(basename)
diff --git a/installer/msi/wasmtime.wxs b/installer/msi/wasmtime.wxs
new file mode 100644
index 000000000000..728916bce46c
--- /dev/null
+++ b/installer/msi/wasmtime.wxs
@@ -0,0 +1,76 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
+
+    <?if $(sys.BUILDARCH)="x64" ?>
+        <?define ArchSuffix=" 64-bit" ?>
+    <?else?>
+        <?define ArchSuffix="" ?>
+    <?endif?>
+
+    <?define ProductName="Wasmtime $(env.WT_VERSION) $(var.ArchSuffix))" ?>
+
+    <?define BaseRegKey="Software\[Manufacturer]\Wasmtime ($(sys.BUILDARCH))\$(env.WT_VERSION)" ?>
+
+    <Product Id="*" UpgradeCode="A00EBA3C-5C90-42DA-8176-3D46447D2211" Version="$(env.WT_VERSION)" Language="1033" Name="Wasmtime" Manufacturer="Crane Station">
+        <Package InstallerVersion="300" Compressed="yes"/>
+        <Media Id="1" Cabinet="wasmtime.cab" EmbedCab="yes" />
+
+        <InstallUISequence>
+            <FindRelatedProducts After="AppSearch" />
+        </InstallUISequence>
+        <InstallExecuteSequence>
+            <FindRelatedProducts After="AppSearch" />
+            <RemoveExistingProducts Before="InstallInitialize" />
+        </InstallExecuteSequence>
+
+        <Directory Id="TARGETDIR" Name="SourceDir">
+            <Directory Id="ProgramFiles64Folder">
+                <Directory Id="INSTALLDIR" Name="Wasmtime"/>
+            </Directory>
+        
+            <!-- Record our install location -->
+            <Component Id="InstallDir" Guid="*">
+                <RegistryKey Root='HKLM' Key='$(var.BaseRegKey)'>
+                    <RegistryValue Type='string' Name='InstallDir' Value='[INSTALLDIR]'/>
+                </RegistryKey>
+            </Component>
+
+            <!-- Add install dir to PATH -->
+            <Component Id="PathEnvPerMachine" Guid="*">
+                <!-- <Condition>ALLUSERS=1 OR (ALLUSERS=2 AND Privileged)</Condition> -->
+                <RegistryValue Root="HKMU" Key="$(var.BaseRegKey)" Name="PathEnvPerMachine" Type="string" Value="1" KeyPath="yes" />
+                <!-- [INSTALLDIR] contains trailing backslash -->
+                <Environment Id="PathPerMachine" Name="PATH" Value="[INSTALLDIR]" Permanent="no" Part="last" Action="set" System="yes" />
+            </Component>
+            <Component Id="PathEnvPerUser" Guid="*">
+                <!-- <Condition>ALLUSERS="" OR (ALLUSERS=2 AND (NOT Privileged))</Condition> -->
+                <RegistryValue Root="HKMU" Key="$(var.BaseRegKey)" Name="PathEnvPerUser" Type="string" Value="1" KeyPath="yes" />
+                <Environment Id="PathPerUser" Name="PATH" Value="[INSTALLDIR]" Permanent="no" Part="last" Action="set" System="no" />
+            </Component>
+        </Directory>
+
+        <DirectoryRef Id="INSTALLDIR">
+            <Component Id="wasmtime.exe" Guid="*">
+                <File Id="wasmtime.exe" Source="target\release\wasmtime.exe" KeyPath="yes" Checksum="yes"/>
+            </Component>
+            <Component Id="wasm2obj.exe" Guid="*">
+                <File Id="wasm2obj.exe" Source="target\release\wasm2obj.exe" KeyPath="yes" Checksum="yes"/>
+            </Component>
+        </DirectoryRef>
+
+        <Feature Id="InstallWasmtime" Title="Wasmtime and Wasm2obj" Level="1">
+            <ComponentRef Id="wasmtime.exe" />
+            <ComponentRef Id="wasm2obj.exe" />
+            <ComponentRef Id="InstallDir" />
+        </Feature>
+        <Feature Id="AddToPath"
+                 Title="Add to PATH"
+                 Description="Add Wasmtime to PATH environment variable"
+                 Level="1"
+                 AllowAdvertise="no">
+                 <ComponentRef Id="PathEnvPerMachine" />
+                 <ComponentRef Id="PathEnvPerUser" />
+        </Feature>
+        <CustomActionRef Id="WixBroadcastEnvironmentChange" />
+    </Product>
+</Wix>

From 995f487c19fca2155232f170ff996d19cfb85e1e Mon Sep 17 00:00:00 2001
From: Till Schneidereit <till@tillschneidereit.net>
Date: Tue, 6 Aug 2019 23:10:58 +0200
Subject: [PATCH 2/3] Installer fixes

---
 installer/msi/wasmtime.wxs | 19 ++++++++++++++++---
 1 file changed, 16 insertions(+), 3 deletions(-)

diff --git a/installer/msi/wasmtime.wxs b/installer/msi/wasmtime.wxs
index 728916bce46c..f8c5eba92031 100644
--- a/installer/msi/wasmtime.wxs
+++ b/installer/msi/wasmtime.wxs
@@ -25,7 +25,9 @@
 
         <Directory Id="TARGETDIR" Name="SourceDir">
             <Directory Id="ProgramFiles64Folder">
-                <Directory Id="INSTALLDIR" Name="Wasmtime"/>
+                <Directory Id="INSTALLDIR" Name="Wasmtime">
+                    <Directory Id="BINDIR" Name="bin"/>
+                </Directory>
             </Directory>
         
             <!-- Record our install location -->
@@ -40,16 +42,25 @@
                 <!-- <Condition>ALLUSERS=1 OR (ALLUSERS=2 AND Privileged)</Condition> -->
                 <RegistryValue Root="HKMU" Key="$(var.BaseRegKey)" Name="PathEnvPerMachine" Type="string" Value="1" KeyPath="yes" />
                 <!-- [INSTALLDIR] contains trailing backslash -->
-                <Environment Id="PathPerMachine" Name="PATH" Value="[INSTALLDIR]" Permanent="no" Part="last" Action="set" System="yes" />
+                <Environment Id="PathPerMachine" Name="PATH" Value="[INSTALLDIR]bin" Permanent="no" Part="last" Action="set" System="yes" />
             </Component>
             <Component Id="PathEnvPerUser" Guid="*">
                 <!-- <Condition>ALLUSERS="" OR (ALLUSERS=2 AND (NOT Privileged))</Condition> -->
                 <RegistryValue Root="HKMU" Key="$(var.BaseRegKey)" Name="PathEnvPerUser" Type="string" Value="1" KeyPath="yes" />
-                <Environment Id="PathPerUser" Name="PATH" Value="[INSTALLDIR]" Permanent="no" Part="last" Action="set" System="no" />
+                <Environment Id="PathPerUser" Name="PATH" Value="[INSTALLDIR]bin" Permanent="no" Part="last" Action="set" System="no" />
             </Component>
         </Directory>
 
         <DirectoryRef Id="INSTALLDIR">
+            <Component Id="LICENSE" Guid="*">
+                <File Id="LICENSE" Source="LICENSE" KeyPath="yes" Checksum="yes"/>
+            </Component>
+            <Component Id="README" Guid="*">
+                <File Id="README.md" Source="README.md" KeyPath="yes" Checksum="yes"/>
+            </Component>
+        </DirectoryRef>
+
+        <DirectoryRef Id="BINDIR">
             <Component Id="wasmtime.exe" Guid="*">
                 <File Id="wasmtime.exe" Source="target\release\wasmtime.exe" KeyPath="yes" Checksum="yes"/>
             </Component>
@@ -61,6 +72,8 @@
         <Feature Id="InstallWasmtime" Title="Wasmtime and Wasm2obj" Level="1">
             <ComponentRef Id="wasmtime.exe" />
             <ComponentRef Id="wasm2obj.exe" />
+            <ComponentRef Id="LICENSE" />
+            <ComponentRef Id="README" />
             <ComponentRef Id="InstallDir" />
         </Feature>
         <Feature Id="AddToPath"

From 5c28a63fb02362626cca4398e6514b454fc38fc9 Mon Sep 17 00:00:00 2001
From: Till Schneidereit <till@tillschneidereit.net>
Date: Wed, 7 Aug 2019 14:03:30 +0200
Subject: [PATCH 3/3] Remove whitespace

---
 installer/msi/wasmtime.wxs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/installer/msi/wasmtime.wxs b/installer/msi/wasmtime.wxs
index f8c5eba92031..8110932cb970 100644
--- a/installer/msi/wasmtime.wxs
+++ b/installer/msi/wasmtime.wxs
@@ -29,7 +29,7 @@
                     <Directory Id="BINDIR" Name="bin"/>
                 </Directory>
             </Directory>
-        
+
             <!-- Record our install location -->
             <Component Id="InstallDir" Guid="*">
                 <RegistryKey Root='HKLM' Key='$(var.BaseRegKey)'>