From 8d46a01d1bc5275d3bf0a096acd6e74864d8776b Mon Sep 17 00:00:00 2001
From: "SND\\rene87_cp" <SND\rene87_cp@7a4bfd9b-e295-4cbd-a51f-ab472bcf69b7>
Date: Wed, 3 Apr 2013 21:30:19 +0000
Subject: [PATCH] Improve the Installer for W8 Fix the Templates for W8 add
 MakeMSI.cmd to create the installer

---
 Installer/anx.wxs                             |  79 +++++++++++++-----
 build/ANX.Framework.build                     |  14 +++-
 build/MakeMSI.cmd                             |   1 +
 .../ModernUI Game (with ContentProject).zip   | Bin 38492 -> 38606 bytes
 ...ModernUI Game (without ContentProject).zip | Bin 31838 -> 31951 bytes
 5 files changed, 72 insertions(+), 22 deletions(-)
 create mode 100644 build/MakeMSI.cmd

diff --git a/Installer/anx.wxs b/Installer/anx.wxs
index 97781080..9f0c6c92 100644
--- a/Installer/anx.wxs
+++ b/Installer/anx.wxs
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"
      xmlns:util="http://schemas.microsoft.com/wix/UtilExtension">
-	<Product Id="{B7ABDA84-7163-4892-9AA1-814C6CDAAF54}" 
-           Name="ANX.Framework" 
-           Language="1033" 
-           Version="$(var.PRODUCTVERSION)" 
-           Manufacturer="ANX.Framework Developer Team" 
+  <Product Id="{B7ABDA84-7163-4892-9AA1-814C6CDAAF54}"
+           Name="ANX.Framework"
+           Language="1033"
+           Version="$(var.PRODUCTVERSION)"
+           Manufacturer="ANX.Framework Developer Team"
            UpgradeCode="{7A54B375-318B-40B7-ABF7-60BB50689361}">
-		<Package InstallerVersion="200" Compressed="yes" InstallScope="perMachine" />
+    <Package InstallerVersion="200" Compressed="yes" InstallScope="perMachine" />
     <Icon Id="ANX.icon" SourceFile="..\media\anx.ico" />
     <Property Id="ARPPRODUCTICON" Value="ANX.icon" />
 
@@ -15,8 +15,9 @@
     <Media Id='1' Cabinet='ANX.Framework.cab' EmbedCab='yes' />
 
     <Feature Id="ProductFeature" Title="ANX.Framework assemblies" Level="1">
-			<ComponentGroupRef Id="ProductComponents" />
-		</Feature>
+      <ComponentGroupRef Id="ProductComponents" />
+      <ComponentGroupRef Id="ProductComponentsModernUI" />
+    </Feature>
 
     <Feature Id="Tools" Title="ANX.Framework tools" Level="1">
       <ComponentGroupRef Id="Tools" />
@@ -31,12 +32,12 @@
     <Feature Id="VS2012TemplatesFeature" Title="ANX.Framework project templates for Visual Studio 2012" Level="1">
       <ComponentGroupRef Id="VS2012Templates" />
     </Feature>
-    
+
     <Property Id="WIXUI_INSTALLDIR" Value="INSTALLFOLDER" />
     <WixVariable Id="WixUILicenseRtf" Value="../doc/license.rtf" />
     <WixVariable Id="WixUIBannerBmp" Value="../media/ANX.Framework.Logo_493x58.bmp" />
     <WixVariable Id="WixUIDialogBmp" Value="../media/Installer_493x312.bmp" />
-    
+
     <UIRef Id="WixUI_InstallDir" />
 
     <PropertyRef Id="VS2010_ROOT_FOLDER" />
@@ -68,13 +69,14 @@
     </UI>
   </Product>
 
-	<Fragment>
-		<Directory Id="TARGETDIR" Name="SourceDir">
-			<Directory Id="ProgramFilesFolder">
+  <Fragment>
+    <Directory Id="TARGETDIR" Name="SourceDir">
+      <Directory Id="ProgramFilesFolder">
         <Directory Id="INSTALLFOLDER" Name="ANX.Framework">
           <Directory Id="TOOLSFOLDER" Name="Tools" />
+          <Directory Id="MODERNUIFOLDER" Name="ModernUI"/>
         </Directory>
-			</Directory>
+      </Directory>
       <Directory Id="ProgramMenuFolder">
         <Directory Id="ApplicationProgramsFolder" Name="ANX.Framework" />
       </Directory>
@@ -178,7 +180,7 @@
       </Component>
     </ComponentGroup>
   </Fragment>
-  
+
   <Fragment>
     <DirectoryRef Id="ApplicationProgramsFolder">
       <Component Id="ApplicationShortcut" Guid="{7A7BEBDF-BE65-413E-A993-8E78311B445D}">
@@ -251,8 +253,8 @@
         </ProgId>
       </Component>
     </ComponentGroup>
-    
-		<ComponentGroup Id="ProductComponents" Directory="INSTALLFOLDER">
+
+    <ComponentGroup Id="ProductComponents" Directory="INSTALLFOLDER">
       <Component Id='ANX.Framework' Guid='{8A3AA04E-9325-441E-B16A-731676449C0B}'>
         <File Id='license' Name='license.txt' DiskId='1' Source='../doc/license.txt' />
         <File Id='anx.framework' Name='ANX.Framework.dll' DiskId='1' Source='../bin/Release/ANX.Framework.dll' />
@@ -302,11 +304,48 @@
       <Component Id='ANX.PlatformSystem.Windows' Guid='{0D0EBDD1-9F95-40CE-B314-7A502BC84A2F}'>
         <File Id='anx.platformsystem.windows' Name='ANX.PlatformSystem.Windows.dll' DiskId='1' Source='../bin/Release/ANX.PlatformSystem.Windows.dll' />
       </Component>
-<!--
+      <!--
       <Component Id='ANX.PlatformSystem.Linux' Guid='{6781BD15-B2DB-41B7-B628-CAF0D95D584D}'>
         <File Id='anx.platformsystem.linux' Name='ANX.PlatformSystem.Linux.dll' DiskId='1' Source='../bin/Release/ANX.PlatformSystem.Linux.dll' />
       </Component>
--->      
+-->
     </ComponentGroup>
-	</Fragment>
+    <ComponentGroup Id="ProductComponentsModernUI" Directory="MODERNUIFOLDER">
+      <Component Id='ANX.Framework.M' Guid='{505f7d0e-7d3b-42ef-8279-3668ba471707}'>
+        <File Id='anx.framework.M' Name='ANX.Framework.dll' DiskId='1' Source='../bin/ModernUI/Release/ANX.Framework.dll' />
+
+        <RegistryKey Root="HKLM" Key="Software\Microsoft\.NETFramework\AssemblyFolders\ANX.Framework for WindowsStore" >
+          <RegistryValue Type="string" Value="[MODERNUIFOLDER]" Action="write" />
+        </RegistryKey>
+
+      </Component>
+      <Component Id='SharpDX.M' Guid='{8918b008-3c96-4b80-be82-48ecd8b64a46}'>
+        <File Id='sharpdx.direct3d11.M' Name='SharpDX.Direct3D11.dll' DiskId='1' Source='../lib/SharpDX/Bin/Standard-winrt/SharpDX.Direct3D11.dll' />
+        <File Id='sharpdx.M' Name='SharpDX.dll' DiskId='1' Source='../lib/SharpDX/Bin/Standard-winrt/SharpDX.dll' />
+        <File Id='sharpdx.dxgi.M' Name='SharpDX.DXGI.dll' DiskId='1' Source='../lib/SharpDX/Bin/Standard-winrt/SharpDX.DXGI.dll' />
+        <File Id='sharpdx.xaudio2.M' Name='SharpDX.XAudio2.dll' DiskId='1' Source='../lib/SharpDX/Bin/Standard-winrt/SharpDX.XAudio2.dll' />
+        <File Id='sharpdx.xinput.M' Name='SharpDX.XInput.dll' DiskId='1' Source='../lib/SharpDX/Bin/Standard-winrt/SharpDX.XInput.dll' />
+      </Component>
+
+      <Component Id='ANX.RenderSystem.Windows.Metro.M' Guid='{46395c9d-1f3d-401d-b1ed-b64d7de6ba8d}'>
+        <File Id='anx.RenderSystem.windows.Metro.M' Name='ANX.RenderSystem.Windows.Metro.dll' DiskId='1' Source='../bin/ModernUI/Release/ANX.RenderSystem.Windows.Metro.dll' />
+      </Component>
+      <Component Id='ANX.InputSystem.Standard.M' Guid='{40fb787b-ef64-4127-97bf-d02c158b6307}'>
+        <File Id='anx.inputsystem.Standard.M' Name='ANX.InputSystem.Standard.dll' DiskId='1' Source='../bin/ModernUI/Release/ANX.InputSystem.Standard.dll' />
+      </Component>
+      <Component Id='ANX.InputSystem.Recording.M' Guid='{cdab1f5b-733c-43d4-9e2f-f9b3ded3da3b}'>
+        <File Id='anx.inputsystem.Recording.M' Name='ANX.InputSystem.Recording.dll' DiskId='1' Source='../bin/ModernUI/Release/ANX.InputSystem.Recording.dll' />
+      </Component>
+      <Component Id='ANX.InputDevices.Windows.ModernUI.M' Guid='{9fef8eac-608a-4875-b1ec-f11e842db709}'>
+        <File Id='ANX.InputDevices.Windows.ModernUI.M' Name='ANX.InputDevices.Windows.ModernUI.dll' DiskId='1' Source='../bin/ModernUI/Release/ANX.InputDevices.Windows.ModernUI.dll' />
+      </Component>
+      <Component Id='ANX.SoundSystem.Windows.XAudio.M' Guid='{a210288b-08e9-4143-9c21-a7ded3140405}'>
+        <File Id='anx.soundsystem.windows.xaudio.M' Name='ANX.SoundSystem.Windows.XAudio.dll' DiskId='1' Source='../bin/ModernUI/Release/ANX.SoundSystem.Windows.XAudio.dll' />
+      </Component>
+      <Component Id='ANX.PlatformSystem.Metro.M' Guid='{c3e6d6c2-31c0-40d9-a3d5-435bd202f853}'>
+        <File Id='anx.platformsystem.metro.M' Name='ANX.PlatformSystem.Metro.dll' DiskId='1' Source='../bin/ModernUI/Release/ANX.PlatformSystem.Metro.dll' />
+      </Component>
+
+    </ComponentGroup>
+  </Fragment>
 </Wix>
\ No newline at end of file
diff --git a/build/ANX.Framework.build b/build/ANX.Framework.build
index 7e9ce6dc..81f8804b 100644
--- a/build/ANX.Framework.build
+++ b/build/ANX.Framework.build
@@ -82,7 +82,7 @@
     <property name="project.anx.metro" value="true" />
     <property name="project.anx.platform" value="Windows 8 / Metro" />
     <property name="build.platform" value="x86" />
-    <property name="build.dir" value="${build.dir}/ModernUI" />
+    <property name="build.dir.base" value="${build.dir}/ModernUI" />
     
     <property name="project.anx.directives" value="${project.anx.directives} WINDOWSMETRO" />
     
@@ -232,6 +232,16 @@
 
   <include buildfile="ANX.PlatformSystem.build" />
 
+  <target name="create_msi_packages_ModernUI">
+    <call target="build"/>
+   <call target="metro"/>
+    <call target="build"/>
+    <property name="build.dir" value="${path::get-full-path('../bin')}" />
+    <call target="winrt"/>
+    <call target="build"/>
+    <call target="create_msi_packages"/>
+  </target>
+  
   <target name="generate_stock_shaders" description="Generate code for stock shaders" depends="build_tools">
     <!-- default windows fileset -->
     <fileset id="stock_shaders" basedir="../shader/">
@@ -306,7 +316,7 @@
         <!--
         <include name="**/*_WindowsMetro.csproj" />
         -->
-        <include name="**/SimpleNoContent_WindowsMetro.csproj" />
+        <!--<include name="**/SimpleNoContent_WindowsMetro.csproj" />-->
       </fileset>
     </if>
 
diff --git a/build/MakeMSI.cmd b/build/MakeMSI.cmd
new file mode 100644
index 00000000..7b7a4b8a
--- /dev/null
+++ b/build/MakeMSI.cmd
@@ -0,0 +1 @@
+MakeAnxFramework create_msi_packages_ModernUI
\ No newline at end of file
diff --git a/templates/VS2012/ModernUI/ModernUI Game (with ContentProject).zip b/templates/VS2012/ModernUI/ModernUI Game (with ContentProject).zip
index 97c0ee3629e28dfdb89fa28af9cc113cb09dd638..8eddbba3563f7cee181913214fb1cd7656cb6e22 100644
GIT binary patch
delta 1700
zcmV;V23z^utOCxh0<f}NfA0lwLLaq(MhON00FoU501E&B090jjbS`6aaB^>I<yr4e
z+ei@qep26IFG5F=YC9o;hT{0-`~y@1C<!emMM9f+9DKFC*6tdTYx`vP;U4K;;dbLS
zu|opsQ7YPgBQvuzznS^Xvflmo?|;nSCxMTyfijPTwL(cR77&CZf8u!IxK@a{t5plX
zTQ7bw&nWp5MjZ7C@!7l7z9Q|L;NsZleN4x|S*=iyJ>MxH;W!k(t~ih07zP_%L4cVa
zcq2*}ak)Msf#JY4_#^^q1Z*gm8QaBTxgY`}WF7?(p&Y5mwZg{BPH*PBHQ^9S0PGC&
ztF6JUA`5P7(76rOe;`3XLOr4+Vg=M7q2uux{?^1}oW0!qI<7aj3dl&XpHZ0=pB_*W
zM>CNSiomWnjwzPGvoMeVkW+4LqFN1YZlZ$Kgkd~3jhs4lc;;j75*jS}O63_hb~tUE
zots9gx^<CM_aOEh>*H>zU2hiaW$pFOUR$f|HOpGn-l>Sce;Vz&ZI|r&&h}^1$gWXt
zPGcU$yg!Y=vZF}A;n)j-wkBX28J)5gCQV@8SXi`)?*O$_y*yy1aaXIBbqV1oH~<#m
z5m*}xyAUN%LLuESjl4k`j4=p?{!}WKEz0TD8b#@29FAi=2Fn4h*)okqv9fM^KG?nh
z96-peozk{xf8<5^TFXkv+A-^6y-~GG?Y6DeTdlHI*)3PJYOz$&+U0WP^<K49+^&~D
z?|*FDtzxCsC~D<msjZbtqA&G!rLGl=jbf$!dau>4H|Bkr`%mNI(FXyyAq(t!Bh29~
zOeI3A4~$>-K@J+GQz6wOcVZf=7tF|Q++}y3@b`23f72a;&N%)lp{OM50=<)+#hO%i
zO=Cf(EN2dS(_lz^W^o#WY2-v%vl$WH*!Pu9mYAmz_X6)Pp~pUx)J=cqXfC$~Yv_f8
z+4_NLWW;j<3I2<`8OI@KR<l(<KiKbg?M7?=q}6X<TsBU-38Qj$YI%!NLc1XMKTEJR
zh`4EFe`U(-J*J`9sE_3?YE?`l_xovD)de3gg9n?H=<n^<tniUDB%wdOuNO%_A83Wb
zwN^8}WgGrS8`d9~ZfCRbg(I*~HsRvwSbRccC9Hk%KfP)i>esrXxX7n&XBC;w8NBNq
z62?W%MNvn<SUSJURA1KHGYT%y@^;<hs;XJZf0Hy<Q90k<C4GAm%0Do5>$P<CQ2)GL
zO-6RITY2or3K!qU$O@o8+sNkHyQFVFz{ozsu0HX|R(Bsgven)1WMr$mKi$Y?+q<N1
zKf=g<UtK-o5G>rA1d;goL`UJsj~%EL4#cN=NguKFx@DP-a6G0sc-TtaI}Fl$fTPeQ
zf0<RLk;iivo*hM#4h}t6d`xFNC*ROI7TQ2*Q=W-My?8k5SbEc88mUBiHL`B!#0WFs
z<uwb0Tz&TIBYCfp!oFj?^izNRBvq`rKUpr$2FGMf^e7ysp6)U21=#n$#6I#dyXuW7
zK)CJ_PADvfcsRMPWF>^7Ou6in3%xD)e*-s!e#rFg&<m3-VB=*M#vbEz`sVO$>yOLh
z(}sO~*|8gkM<=a8kGT8>Q<&cr4s^LMq#keCmfUc$K`tH=gNojJp+j!iETyfST6g4L
zev2d}%xxAAq;(XEZLA5`o)~FeMbSG%zzENe3TSz*-#FKMF@BBwds8M@p!dYKf9zoD
zJg2l5pgl6%bl+EAJHRP<CfP27_Q-6z5Q^x^p$hn{a$XJak(u{M96AerFYMUyo=fJd
z0j`z#on8FiYs_~Zi?QG1(tY}BlRkzJy4vD5pYNm1Qb{jnt~QsLTGGTcmT6wBJlCxI
zo;5GJs?!Ay{K55d%yaA8s)`*_f3DCQy(>&3ohJ`-_rFbvlUai0T0U5)|F1I%P#q?K
z1YCu@>Cr7?>Dj|H@@`g^;#W;WeS!kwc<vNUNlek~`42_OLGu;Dj+4kaW*?9z%Hsf%
z2O8oceg#M+g@)jh8zgp06o(@c$mbU1aUG?MN2kJ?A|}q)KBfrLQlp3nG`=w*5JT_^
zF#vSuQBTFtXONR~Gm@`FwL%?SqB2#Fl}6@Vowv1J4s?~Nrpd?E^yS9-53^`u0WuaJ
z02BZK00;o@1#m(iwSh(n1^@t(9g}~QD;GUB`E=JI&H+ZEnq$`?&H+ZEnq$`?&Xd8E
uD*@V*?UY>tmwJ;ydKZ&pl}-X^gp;$CSptTOlQ4@ElOmQh2GoxL0000x@<Imy

delta 1594
zcmV-A2F3Z#tpePv0<f}Nf7hCDL5aiBz?TI8067@|01E&B090jjbS`6aaB^>I?OEGy
z(?Ae?N8%rr2vI6wJ841*)HTY@P(h(eQs5yH+Qj43VDDPH>ymK!G9LIOet~hk&OIa*
zAaScyC7zv`9nU$lmQTKZ{$f8IMIpHaAp_2i3njByAixIP3)t|ue~>8Os1_bN*RR=U
zg1>=*B3;fy`6BnPr2b9tX%ea~6+=++xKK}m&?^v3%<$?$srZ3q$-xCgRGLvR5L|L!
znFAhK9$Z4mV-Qv(`)QbUP%M@UxFI3-NfdLTh~D|QaP#(QXOg=$Qozyz<QY{L`@QMH
zd~y4|)9F?X9z~p)f3e`PERY6gUZ5uRw?=_f^7h`(NxipUAXZlUnMm(SjUNe~#1j)5
zabrIiCW5A$&zC{4fQ7~VJ#u_Z_V!4@X+l34+SbByp71QB%I6|l&XwEe($v_vadvK7
z`I1hN<N7EGJm<q<$*nhw^|EpA?tRy&+;5hRYVB?Xzct)?f2~%k)$bmB!W^@hJk9e&
z#fj>UV{mG5jO8dAFc7T~*w$<<_ePf{$Y6*bE)P8rj_y|g(zaGs^RPDO>KTnd#&iJA
zO-X%-vr-sZZ`#(p!)!AtA?k-?Tv!`4w?2*0lzvLtFrh<mJTRIq+gdbFz1<*$T8ITl
zz?5^hbYNQxf2PG=PdbtIPC6gzjcTprx;3NTYL$)3VYy;di=~R;mdllU_p7DiLB0Ix
z=!08p6)UYq(I^*7u2Cu>E_Jt3H;TnZvEtsl-*W4XDK4}8(|zgSEtcCz8|()Is^AHX
z(+Zs~NcFl4>7Y?DMynb7BTTd@AS1W6$nI6bf1leQe^&@P;rPdlqDa<ddS@q#GpZiq
z)(f`WbCRGlj`}#HjuHv7Zr-%uHX)*)grWACC+7251yS%G*J&s*Nq)UZ^YmzN`T^@r
z;(O>eGtUTw{Kxy2iZUggW~+Yw=&0MSHCji{T3z?m>&EjoGHS^$4{r&<MH|xd&q20E
zv9hf>e_QVMk_v_g_0#kebt<+sfBlP~YC{NA!d9@d^<}(Pfr!06XW{reSfqGvheFr2
z6Bxfa3_GBp2c~_xSGeK`EVT_&{5lpt<7p?HBYdV;Z7aLlc@&q3gN1G))47BfoyS}%
z>^U}d08-}jySj8$Y|jMvAj${zK<Tc|S$++;f11h}yqj_RHI&~lbytH_5A}akS4MVp
zSozVB#T0+W$YP=Y3b=X{Gk7=S_BV{|KZL3t+3MjBk8Jhu4;k6&;lBc|9>oma&A9y)
zBl~BedZHj&)J<>)eEB3NY!D_M92Xwpt9r>CNR(SP`e5RrpwV_OtvmE`9pHrdJd4sL
zf9iTx%bTegqf^QPA77?tne{ugNpUsOs~OKGL7k*OK`d7~Y)f16tk!(m88O&g@u|#$
z@`8TtHwQ6((PghXuYJ|u{U-HZvwUg0l<Ym_LvF@wh?%yzb|M;vSMiTSDla+%0l;<*
zQCvX2#qKxPPFabvC(I>$_R4ex^6VWKe{V6<7S|JoM?(`X0~{0cWxzcCPMW72#VdAx
zvSWB>EU_@NgC~VYg||H_A88$U3QF+pQEgyYRu+?&x@&BQC(K(4eN{`mfG;+Cmoqw5
z8(su5p<zd*88UHoCVg_T+2dBIj>ujK<?1;FVvVbly4cp5m37C@6=mnC2;9@He|SZs
zuy?t>=9%}japxyy8euj%7gWTi%JlOM67uXw&1$(!bwxb}6AK6vMnJG!U3oJQ`_|ec
z!nPLDY;MI3!$85GMEG-nKPF?I2r^OWNt`_o?hxvEnO#x&mIT-y4+v-Y?-O+aMBfzY
zqs;$~AhAip1}K@Q!y71*;5OOcL38vLMB-yGq=G=+Y7+B+VLYTl{T(6!$cpx^_b?|V
zXOB0Min;hp1o&LvX+htme*CTa)_etGldECi$5dc-z5%n^VgWK1KL8W}000O8*P3ua
ziNn#rmjwU-IT@4jlq((p-z{J##LWQ!-z{J##LWQ!-z{J##LWRvO928u0F&Ng7!4!<
s00000001HY003x{UzJ?}C6m3CW&-wulO>i}0Th#emPrO;j{pDw0ORNUd;kCd

diff --git a/templates/VS2012/ModernUI/ModernUI Game (without ContentProject).zip b/templates/VS2012/ModernUI/ModernUI Game (without ContentProject).zip
index e6c032756d56dc7869d13c0e37bbef0a23d49003..566ae7bce4f74eef1c0d4d15b0b9b3ff7e1f65fa 100644
GIT binary patch
delta 1606
zcmV-M2D$m(_yN!P0kDHxfA|G(LZsLq2D$|R0K*&r01E&B090jjbS`6aaB^>I<yr4;
z+DH)pe$u_eo)ujhsn`&>ls3i{5R;&WBm&arB&2A;W8$m5YwfNRxVBGrAMTOv6>b;X
z#O6;zl|)L~FG!x5o%zkoZx(y^zkmKU-%kP`T?6ADB{i+27c~TAe?%RRjB8pX+(K1*
zZ~gj<dB*5pFcPRwsn0*A_7!D+04|Pv(Z_5Ig4eW0<oS+<q+=qVu7n8R83rF+L4dg)
zcq2wRb%j2nf#JY4_%sA&1bnEL8N0<|S(5<~GTT8&nLtV8nzr?-)0_FWCjy89z|XL_
z+8N9hS#Udp&OB6;e+B_1ddO(VHPocU@x%<jJ@L5UueKk@_4ba2j2QbFQ(1}WA)`?^
z6G@>A?0VyfVHG?J14#fm<<2&$)zJ1f(yRj*Mq|^+sZ)n%J{B%z!J@BJo^ewr)8^T^
zX{4&Ti@3Unk>^-jWBFU!GL5V-u{(`K7>WKg1gjo~GM>O5e*tDsz%(+t#9Eph0Qbhy
zqD6fNn3WX718y42+GJUmQgMO<;2|D?wZ*XuVGM;xsRWicNP}?>!O)*7#i~U)eX=Iu
z>@g<e2#>*Xpm1QD#-cc}Zh1b`eF-=KBCJ13yQYyB<%_8*p=!siFO6okUTU@Kg@$dH
z3zfZcrBE%Fe=3Dmxm<bkwpuFgHp<`jzqIOhv0^uig>tdfDwIkG<wB!XX%vdZX0g(G
z^VV)Pn%_)g$$uIbk3LJdO;upm8({$-V5$&Wec<A<4{DMyn@Xu3x)ak_zhK5*W0}5r
zM&C`|uS*P^k@#!OLB+-e{>EE}HL32I#)2%doH^)Ce}f_Qxg}TxrjZk6&1OV&Bi~PK
zvcx<Mg%@~#OFj0vqHg+}qq&-WYv_@|Z2iDAGU8hTN&d^cxxhql>%eZDAMW?N^`^al
zV)t7Ym(9~|%&44QvfO5jvM#6%&XQ~mLSY(NSz`7HGa`55W3^3M71PK)KTWH;-~;Ax
zZ?j_kf1UlB6+U!^l=#!TdJ*^Yo>nBdHfqKbwc)Yau=&7rJKNfKj=)0Mq>HCx@d;Ix
zu=eGjcGWbJr%gw3kx$*uIx?Me_}Dw5T*#WsqK<&`bbeQ<zOT1u3|wI4-G(QUs%9lm
z(%gi~`Sz~p+mlfKo~hfcrR#_K=k01dvXi~ae?v!Bx_B8QD}nxOBb#gQioX2-Bl~z=
zeJLYb-FxuJR`*`W$X54$x{=MccSYZRgpqw&U2O{p77j*&P=0)(HW~Sm12yeXeyW%B
z5l_!kR@q3$V}^tKt&($xL3$3*CN9maGL1Z*Wq9>4oOCepT=_Ab@f?3c>sV@oM4R$V
ze=h1p!&%4DlMd5JC5cxf>-LryBm;is*ZbzU)hP{-3}jUS!3W25O!bhAQ%`r8_5$qt
z-(w&8m|yiq41jF9L{J8cA?{DEtB3|<lqpyJ<U(&rO27?epEIpE@<=?@Td%q>_PAiv
zcSj%WKQE6@oAu+%PQ7{5KCuTq>WUl8f8h3XZ=kDDPd&~F6dzjgK`tJWvxh!;#GyBQ
zmeNj6tvhOao+C*)Fwa6s?ntXm<j!;e*PfhGJ&B@ssDwez+ZuWnx!#HKG4k(CxnzOf
zlRK@0ne&{|UV!$%Y}2hg@!A2w=rhT76|@It+XW({Ck~T<&noBj03Vonk4D5<fAD)z
zj~ws0WWFBYMwu_|;&+}*e)M>R{hm<n)0>v`0)w*k7Qg#qA8nUPdNFfaxx&;^CZ@4U
zv;I|O(>ti!q9=8_z=1!wUXA(IdR|qzL#h>evv-AAsEhbAZT@%oTcLpZ6b01r+$oyU
zh@shi84BYUx7P?ePAnIge@33fWaa=;Zxhr-;tEjW5e>noH%M+%C?X>osOt;l2_2<$
zL#NW3AuiuneasM~d7_ZYW^*Z!41A3^09v{QOJe9V$nkq9QnxNOtpSo>5Z??Y)y}-9
z=56b)0JhGwP*As#=}n0BKeOv#-We7j02BZK00;p11#m*7*dGSE1polU9FyOAD;F{H
zlYrMD&H)8wpJUe{&H)8wpJUe{&XXZ~D*{|$lTLeO0xfHkwR>3tOLCJCd`JeFb^rhX
E0Fc2KO8@`>

delta 1524
zcmV<Q1q=Gm`2pVe0kDHxe@$6#LC%>Y%}E6S0BRTj01E&B090jjbS`6aaB^>I?O5Ax
z(?Ae?N8%rr2oaF5osduhb&PU_2ntn_LLVZbO*~Ew_O7+NE(w<}<AG1&7Z~3XCuvA3
zsKl*OTV>|V>}2N5T0Y;td^I1>e2<)ikS=HSLRl{r2(SsaT{f*3e?sMGwZdcT`Ze=d
z@V78gWXQQEUuF1egl~gGLr)E<n1Yh^LNjzdyFf58!%t^Q1&<6vPR_umQup17;F3E^
zpK#x>;T$|3fG~VHj>3$4rBbDU2NGiT{D2EZ(v$0jo41b!aqiAc0gDQd$5fr&87&<7
z;_i%&7Du(X?{lUHe}V_HKw6yHu8QmL%v`DD?c%RVUA$8uMpFB+h`yDYKM_0(ViOwi
zV8@+?f<}ku%OF_5it|p9)a#^JBn7Jt<8W#kEAA}eu}77|g}<IFv**$@*t~UoVj7t%
zO_9y@N$A?v%_;sZ-$c;TnBiWADhSnZ9)Q&d0z6Mqmx1Waf50@Bz6_0!Hb{4hh%WbR
z5LVg{7o=%yc(brR=jsLZK?ZaJ)=fzr2$E75TCuP^V0oC7;E%mIIxY;#`4=%MXP;9x
z4e1mt8?<)EG*-<Ebl3Hu;bFl(FlF5@-!qLB(`qy0PDH(v*2iY6)+l$o4XxSfRJ7_r
zrK;6R<*L@Le^jau9@fgGd(Fz{!;jrYr&R5<N?N5<?rP<7yP`F_)uvV|wMy0QgNL1N
zv-R0D*7GmUrIUA9ZYyfA<4&l8XE2W{w1yznn;}G-M8zDfdf?13(YAnuy~ZkiHyQn7
z@_yQ2U`*mq2?vpl>-<fw4r^9Bz@t}e88S{VnEPYge?m)%5LuTut-xX;I-%#Km^?9G
z2Fmr_59p_!#3b40Rhmb;Z;f3xisMHJTbh>yLjL3TmWnbZt#+q*^5k&XZ?rmxFFM2S
z>6_NeJ~C<zmxXtP;Gz%F1!o~!{Xm&U&X&PmQ^D{iejZ(uR@F4}pRZ_Ceei%v*g34k
zzdo<ce?bKHm@{wwgIPrL+&zl4uDyown~!0SDWnV2KPnb3xdLl#!xUG?;uk#Xgms7y
z?V4#MpY~qGHR52Q+sJex;nm<NmkN81O`U+0+5T?2E<4*}0S<`Dy{4<uuI4OPGu)KQ
z$#}QV?P@5$W$P|C(sZf+PjzEuX9v}vU0F==e`l;L7W%IYH(kYKyxZsYH>~VGG}Uxv
zYX?8QvbBRhWMyjy|H^RFRZPaaeQtln%KlkX?J4kAg%LafUp`5XO}x;Cdf^Gas+aYN
zL_K9I1`|&O^>?FE-C>mJ06pgLBq}X2t!J~mrJ6B2qRe&hWqO%8eTUX5di~U!@GK4*
ze}v<BVwuum8mT4AYUI-{iNSKkU-<UEf8CKv11wi^)Bz<&&-s+=0h?l`UC@C~J?}F3
zz@zePFcAQ3-w?$GWJm1(<@yoPP^yGn!WXA{S0HuXbMX!{?SS?eZhITfU1Yxg+GRF>
zFZCmidK5e9?HN9pODs$u;PTs4*t?^$e=SV|k3b2&JE{*1%SvLhQumD=@Q~SSp{I?|
zcKK?v_qlc>0pXP^L+TAwlpzsBmvSW++Yz@sbx4Y3l$dj(!Ua$(f|$kyo{MgjOG?EH
z;dYd^;*|Q{==|cEm*_>~PI`J2p|=KSR0O(;@7m>6azoQlAtyfS=gyqWc_>IMe`}K<
zxnJ)RYTJojQTdLzSep%mGyHXkIs=ksBxBUY-xFjN3E2cS=4f+Vr4u|R`FV+GK_os_
zJSqre-;)H~Wf%{UvVE6G0J0%gr)TJK$;sn_MB*q)_u$|%CIWui?euZ7iETIv#5Sm=
z;lG7oX?+J!O9KQH000080LhhYvuR<`85TbP6aWAK2mno4Zb8nOBh5(#003$jlTdpr
z9sm_2L{P%b0RR;wL{P%b0RR;wL{P%b0Z>Z;0zUwgU||>zBme*a00000AOHXW>tK_=
adu0N=YLg~>SpwQ|lYx9l1}Js_0001E9oPQ=