From c8e1f291fad84718499a95cf901c61f85db01a4b Mon Sep 17 00:00:00 2001
From: Ray Speth <speth@mit.edu>
Date: Thu, 5 Jan 2012 22:22:03 +0000
Subject: [PATCH] Added installation options to WiX installer

---
 SConstruct                   |   2 ++
 platform/windows/License.rtf | Bin 0 -> 2121 bytes
 site_scons/wxsgen.py         |  45 ++++++++++++++++++++++++++++-------
 3 files changed, 39 insertions(+), 8 deletions(-)
 create mode 100644 platform/windows/License.rtf

diff --git a/SConstruct b/SConstruct
index 7533e0341..5435a7ef0 100644
--- a/SConstruct
+++ b/SConstruct
@@ -917,6 +917,8 @@ if 'msi' in COMMAND_LINE_TARGETS:
     wxs_target = env.Command(pjoin('build', 'wix', 'cantera.wxs'),
                              [], build_wxs)
     env.AlwaysBuild(wxs_target)
+
+    env.Append(WIXLIGHTFLAGS=['-ext', 'WixUIExtension'])
     msi_target = env.WiX('cantera.msi',
                          [pjoin('build', 'wix', 'cantera.wxs')])
     env.Depends(wxs_target, installTargets)
diff --git a/platform/windows/License.rtf b/platform/windows/License.rtf
new file mode 100644
index 0000000000000000000000000000000000000000..6461b9d15c8dbb971a4f1381de06ea97c586ee4d
GIT binary patch
literal 2121
zcmbtVTTk0a6yE1b{D-5yY+Hq_6JWPpo*a8fMsn<|FHj`EIQE!~*6~F41d0&<eZLup
zLQ5qcR*J%CF6TSn<%Ea4)Ab}T+FshPa(6SCo=x*g)V1@F*Q(We-C*J5bt{{^E;mKj
z3+<4n_MH?Rh2rk~5f>&uUYJsHzg?^5{PFSV-9!E<zY(qI3avU?_O%w3)O0pJos6gW
zoK2kb$NW}`yMJX{o#y*;lJAPH%A2CSnK&mW7Qdf-2I}s<lQ$bpAIgt3b)3oZ)R|02
z<Q0vqRoBXbc-w2K_gavuDHY|WRgJp2ACucOWFPm`iC%QKq8b~Vqj$sitKwe{#gn3~
zP}o!5PJx3|?U=H*0(-p?q(!&w4VDMBx}wzNdd}(bms2<ReC9X~-ATQn*EL4=bv91M
zG*`ExYqz4+=u8)~?Wq)<Sv)nY)%P8AtSz42$ewyt>${>8Z_|q*dapaV-Wvu4PPFd@
z0i%bPrLa3|*%sYBLCS4E8ajt%hJo5^+Nw&{va}M62&l9Jd8y$i?K*WUD=hS;(3V=Q
znnvBp_J&FY0S#(zA8m#H`=#*K?1y~UYVl2*DE&VBE7!#ux%z}%e45*4-DoUuxN8v-
zNQHdj#W%e+*B>AAS{|SL>Ew;XH~mP~%5`8_s!Gsy-#<xhTP@ab0Bt^{i&~{+DU3zX
zxPflQ;FmO@o-zNKBg8G6LT*KO2-U9${oEGBf1&tOTadEa!w>`Tb7%jjG2^wVS*dbw
z!e)Imw*LW-6;3+Z7KpPfn*P~O8(;hEMSKSPenl}92+LtK+G1;`(7b+oLPx(C5*RT|
znJHy$9Qrg~3|UrPkFM`&Elix@iXzcg*adQDSZo!33I<6rH<((9!KWGrgS$@?^gZSM
zPLw9*cqC2uI}`ABh<e|f>3<GyH7wHwPbi5l(knM+g!L+pF1gQqnq5=6VB|%s>zL0M
zDJ`PFXK_Mq=wmlbV?N8$2pjL+1TWv)12?=T_H`ArB%vrKzFY+y#ZWzV!<4gRL_G9@
z%;({JL?}RElv2Q#JjJy%8d=cS&nUW}C5ycUs<<;A@buc^UGOwCSQh|uY30T#_p-o^
zX_dvRC}Cu1`8@FgmoJ$=209RlU9vExWZ?$EPb{OWkj19;A1KZkdUR(28-PI4=P~nA
z!{&MAK{&J*AP+0%akF4w86<Gy>(QZR!v4u{35VpnOLxu^`tXJ#u*Az^wlpn6h9sLM
zDNnPM(L9QLt8>EQOYX7coPx+Ge?eKoMnFhi3ycy_3dbNe%Mxxi<6+9;I9sJW3O~Z$
zE2skAE}r^U+$h8!8-pmmHbspFR{IfMEg0efhr>ZB*NBlI6rQp3`!(PpBk40m3fVm1
za~68cG!vO3S3F@K;S@(>b5qfvUb%ooJ^*WSh^B_+i@ZW!_(=SMT>la^{HM!sKH-Oy
TSjD`>LG2e4aP$uU;eY!N=|;6d

literal 0
HcmV?d00001

diff --git a/site_scons/wxsgen.py b/site_scons/wxsgen.py
index 008f1a01e..a72b4d3ad 100644
--- a/site_scons/wxsgen.py
+++ b/site_scons/wxsgen.py
@@ -100,16 +100,45 @@ def make_wxs(stageDir, outFile):
     instdir = Directory(pfiles, 'INSTALLDIR', 'Cantera')
 
     # Features
-    complete = et.SubElement(product, 'Feature', dict(Id='Complete', Level='1'))
+    core = et.SubElement(product, 'Feature',
+                             dict(Id='Core', Level='1',
+                                  Title='Cantera',
+                                  Description='Cantera base files',
+                                  Display='expand',
+                                  ConfigurableDirectory='INSTALLDIR',
+                                  AllowAdvertise='no',
+                                  Absent='disallow'))
+    devel = et.SubElement(product, 'Feature',
+                          dict(Id='DevTools', Level='1000',
+                               Title='Develpment Tools',
+                               Description='Header files and static libraries needed to develop applications that use Cantera.',
+                               Display='expand',
+                               AllowAdvertise='no'))
+    extras = et.SubElement(product, 'Feature',
+                           dict(Id='Extras', Level='1',
+                                Title='Extras',
+                                Description='Demos, tutorials and templates which show you some ways of using Cantera.',
+                                Display='expand',
+                                AllowAdvertise='no'))
 
     # Files
-    includes = addDirectoryContents(stageDir, 'include', instdir, complete)
-    binaries = addDirectoryContents(stageDir, 'bin', instdir, complete)
-    lib_dir = addDirectoryContents(stageDir, 'lib', instdir, complete)
-    data_dir = addDirectoryContents(stageDir, 'data', instdir, complete)
-    demos_dir = addDirectoryContents(stageDir, 'demos', instdir, complete)
-    templates_dir = addDirectoryContents(stageDir, 'templates', instdir, complete)
-    tutorials_dir = addDirectoryContents(stageDir, 'tutorials', instdir, complete)
+    includes = addDirectoryContents(stageDir, 'include', instdir, devel)
+    binaries = addDirectoryContents(stageDir, 'bin', instdir, core)
+    lib_dir = addDirectoryContents(stageDir, 'lib', instdir, devel)
+    data_dir = addDirectoryContents(stageDir, 'data', instdir, core)
+    demos_dir = addDirectoryContents(stageDir, 'demos', instdir, extras)
+    templates_dir = addDirectoryContents(stageDir, 'templates', instdir, extras)
+    tutorials_dir = addDirectoryContents(stageDir, 'tutorials', instdir, extras)
+
+    # Wix UI
+    et.SubElement(product, 'UIRef', dict(Id='WixUI_FeatureTree'))
+    et.SubElement(product, 'UIRef', dict(Id='WixUI_ErrorProgressText'))
+    et.SubElement(product, 'Property', dict(Id='WIXUI_INSTALLDIR',
+                                            Value='INSTALLDIR'))
+
+    # License
+    et.SubElement(product, 'WixVariable',
+                  dict(Id='WixUILicenseRtf', Value='platform/windows/License.rtf'))
 
     # Format and save as XML
     indent(wix)