wix-20040623

1. We are packaging debug symbols for all builds.  In a checked build the default is to install debug symbols while on a
free build debug symbols won't be installed unless asked to.

2. Change impersonation level for loopback installation.

3. Change UI to allow for ActionData messages during the long wait while the loopback is installed.

4. Add templates for displaying ActionData.

5. Parameterize language resources.

diff --git a/src/WINNT/install/wix/config.wxi b/src/WINNT/install/wix/config.wxi
index a01c389483d3fcc4aa2850dadbae64f8092aa886..fe091ef0f4a21116f5d86aa4a0080639f88aef10 100644 (file)
--- a/src/WINNT/install/wix/config.wxi
+++ b/src/WINNT/install/wix/config.wxi
@@ -95,6 +95,12 @@
         <?error AFSDEV_BUILDTYPE is not set in the environment.?>
     <?endif?>
 
+    <!-- We are including debug symbols anyway.  Undefine this for a leaner installer witout debug syms. -->
+    <?define DebugSyms?>
+    
+    <!-- Use the afsloopback.dll instead of instloop.exe -->
+    <?define UseDllLoopbackInstaller?>
+
     <!-- Note that if the follwing file does not exist, the build will fail -->
     <?ifndef CellDbFile?>
         <?define CellDbFile="CellServDB"?>

diff --git a/src/WINNT/install/wix/feature.wxi b/src/WINNT/install/wix/feature.wxi
index aa6918a3c512029f295a01d2e97267f68273fe70..7a5653755772442af3e481d12c231f9b7cb040eb 100644 (file)
--- a/src/WINNT/install/wix/feature.wxi
+++ b/src/WINNT/install/wix/feature.wxi
@@ -1,5 +1,18 @@
 <?xml version="1.0" ?>
 <Include>
+
+               <?ifdef DebugSyms?>
+                       <?ifdef Debug?>
+                               <?define DebugSymFollowParent="yes"?>
+                               <?define DebugSymLowLevel="30"?>
+                               <?define DebugSymHighLevel="130"?>
+                       <?else?>
+                               <?define DebugSymFollowParent="no"?>
+                               <?define DebugSymLowLevel="130"?>
+                               <?define DebugSymHighLevel="130"?>
+                       <?endif?>
+               <?endif?>
+
         <Feature Id="feaOpenAFS" AllowAdvertise="no" Absent="disallow" ConfigurableDirectory="AFSDIR"
             Description="$(loc.StrAFSProdDesc)" Display="expand" InstallDefault="local" Level="30"
             Title="OpenAFS">
@@ -20,9 +33,9 @@
                                        <ComponentRef Id="cmp_credsStartup" />
                                </Feature>
                                
-                       <?ifdef Debug?>
+                       <?ifdef DebugSyms?>
                                <Feature Id="feaClientDebug" AllowAdvertise="no" Description="$(loc.StrAFSClientDebugLongDesc)" Display="expand"
-                                       FollowParent="yes" InstallDefault="local" Level="30" Title="$(loc.StrAFSClientDebugDesc)">
+                                       FollowParent="$(var.DebugSymFollowParent)" InstallDefault="local" Level="$(var.DebugSymLowLevel)" Title="$(loc.StrAFSClientDebugDesc)">
                     <ComponentRef Id="cmp_ClientProgramDebug" />
                     <ComponentRef Id="cmp_CommonCommonDebug" />
                     <ComponentRef Id="cmp_ClientCommonDebug" />
@@ -44,14 +57,12 @@
                 <ComponentRef Id="cmf_afsprocmgmt_DLL" />
                 <ComponentRef Id="cmf_afs_config_EXE" />
 
-                <?if $(var.Language) = "en_US" ?>
-                    <ComponentRef Id="cmf_afs_nt_HLP_en_US"/>
-                    <ComponentRef Id="cmf_TaAfsAppLib_1033_DLL" />
-                    <ComponentRef Id="cmf_afscreds_1033_DLL" />
-                    <ComponentRef Id="cmf_afs_config_1033_DLL" />
-                    <ComponentRef Id="cmf_afs_cpa_1033_DLL" />
-                    <ComponentRef Id="cmf_afs_shl_ext_1033_DLL" />
-                <?endif?>
+                <ComponentRef Id="cmf_afs_nt_HLP_$(var.Language)"/>
+                <ComponentRef Id="cmf_TaAfsAppLib_$(var.LanguageCode)_DLL" />
+                <ComponentRef Id="cmf_afscreds_$(var.LanguageCode)_DLL" />
+                <ComponentRef Id="cmf_afs_config_$(var.LanguageCode)_DLL" />
+                <ComponentRef Id="cmf_afs_cpa_$(var.LanguageCode)_DLL" />
+                <ComponentRef Id="cmf_afs_shl_ext_$(var.LanguageCode)_DLL" />
 
                 <ComponentRef Id="cmf_afsshare_EXE" />
                 <ComponentRef Id="cmf_libosi_DLL" />
@@ -101,14 +112,12 @@
                 <ComponentRef Id="cmf_TaAfsAppLib_DLL" />
                 <ComponentRef Id="cmf_afsprocmgmt_DLL" />
 
-            <?if $(var.Language) = "en_US" ?>
-                <ComponentRef Id="cmf_afseventmsg_1033_DLL" />
-                <ComponentRef Id="cmf_afsserver_1033_DLL" />
-                <ComponentRef Id="cmf_afssvrcfg_1033_DLL" />
-                <ComponentRef Id="cmf_TaAfsAppLib_1033_DLL" />
-                <ComponentRef Id="cmf_afs_nt_HLP_en_US" />
-                <ComponentRef Id="cmp_Lang_en_US" />
-            <?endif?>
+                <ComponentRef Id="cmf_afseventmsg_$(var.LanguageCode)_DLL" />
+                <ComponentRef Id="cmf_afsserver_$(var.LanguageCode)_DLL" />
+                <ComponentRef Id="cmf_afssvrcfg_$(var.LanguageCode)_DLL" />
+                <ComponentRef Id="cmf_TaAfsAppLib_$(var.LanguageCode)_DLL" />
+                <ComponentRef Id="cmf_afs_nt_HLP_$(var.Language)" />
+                <ComponentRef Id="cmp_Lang_$(var.Language)" />
             
                 <ComponentRef Id="efl_Readme_TXT_$(var.Language)" />
 
@@ -130,9 +139,9 @@
                 <ComponentRef Id="cmf_upserver_EXE" />
                 <ComponentRef Id="cmp_Server_Program" />
 
-            <?ifdef Debug?>
+            <?ifdef DebugSyms?>
                                <Feature Id="feaServerDebug" AllowAdvertise="no" Description="$(loc.StrAFSServerDebugLongDesc)" Display="expand"
-                                       FollowParent="yes" InstallDefault="local" Level="130" Title="$(loc.StrAFSServerDebugDesc)">
+                                       FollowParent="$(var.DebugSymFollowParent)" InstallDefault="local" Level="$(var.DebugSymHighLevel)" Title="$(loc.StrAFSServerDebugDesc)">
                                        <ComponentRef Id="cmp_Server_Program_Debug" />
                                        <ComponentRef Id="cmp_ServerCommonDebug" />
                                        <ComponentRef Id="cmp_CommonCommonDebug" />
@@ -167,24 +176,22 @@
                                <ComponentRef Id="cmf_TaAfsAdmSvr_EXE" />
                                <ComponentRef Id="cmf_TaAfsAccountManager_EXE" />
 
-            <?if $(var.Language) = "en_US" ?>
-                <ComponentRef Id="cmf_afseventmsg_1033_DLL" />
-                <ComponentRef Id="cmf_afsserver_1033_DLL" />
-                <ComponentRef Id="cmf_afssvrcfg_1033_DLL" />
-                <ComponentRef Id="cmf_TaAfsAccountManager_1033_DLL" />
-                <ComponentRef Id="cmf_TaAfsAppLib_1033_DLL" />
-                <ComponentRef Id="cmf_TaAfsServerManager_1033_DLL" />
-                <ComponentRef Id="cmf_afscreds_1033_DLL" />
-                <ComponentRef Id="cmf_afs_config_1033_DLL" />
-                <ComponentRef Id="cmf_afs_cpa_1033_DLL" />
-                <ComponentRef Id="cmf_afs_shl_ext_1033_DLL" />
-                <ComponentRef Id="cmf_afs_nt_HLP_en_US" />
-                <ComponentRef Id="cmp_Lang_en_US" />
-            <?endif?>
-
-            <?ifdef Debug?>
+                <ComponentRef Id="cmf_afseventmsg_$(var.LanguageCode)_DLL" />
+                <ComponentRef Id="cmf_afsserver_$(var.LanguageCode)_DLL" />
+                <ComponentRef Id="cmf_afssvrcfg_$(var.LanguageCode)_DLL" />
+                <ComponentRef Id="cmf_TaAfsAccountManager_$(var.LanguageCode)_DLL" />
+                <ComponentRef Id="cmf_TaAfsAppLib_$(var.LanguageCode)_DLL" />
+                <ComponentRef Id="cmf_TaAfsServerManager_$(var.LanguageCode)_DLL" />
+                <ComponentRef Id="cmf_afscreds_$(var.LanguageCode)_DLL" />
+                <ComponentRef Id="cmf_afs_config_$(var.LanguageCode)_DLL" />
+                <ComponentRef Id="cmf_afs_cpa_$(var.LanguageCode)_DLL" />
+                <ComponentRef Id="cmf_afs_shl_ext_$(var.LanguageCode)_DLL" />
+                <ComponentRef Id="cmf_afs_nt_HLP_$(var.Language)" />
+                <ComponentRef Id="cmp_Lang_$(var.Language)" />
+
+            <?ifdef DebugSyms?>
                                <Feature Id="feaControlCenterDebug" AllowAdvertise="no" Description="$(loc.StrAFSCCDebugLongDesc)"
-                                       Display="expand" FollowParent="yes" InstallDefault="local" Level="130" Title="$(loc.StrAFSCCDebugDesc)">
+                                       Display="expand" FollowParent="$(var.DebugSymFollowParent)" InstallDefault="local" Level="$(var.DebugSymHighLevel)" Title="$(loc.StrAFSCCDebugDesc)">
                                        <ComponentRef Id="cmp_Control_CenterDebug" />
                                        <ComponentRef Id="cmp_ServerCommonDebug" />
                                        <ComponentRef Id="cmp_CommonCommonDebug" />
@@ -212,9 +219,9 @@
                                <ComponentRef Id="cmp_SDK_Lib" />
                                <ComponentRef Id="cmp_SDK_Lib_Afs" />
 
-                       <?ifdef Debug?>
+                       <?ifdef DebugSyms?>
                                <Feature Id="feaSDKDebug" AllowAdvertise="no" Description="$(loc.StrAFSSDKDebugLongDesc)" Display="expand"
-                                       FollowParent="yes" InstallDefault="local" Level="130" Title="$(loc.StrAFSSDKDebugDesc)">
+                                       FollowParent="$(var.DebugSymFollowParent)" InstallDefault="local" Level="$(var.DebugSymHighLevel)" Title="$(loc.StrAFSSDKDebugDesc)">
                                        <?include runtime_debug.wxi?>
                                </Feature>
                        <?endif?>

diff --git a/src/WINNT/install/wix/files.wxi b/src/WINNT/install/wix/files.wxi
index c6c9b4f7829d9ed66dd1b5549fbb22e0e030e59d..28c7498963c559ce50b1bed253dd324e48454099 100644 (file)
--- a/src/WINNT/install/wix/files.wxi
+++ b/src/WINNT/install/wix/files.wxi
@@ -52,7 +52,7 @@
                     <File Id="fileafs_config_EXE" Name="afs_cfg.exe" LongName="afs_config.exe" KeyPath="yes" DiskId="1" src="$(var.ClientDir)\afs_config.exe"/>
                 </Component>
                 
-            <?ifdef Debug?>
+            <?ifdef DebugSyms?>
                 <Component Id="cmp_ServerCommonDebug" Guid="4132C211-5577-48DE-9C66-214EEC0E6BC4">
                     <File Id="fileafsbosadmin_PDB" Name="afsbosad.pdb" LongName="afsbosadmin.pdb" KeyPath="yes" DiskId="1" src="$(var.ServerDir)\afsbosadmin.pdb"/>
                     <File Id="fileafscfgadmin_PDB" Name="afscfgad.pdb" LongName="afscfgadmin.pdb" DiskId="1" src="$(var.ServerDir)\afscfgadmin.pdb"/>
@@ -152,10 +152,35 @@
                                        <Component Id="cmp_VC1310mfc71u" Guid="846BF4DC-14D3-4FFE-97EA-A5C17F5B667F">
                                                <File Id="filemfc71u_DLL" Name="mfc71u.dll" LongName="mfc71u.dll" KeyPath="yes" DiskId="1" src="$(var.SystemDir)mfc71u.dll" />
                                        </Component>
+                                       <?ifdef DebugSyms?>
+                                               <Component Id="cmp_VC1310msvcr71PDB" Guid="1EB72EAB-1129-4DA3-9CF2-26B3E4FB7A31">
+                                                       <File Id="filemsvcr71_PDB" Name="msvcr71.pdb" LongName="msvcr71.pdb" KeyPath="yes" DiskId="1" src="$(var.SystemDir)msvcr71.pdb" />
+                                               </Component>
+                                               <Component Id="cmp_VC1310msvcp71PDB" Guid="1A89DE42-0C88-49AE-A1F8-A7E66EE2D8AB">
+                                                       <File Id="filemsvcp71_PDB" Name="msvcp71.pdb" LongName="msvcp71.pdb" KeyPath="yes" DiskId="1" src="$(var.SystemDir)msvcp71.pdb" />
+                                               </Component>
+                                               <Component Id="cmp_VC1310mfc71PDB" Guid="F95968F4-49EB-4AAE-90F1-34FB6D972D92">
+                                                       <File Id="filemfc71_PDB" Name="mfc71.pdb" LongName="mfc71.pdb" KeyPath="yes" DiskId="1" src="$(var.SystemDir)mfc71.pdb" />
+                                               </Component>
+                                               <Component Id="cmp_VC1310mfc71uPDB" Guid="B0184770-5285-4CFA-910A-D4531AE0043C">
+                                                       <File Id="filemfc71u_PDB" Name="mfc71u.pdb" LongName="mfc71u.pdb" KeyPath="yes" DiskId="1" src="$(var.SystemDir)mfc71u.pdb" />
+                                               </Component>
+                                       <?endif?>
                                <?endif?>
             <?elseif $(env.AFSVER_CL) = "1300"?>
                 <Merge Id="mergeVC1300LibMFC" Language="$(var.LanguageCode)" DiskId="1" FileCompression="yes" src="$(env.PROGRAMFILES)\Common Files\Merge Modules\VC_User_MFC70_RTL_X86_---.msm" />
                 <Merge Id="mergeVC1300LibCRT" Language="$(var.LanguageCode)" DiskId="1" FileCompression="yes" src="$(env.PROGRAMFILES)\Common Files\Merge Modules\VC_User_CRT70_RTL_X86_---.msm" />
+                <?ifdef DebugSyms?>
+                                       <Component Id="cmp_VC1300msvcr70PDB" Guid="E2A402C2-1A66-4432-9659-32627C6EB0E7">
+                                               <File Id="filemsvcr70_PDB" Name="msvcr70.pdb" LongName="msvcr70.pdb" KeyPath="yes" DiskId="1" src="$(var.SystemDir)msvcr70.pdb" />
+                                       </Component>
+                                       <Component Id="cmp_VC1300msvcp70PDB" Guid="7017FC16-6662-4891-8FA0-0E11817FC1EC">
+                                               <File Id="filemsvcp70_PDB" Name="msvcp70.pdb" LongName="msvcp70.pdb" KeyPath="yes" DiskId="1" src="$(var.SystemDir)msvcp70.pdb" />
+                                       </Component>
+                                       <Component Id="cmp_VC1300mfc70PDB" Guid="47514F18-BB28-4422-8701-B7152F102AA6">
+                                               <File Id="filemfc70_PDB" Name="mfc70.pdb" LongName="mfc70.pdb" KeyPath="yes" DiskId="1" src="$(var.SystemDir)mfc70.pdb" />
+                                       </Component>
+                               <?endif?>
             <?elseif $(env.AFSVER_CL) = "1200"?>
                 <Component Id="cmpVC1200msvcrt" Guid="718CDA4A-532F-43E8-9618-4D3CFE27D730">
                     <File Id="filemsvcrt_DLL" Name="msvcrt.dll" LongName="msvcrt.dll" KeyPath="yes" DiskId="1" src="$(var.SystemDir)msvcrt.dll" />
@@ -166,6 +191,17 @@
                 <Component Id="cmpVC1200mfc42" Guid="2C16F608-AE33-45D1-B072-0C05E99482A7">
                     <File Id="filemfc42_DLL" Name="mfc42.dll" LongName="mfc42.dll" KeyPath="yes" DiskId="1" src="$(var.SystemDir)mfc42.dll" />
                 </Component>
+                <?ifdef DebugSyms?>
+                                       <Component Id="cmp_VC1200msvcrtPDB" Guid="A702C2AB-C99F-443A-A420-063FFD866FBC">
+                                               <File Id="filemsvcrt_PDB" Name="msvcrt.pdb" LongName="msvcrt.pdb" KeyPath="yes" DiskId="1" src="$(var.SystemDir)msvcrt.pdb" />
+                                       </Component>
+                                       <Component Id="cmp_VC1200msvcp60PDB" Guid="56CCAE2C-0CAD-43B2-A7BD-F56E9E4F74E1">
+                                               <File Id="filemsvcp60_PDB" Name="msvcp60.pdb" LongName="msvcp60.pdb" KeyPath="yes" DiskId="1" src="$(var.SystemDir)msvcp60.pdb" />
+                                       </Component>
+                                       <Component Id="cmp_VC1200mfc42PDB" Guid="0B615363-EB3C-4785-A8E6-9AB42D85293D">
+                                               <File Id="filemfc42_PDB" Name="mfc42.pdb" LongName="mfc42.pdb" KeyPath="yes" DiskId="1" src="$(var.SystemDir)mfc42.pdb" />
+                                       </Component>
+                <?endif?>
             <?endif?>
           <?else?> <!-- Debug -->
             <?if $(env.AFSVER_CL) = "1310"?>
@@ -181,6 +217,7 @@
                 <Component Id="cmp_VC1310mfc71ud" Guid="4DCFABFC-B914-4805-BEFC-71C29D46730C">
                     <File Id="filemfc71ud_DLL" Name="mfc71ud.dll" LongName="mfc71ud.dll" KeyPath="yes" DiskId="1" src="$(var.SystemDir)mfc71ud.dll" />
                 </Component>
+                <?ifdef DebugSyms?>
                 <Component Id="cmp_VC1310msvcr71dPDB" Guid="2F1BAF2D-F977-49C4-9971-C933206DEB17">
                     <File Id="filemsvcr71d_PDB" Name="msvcr71d.pdb" LongName="msvcr71d.pdb" KeyPath="yes" DiskId="1" src="$(var.SystemDir)msvcr71d.pdb" />
                 </Component>
@@ -193,6 +230,7 @@
                 <Component Id="cmp_VC1310mfc71udPDB" Guid="B5DCF017-6FE3-49BC-9298-9D96EF90EAE8">
                     <File Id="filemfc71ud_PDB" Name="mfc71ud.pdb" LongName="mfc71ud.pdb" KeyPath="yes" DiskId="1" src="$(var.SystemDir)mfc71ud.pdb" />
                 </Component>
+                <?endif?>
             <?elseif $(env.AFSVER_CL) = "1300"?>
                 <Component Id="cmp_VC1300msvcr70d" Guid="F54C0DDB-3BDC-4824-8A63-100CB01E4CA4">
                     <File Id="filemsvcr70d_DLL" Name="msvcr70d.dll" LongName="msvcr70d.dll" KeyPath="yes" DiskId="1" src="$(var.SystemDir)msvcr70d.dll" />
@@ -203,6 +241,7 @@
                 <Component Id="cmp_VC1300mfc70d" Guid="635200A5-B02A-41FA-B1BD-8BCB97103E7D">
                     <File Id="filemfc70d_DLL" Name="mfc70d.dll" LongName="mfc70d.dll" KeyPath="yes" DiskId="1" src="$(var.SystemDir)mfc70d.dll" />
                 </Component>
+                <?ifdef DebugSyms?>
                 <Component Id="cmp_VC1300msvcr70dPDB" Guid="B8928CC3-F0D3-4BC1-9574-D35EA0F3F288">
                     <File Id="filemsvcr70d_PDB" Name="msvcr70d.pdb" LongName="msvcr70d.pdb" KeyPath="yes" DiskId="1" src="$(var.SystemDir)msvcr70d.pdb" />
                 </Component>
@@ -212,6 +251,7 @@
                 <Component Id="cmp_VC1300mfc70dPDB" Guid="4A6939FA-C7AC-436A-9D2F-E2475C88F249">
                     <File Id="filemfc70d_PDB" Name="mfc70d.pdb" LongName="mfc70d.pdb" KeyPath="yes" DiskId="1" src="$(var.SystemDir)mfc70d.pdb" />
                 </Component>
+                <?endif?>
             <?elseif $(env.AFSVER_CL) = "1200"?>
                 <Component Id="cmp_VC1200msvcrtd" Guid="9EFFE734-020C-4748-B074-86E15B50B6E5">
                     <File Id="filemsvcrtd_DLL" Name="msvcrtd.dll" LongName="msvcrtd.dll" KeyPath="yes" DiskId="1" src="$(var.SystemDir)msvcrtd.dll" />
@@ -222,6 +262,7 @@
                 <Component Id="cmp_VC1200mfc42d" Guid="6D983D53-2E7F-48CE-953E-7A9D0215C6B8">
                     <File Id="filemfc42d_DLL" Name="mfc42d.dll" LongName="mfc42d.dll" KeyPath="yes" DiskId="1" src="$(var.SystemDir)mfc42d.dll" />
                 </Component>
+                <?ifdef DebugSyms?>
                 <Component Id="cmp_VC1200msvcrtdPDB" Guid="420C311B-EC0F-47CB-883A-06A82808C06B">
                     <File Id="filemsvcrtd_PDB" Name="msvcrtd.pdb" LongName="msvcrtd.pdb" KeyPath="yes" DiskId="1" src="$(var.SystemDir)msvcrtd.pdb" />
                 </Component>
@@ -232,6 +273,7 @@
                     <File Id="filemfc42d_PDB" Name="mfc42d.pdb" LongName="mfc42d.pdb" KeyPath="yes" DiskId="1" src="$(var.SystemDir)mfc42d.pdb" />
                 </Component>
             <?endif?>
+          <?endif?>
           <?endif?>
             </Directory> <!-- /common -->
             
@@ -249,7 +291,7 @@
                                                <Shortcut Id="scAcctManager" Directory="dirShortCut" Name="AcctMgr.lnk" LongName="Account Manager.lnk" Description="$(loc.StrAcctMgrDesc)" Icon="ico_AcctManager" IconIndex="0" Show="normal" WorkingDirectory="dirCommon" />
                     </File>
                 </Component>
-            <?ifdef Debug?>
+            <?ifdef DebugSyms?>
                 <Component Id="cmp_Control_CenterDebug" Guid="B14EEC50-8ADF-4FE4-B00F-431861A5620C">
                     <File Id="fileTaAfsServerManager_PDB" Name="TaAfsSvM.pdb" LongName="TaAfsServerManager.pdb" KeyPath="yes" DiskId="1" src="$(var.ServerDir)\TaAfsServerManager.pdb"/>
                     <File Id="fileTaAfsAdmSvr_PDB" Name="TaAfsAdS.pdb" LongName="TaAfsAdmSvr.pdb" DiskId="1" src="$(var.ServerDir)\TaAfsAdmSvr.pdb"/>
@@ -773,7 +815,7 @@
                                                <File Id="fileafs_cpa_CPL" Name="afs_cpa.cpl" LongName="afs_cpa.cpl" KeyPath="yes" DiskId="1"/>
                                        <Registry Root="HKLM" Key="SOFTWARE\Microsoft\Windows\CurrentVersion\Control Panel\Cpls" Name="AFS Client CPL" Value="[#fileafs_cpa_CPL]" Id="reg_Full_Client11" />
                                        </Component>
-                <?ifdef Debug?>
+                <?ifdef DebugSyms?>
                     <Component Id="cmp_ClientProgramDebug" Guid="A6A394F6-45D0-45A9-A7DD-C0997070EC14">
                         <File Id="fileafsshare_PDB" Name="afsshare.pdb" LongName="afsshare.pdb" DiskId="1" />
                         <File Id="filelibosi_PDB" Name="libosi.pdb" LongName="libosi.pdb" DiskId="1" />
@@ -1191,7 +1233,7 @@
                                 <CreateFolder Directory="dirlocal" />
                             </Component>
                             
-                        <?ifdef Debug?>
+                        <?ifdef DebugSyms?>
                             <Component Id="cmp_Server_Program_Debug" Guid="5F7BA9F7-E9BD-4AC3-9232-5EFBF6B740F8">
                                 <File Id="filevlserver_PDB" Name="vlser.pdb" LongName="vlserver.pdb" DiskId="1" />
                                 <File Id="filevolinfo_PDB" Name="volin.pdb" LongName="volinfo.pdb" DiskId="1" />

diff --git a/src/WINNT/install/wix/lang/en_US/ui.wxi b/src/WINNT/install/wix/lang/en_US/ui.wxi
index 49696b0255fea6535af7b23bb30dfa8ae5759cb1..e8ef014b817d52aa25c0dce57c1148ed6561be33 100644 (file)
--- a/src/WINNT/install/wix/lang/en_US/ui.wxi
+++ b/src/WINNT/install/wix/lang/en_US/ui.wxi
@@ -601,6 +601,9 @@
         <Control Id="ActionText" Type="Text" X="70" Y="100" Width="265" Height="10">
           <Subscribe Event="ActionText" Attribute="Text" />
         </Control>
+        <Control Id="ActionData" Type="Text" X="70" Y="110" Width="265" Height="10">
+          <Subscribe Event="ActionData" Attribute="Text" />
+        </Control>
         <Control Id="Text" Type="Text" X="35" Y="65" Width="300" Height="20">
           <Text>Please wait while the [Wizard] [Progress2] [ProductName].  This may take several minutes.</Text>
         </Control>
@@ -609,7 +612,7 @@
         <Control Id="Title" Type="Text" X="20" Y="15" Width="200" Height="15" Transparent="yes" NoPrefix="yes">
           <Text>[DlgTitleFont][Progress1] [ProductName]</Text>
         </Control>
-        <Control Id="ProgressBar" Type="ProgressBar" X="35" Y="115" Width="300" Height="10" ProgressBlocks="yes" Text="Progress done">
+        <Control Id="ProgressBar" Type="ProgressBar" X="35" Y="125" Width="300" Height="10" ProgressBlocks="yes" Text="Progress done">
           <Subscribe Event="SetProgress" Attribute="Progress" />
         </Control>
         <Control Id="StatusLabel" Type="Text" X="35" Y="100" Width="35" Height="10" Text="Status:" />
@@ -1029,8 +1032,8 @@
          <Error Id="4003">$(loc.ErrSCSFailed)</Error>
          <Error Id="4004">$(loc.ErrAbort)</Error>
          <Error Id="4005">$(loc.ErrNsisFailed)</Error>
-         <ProgressText Action="RemoveLoopback">$(loc.ActRemoveLoopback)</ProgressText>
-         <ProgressText Action="InstallLoopback">$(loc.ActInstallLoopback)</ProgressText>
+         <ProgressText Action="RemoveLoopback" Template="[1]:([2])([3])([4])">$(loc.ActRemoveLoopback)</ProgressText>
+         <ProgressText Action="InstallLoopback" Template="[1]:([2])([3])([4])">$(loc.ActInstallLoopback)</ProgressText>
          <ProgressText Action="RemoveNetProvider">$(loc.ActRemoveNetProvider)</ProgressText>
          <ProgressText Action="InstallNetProvider">$(loc.ActInstallNetProvider)</ProgressText>
          <ProgressText Action="ConfigureClient">$(loc.ActConfigureClient)</ProgressText>

diff --git a/src/WINNT/install/wix/openafs.wxs b/src/WINNT/install/wix/openafs.wxs
index 5410903057a7c179987085c24582e90d9a672f60..dc4eb00ff5c906babdb8b56b4c99b8811980861e 100644 (file)
--- a/src/WINNT/install/wix/openafs.wxs
+++ b/src/WINNT/install/wix/openafs.wxs
@@ -58,20 +58,25 @@
         <?include lang\$(var.Language)\ui.wxi?>
         
         <!-- Custom actions -->
+    <?ifndef UseDllLoopbackInstaller?>
         <Binary
-         Id="BIN_Instloop"
+         Id="BIN_instloop"
          src="$(var.MediaBinDir)instloop.exe"/>
+    <?else?>
         <Binary
          Id="BIN_afsLoopback"
          src="$(var.MediaBinDir)afsloopback.dll"/>
+    <?endif?>
         <Binary
                 Id="BIN_afsCustom"
                 src="$(var.MediaDllDir)afscustom.dll"/>
+       <?ifdef UseDllLoopbackInstaller?>
         <CustomAction
          Id="InstallLoopback"
          BinaryKey="BIN_afsLoopback"
          DllEntry="installLoopbackMSI"
          Execute="deferred" 
+         Impersonate="no"
          />
        <?ifdef RemoveLoopback?>
         <CustomAction
@@ -87,6 +92,31 @@
          Execute="deferred" 
          />
        <?endif?>
+       <?else?>
+               <CustomAction
+                Id="InstallLoopback"
+                BinaryKey="BIN_instloop"
+                ExeCommand="-i"
+                Impersonate="no"
+                Execute="deferred"
+                />
+               <?ifdef RemoveLoopback?>
+                       <CustomAction
+                       Id="RollbackLoopback"
+                       BinaryKey="BIN_instloop"
+                       ExeCommand="-u"
+                       Impersonate="no"
+                       Execute="rollback"
+                       />
+                       <CustomAction
+                       Id="RemoveLoopback"
+                       BinaryKey="BIN_instloop"
+                       ExeCommand="-u"
+                       Impersonate="no"
+                       Execute="deferred"
+                       />
+               <?endif?>
+       <?endif?>
         <CustomAction
          Id="InstallNetProvider" 
          BinaryKey="BIN_afsCustom" 
@@ -173,6 +203,6 @@
         <!-- Please let us know if you want other Installers to be detected and upgraded/removed -->
 
                <!-- Media -->
-               <Media Id="1" Cabinet="disk1.cab" CompressionLevel="mszip" EmbedCab="yes" />
+               <Media Id="1" Cabinet="disk1.cab" CompressionLevel="high" EmbedCab="yes" />
     </Product>
 </Wix>

diff --git a/src/WINNT/install/wix/runtime_debug.wxi b/src/WINNT/install/wix/runtime_debug.wxi
index c3c496b4fdb3966401d455a4fa3de7c138301c5b..2a7686713fb9d80bf332b15cff81319c7c12971b 100644 (file)
--- a/src/WINNT/install/wix/runtime_debug.wxi
+++ b/src/WINNT/install/wix/runtime_debug.wxi
@@ -1,5 +1,6 @@
 <?xml version="1.0"?>
 <Include>
+    <?ifdef Debug?>
     <?if $(env.AFSVER_CL) = "1310" ?>
         <ComponentRef Id="cmp_VC1310msvcr71dPDB" />
         <ComponentRef Id="cmp_VC1310msvcp71dPDB" />
@@ -16,4 +17,22 @@
         <ComponentRef Id="cmp_VC1200msvcp60dPDB" />
         <ComponentRef Id="cmp_VC1200mfc42dPDB" />
     <?endif?>
+    <?else?>
+        <?if $(env.AFSVER_CL) = "1310" ?>
+            <ComponentRef Id="cmp_VC1310msvcr71PDB" />
+            <ComponentRef Id="cmp_VC1310msvcp71PDB" />
+            <ComponentRef Id="cmp_VC1310mfc71PDB" />
+            <ComponentRef Id="cmp_VC1310mfc71uPDB" />
+        <?endif?>
+        <?if $(env.AFSVER_CL) = "1300" ?>
+            <ComponentRef Id="cmp_VC1300msvcr70PDB" />
+            <ComponentRef Id="cmp_VC1300msvcp70PDB" />
+            <ComponentRef Id="cmp_VC1300mfc70PDB" />
+        <?endif?>
+        <?if $(env.AFSVER_CL) = "1200" ?>
+            <ComponentRef Id="cmp_VC1200msvcrtPDB" />
+            <ComponentRef Id="cmp_VC1200msvcp60PDB" />
+            <ComponentRef Id="cmp_VC1200mfc42PDB" />
+        <?endif?>
+    <?endif?>
 </Include>