From b615816c7175eeec29f917b16c8a689d8da906a6 Mon Sep 17 00:00:00 2001
From: Antoine Gersant <antoine.gersant@lesforges.org>
Date: Sun, 20 Nov 2016 17:50:35 -0800
Subject: [PATCH] Updated version number and install script for 0.2.0

---
 Cargo.lock                          |  2 +-
 Cargo.toml                          |  2 +-
 build_release_windows.ps1           |  2 +-
 res/windows/installer/installer.wxs | 15 ++++++++++++++-
 4 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index a8708e4..f2fcb3f 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1,6 +1,6 @@
 [root]
 name = "polaris"
-version = "0.1.0"
+version = "0.2.0"
 dependencies = [
  "ape 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "getopts 0.2.14 (registry+https://github.com/rust-lang/crates.io-index)",
diff --git a/Cargo.toml b/Cargo.toml
index 96ad31d..4640995 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "polaris"
-version = "0.1.0"
+version = "0.2.0"
 authors = ["Antoine Gersant <antoine.gersant@lesforges.org>"]
 
 [features]
diff --git a/build_release_windows.ps1 b/build_release_windows.ps1
index 6291865..d52a057 100644
--- a/build_release_windows.ps1
+++ b/build_release_windows.ps1
@@ -24,7 +24,7 @@ Copy-Item .\web\ 								.\release\tmp\ -recurse
 ""
 "Creating installer"
 candle -wx -arch x64 					-out .\release\tmp\installer.wixobj 	.\res\windows\installer\installer.wxs
-light  -wx -spdb -ext WixUIExtension	-out .\release\Polaris_0.1.0.msi 		.\release\tmp\installer.wixobj
+light  -wx -spdb -ext WixUIExtension	-out .\release\Polaris_0.2.0.msi 		.\release\tmp\installer.wixobj
 
 "Cleaning up"
 Remove-Item -Recurse .\release\tmp
diff --git a/res/windows/installer/installer.wxs b/res/windows/installer/installer.wxs
index 20a094d..3967097 100644
--- a/res/windows/installer/installer.wxs
+++ b/res/windows/installer/installer.wxs
@@ -1,9 +1,21 @@
 <?xml version='1.0' encoding='windows-1252'?>
 <Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>
-	<Product Name='Polaris' Id='CC2BCB3C-6FD2-4B81-B89F-3F4A9DA75BF7' UpgradeCode='9D86F109-E1EC-4C67-826C-8FB813838C49' Language='1033' Codepage='1252' Version='0.1.0' Manufacturer='Antoine Gersant'>
+	<Product Name='Polaris' Id='33986EB1-E35C-4E01-817C-FA23F0C0FB88' UpgradeCode='9D86F109-E1EC-4C67-826C-8FB813838C49' Language='1033' Codepage='1252' Version='0.2.0' Manufacturer='Antoine Gersant'>
 
 		<Package Id='*' Keywords='Installer' Platform='x64' Description='Polaris Installer' Manufacturer='Antoine Gersant' Languages='1033' Compressed='yes' SummaryCodepage='1252' />
 
+		<Upgrade Id='9D86F109-E1EC-4C67-826C-8FB813838C49'>
+    		<UpgradeVersion OnlyDetect='yes' Property='SELFFOUND' Minimum='0.2.0' IncludeMinimum='yes' Maximum='0.2.0' IncludeMaximum='yes' />
+    		<UpgradeVersion OnlyDetect='yes' Property='NEWERFOUND' Minimum='0.2.0' IncludeMinimum='no' />
+		</Upgrade>
+
+		<CustomAction Id='AlreadyUpdated' Error='Your Polaris installation has already been updated.' />
+		<CustomAction Id='NoDowngrade' Error='A later version of Polaris is already installed.' />
+		<InstallExecuteSequence>
+    		<Custom Action='AlreadyUpdated' After='FindRelatedProducts'>SELFFOUND</Custom>
+    		<Custom Action='NoDowngrade' After='FindRelatedProducts'>NEWERFOUND</Custom>
+		</InstallExecuteSequence>
+
 		<Media Id='1' Cabinet='Sample.cab' EmbedCab='yes' DiskPrompt='Installation Media #1' />
 		<Property Id='DiskPrompt' Value='Polaris Installation [1]' />
 
@@ -93,6 +105,7 @@
 			<ComponentRef Id='OpenSSL' />
 			<ComponentRef Id='ConfigFile' />
 			<ComponentRef Id='WebUIIndex' />
+			<ComponentRef Id='WebUIJS' />
 			<ComponentRef Id='WebUILib' />
 			<ComponentRef Id='WebUIStyle' />
 			<ComponentRef Id='WebUITags' />