From: Jeffrey Altman <jaltman@mit.edu>
Date: Wed, 8 Dec 2004 10:19:57 +0000 (+0000)
Subject: wix-update-20041208
X-Git-Tag: BP-disconnected~98
X-Git-Url: https://git.openafs.org/?p=openafs.git;a=commitdiff_plain;h=e8e9a297bc92f40ff03a468b64e8f0b5c930fa6c

wix-update-20041208


Add new Property for StoreAnsiFilenames

====================
This delta was composed from multiple commits as part of the CVS->Git migration.
The checkin message with each commit was inconsistent.
The following are the additional commit messages.
====================

Add property for StoreAnsiFilenames
---

diff --git a/doc/txt/winnotes/msi-deployment-guide.txt b/doc/txt/winnotes/msi-deployment-guide.txt
index 70c6c27..2ee9046 100644
--- a/doc/txt/winnotes/msi-deployment-guide.txt
+++ b/doc/txt/winnotes/msi-deployment-guide.txt
@@ -83,6 +83,9 @@ OpenAFS for Windows
     (Network provider):
     [HKLM\SYSTEM\CurrentControlSet\Services\TransarcAFSDaemon\NetworkProvider]
 
+    (OpenAFS Client):
+    [HKLM\SOFTWARE\OpenAFS\Client]
+
     The configurable properties are as follows:
 
     AFSCACHEPATH
@@ -211,6 +214,12 @@ OpenAFS for Windows
 	Registry value	: SMBAuthType
 	Valid values	: '0','1' or '2'
 
+    STOREANSIFILENAMES
+
+	Registry key	: (OpenAFS Client)
+	Registry value	: StoreAnsiFilenames
+	Valid values	: '0' or '1'
+
     USEDNS
 
 	Registry key	: (Service parameters)
diff --git a/src/WINNT/install/wix/feature.wxi b/src/WINNT/install/wix/feature.wxi
index d786b2d..cb35995 100644
--- a/src/WINNT/install/wix/feature.wxi
+++ b/src/WINNT/install/wix/feature.wxi
@@ -35,6 +35,7 @@
 				<ComponentRef Id="rcm_Client" />
                 <ComponentRef Id="rcm_ClientCacheSize" />
                 <ComponentRef Id="rcm_ClientCachePath" />
+                <ComponentRef Id="rcm_StoreAnsiFilenames" />
 
 				<ComponentRef Id="cmp_CommonDir" />
 
diff --git a/src/WINNT/install/wix/property.wxi b/src/WINNT/install/wix/property.wxi
index d3edf9e..3dfb8b0 100644
--- a/src/WINNT/install/wix/property.wxi
+++ b/src/WINNT/install/wix/property.wxi
@@ -26,6 +26,9 @@
 	<!-- empty property
 	<Property Id="AFSCACHESIZE"></Property>
 	-->
+	<!-- empty property
+	<Property Id="STOREANSIFILENAMES"></Property>
+	-->
 
     <!-- Add/remove programs -->
     <Property Id="ARPCOMMENTS">$(var.ProductComments)</Property>
diff --git a/src/WINNT/install/wix/registry.wxi b/src/WINNT/install/wix/registry.wxi
index c7de6c1..1fd0dba 100644
--- a/src/WINNT/install/wix/registry.wxi
+++ b/src/WINNT/install/wix/registry.wxi
@@ -134,6 +134,10 @@
         <Registry Root="HKLM" Key="SYSTEM\CurrentControlSet\Services\TransarcAFSDaemon\Parameters" Name="CacheSize" Type="integer" Value="[AFSCACHESIZE]" Id="reg_Full_Client17" KeyPath="yes" />
         <Condition>AFSCACHESIZE &lt;&gt; ""</Condition>
     </Component>
+    <Component Id="rcm_StoreAnsiFilenames" Guid="EAC84AD6-CF90-4b28-AF32-6F96DF55C3C4" Transitive="yes">
+        <Registry Root="HKLM" Key="SOFTWARE\OpenAFS\Client" Name="StoreAnsiFilenames" Type="integer" Value="[STOREANSIFILENAMES]" Id="reg_Full_Client18" KeyPath="yes" />
+        <Condition>STOREANSIFILENAMES &lt;&gt; ""</Condition>
+    </Component>
     <Component Id="rcm_Documentation" Guid="97493526-4A5C-4C55-A1D6-EA38841B1B85">
         <Registry Root="HKLM" Key="SOFTWARE\TransarcCorporation\AFS Supplemental Documentation" KeyPath="yes" Id="reg_Docs2" />
         <Registry Root="HKLM" Key="SOFTWARE\TransarcCorporation\AFS Supplemental Documentation" Action="createKeyAndRemoveKeyOnUninstall" Id="reg_Docs" />