From 1a2435f746baddbd19c6786a18cde95112bce0d3 Mon Sep 17 00:00:00 2001
From: Josh Suereth <joshua.suereth@gmail.com>
Date: Wed, 11 Jan 2012 11:50:57 -0500
Subject: [PATCH] Added UI to windows MSI.

* Can now select installation directory of SBT.
* Can optionally add SBT to the path, instead of required.
* Displays a license agreement to the user.
---
 project/packaging.scala |  45 +++++++++++++++++++++++++++-------------
 src/windows/License.rtf | Bin 0 -> 1812 bytes
 2 files changed, 31 insertions(+), 14 deletions(-)
 create mode 100644 src/windows/License.rtf

diff --git a/project/packaging.scala b/project/packaging.scala
index 137d7acc4..1de6a1dfb 100644
--- a/project/packaging.scala
+++ b/project/packaging.scala
@@ -86,15 +86,23 @@ object Packaging {
     
     // WINDOWS SPECIFIC
     name in Windows := "sbt",
-    wixConfig <<= (sbtVersion) map { (sv) =>
-      val version = (sv split "\\.") match {
+    lightOptions ++= Seq("-ext", "WixUIExtension", "-cultures:en-us"),
+    wixConfig <<= (sbtVersion, sourceDirectory in Windows) map makeWindowsXml,
+    //wixFile <<= sourceDirectory in Windows map (_ / "sbt.xml"),
+    mappings in packageMsi in Windows <+= sbtLaunchJar map { f => f -> "sbt-launch.jar" },
+    mappings in packageMsi in Windows <+= sourceDirectory in Windows map { d => 
+      (d / "sbt.bat") -> "sbt.bat" }
+  )
+  
+  def makeWindowsXml(sbtVersion: String, sourceDir: File) = {
+    val version = (sbtVersion split "\\.") match {
         case Array(major,minor,bugfix, _*) => Seq(major,minor,bugfix, "1") mkString "."
         case Array(major,minor) => Seq(major,minor,"0","1") mkString "."
         case Array(major) => Seq(major,"0","0","1") mkString "."
       }
       (
 <Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>
-   <Product Id='ce07be71-510d-414a-92d4-dff47631848a' 
+  <Product Id='ce07be71-510d-414a-92d4-dff47631848a' 
             Name='Simple Build Tool' 
             Language='1033'
             Version={version}
@@ -113,25 +121,34 @@ object Packaging {
             <Directory Id='INSTALLDIR' Name='sbt'>
                <Component Id='SbtLauncherScript' Guid='*'>
                   <File Id='sbt_bat' Name='sbt.bat' DiskId='1' Source='sbt.bat' />
-                  <Environment Id="PATH" Name="PATH" Value="[INSTALLDIR]" Permanent="no" Part="last" Action="set" System="yes" />
                </Component>
                <Component Id='SbtLauncherJar' Guid='*'>
                   <File Id='sbt_launch_jar' Name='sbt-launch.jar' DiskId='1' Source='sbt-launch.jar' />
                </Component>               
-            </Directory>
+               <Component Id='SbtLauncherPath' Guid='17EA4092-3C70-11E1-8CD8-1BB54724019B'>
+                  <CreateFolder/>
+                  <Environment Id="PATH" Name="PATH" Value="[INSTALLDIR]" Permanent="no" Part="last" Action="set" System="yes" />
+               </Component>
+             </Directory>
          </Directory>
       </Directory>
  
-      <Feature Id='SbtLauncher' Title='Sbt Launcher Script' Level='1'>
-         <ComponentRef Id='SbtLauncherScript' />
-         <ComponentRef Id='SbtLauncherJar' />
+      <Feature Id='Complete' Title='Simple Build Tool' Description='The windows installation of Simple Build Tool.'
+         Display='expand' Level='1' ConfigurableDirectory='INSTALLDIR'>
+        <Feature Id='SbtLauncher' Title='Sbt Launcher Script' Description='The application which downloads and launches SBT.' Level='1'>
+          <ComponentRef Id='SbtLauncherScript'/>
+          <ComponentRef Id='SbtLauncherJar' />
+        </Feature>
+        <Feature Id='SbtLauncherPathF' Title='Add SBT to windows system PATH' Description='This will append SBT to your windows system path.' Level='1'>
+          <ComponentRef Id='SbtLauncherPath'/>
+        </Feature>
       </Feature>
+      
+      <UIRef Id="WixUI_Mondo"/>
+      <UIRef Id="WixUI_ErrorProgressText"/>
+      <Property Id="WIXUI_INSTALLDIR" Value="INSTALLDIR"/>
+      <WixVariable Id="WixUILicenseRtf" Value={sourceDir.getAbsolutePath + "\\License.rtf"} />
    </Product>
 </Wix>)
-    },
-    //wixFile <<= sourceDirectory in Windows map (_ / "sbt.xml"),
-    mappings in packageMsi in Windows <+= sbtLaunchJar map { f => f -> "sbt-launch.jar" },
-    mappings in packageMsi in Windows <+= sourceDirectory in Windows map { d => 
-      (d / "sbt.bat") -> "sbt.bat" }
-  )
+  }
 }
diff --git a/src/windows/License.rtf b/src/windows/License.rtf
new file mode 100644
index 0000000000000000000000000000000000000000..218b930464d9086391baa7a0a2c037be41af5b83
GIT binary patch
literal 1812
zcmcIl-*4MC5Z-fv{tx%ob`Ub#X|{EFk|jE3AxoY}InAJl(h_YGkwt@~5(Gj1_Z=mr
zN!I593ByQt-+e#M$zy5UZd!`gs{W`>`|0drR@QR2oA|R4?S48rKYuKDx^-^b;AK+o
zTGf=h>L84jZUT{L)YhoWr>FPt9?M_Ly=<isP8(R+os+e4aB=o|dN#wai|OR@sk~G2
z{#Ld1=d!D&<w=;jv|=`yl(w1u@jIT!u5r`SPyf;nw6hsR`t)Gb{@~za^$D>0&%mEw
z{5hQfbMj8MFmJlHehA>Jwg+tK_J;sg!ra1A7$fi(<~m^<<XUdK>NWtb+XrBc7Of0m
zBdvgqY7V-UErJNETlhzG`~8T>I%%Xsn6>B{SRYi=sFU>)-oFc*26}=PjI`3+$@*+~
zGn_eEVVzOi&MAZyZ4I53pjxoHGnMS0Y*j1F1MIXp+5qmAI{+H#f9lQ+I7eNpovMUK
z2|ySLCuxq#q1A9Q`cBn&aR=e>kciYY`d+nrsC0{2VAIIgcOIqtYe1cz!CQhB^zNBi
zrE9G1tV3l^AY+d#w)##Y>KMxa0|2ddszNi}L0M=}vIlw@-phQ;41K8@p^nmwhRuE^
zgF|0=^GpWy)*V{+fAR6@AodS!wXV9OY+Y}@SMnRCqp`xkQ8;OoXzWV}eSDtU>)=O;
z=V!q2O)HMl`{S!bhbeoY2k#+lrQZ*XQiE)3jUP6@3aI#~9cJDucVm`ldyUg^<zR;e
zgZEbN+`UhETpzF}S^3q$X63ia_@!xw^|2N=<ITSEC1t>}1-}k+0(f8N*@ng>hWQQf
zC4sQu%PfcQ-$RD4KYV~Njq&>i$hUP)7=tVyjH9b{La`5l@-XF;umETpB}Girs{rN&
zhcx4m&=uua#xwj_BL2^916;O%70II|LWOghP=3=-UQnL;sSD&3!aB@3jfy19VO`|w
zj3Hl?5mOc=AzhJp)JjvF4P--74s01F$!lqIf~3NELIzNj7So(W+|wU#qrx;oXOK^V
ze__@nqW(g@5fmQgHvu{UQI<0DcY#It65?<bUJ(W#-}*41{nrdMJ}Ppu@*Gh-E9Q(-
zUT^|eSr&VrfsuSeBf>5r$-MImC>RL_xH#ltPXTezB&@-PdBJFJ7fm_I^J2|umVSa|
zc8y*j+YtMGnlWUl4|RaTShD=a!+T$P?*q7A5`3PcCtf7aLvIk{IgNa#Kgw_@&vHHh
zz37INTqX31q!IDFG7oi48To{HQRH~#as5_Zhd3Bl1&90XKz?|AruAx7(RfS~=mNrc
cgFvWY=)fglbX*vG#ENJ+<}mI8{sa5vUrl~N3jhEB

literal 0
HcmV?d00001