windows-wix-install-20050925

Add new HTML release notes to MSI

diff --git a/src/WINNT/install/wix/feature.wxi b/src/WINNT/install/wix/feature.wxi
index 1c4302bc7d414ee1c106af176e331ca9e162df95..b5af2e56fe13c5dbf0405856f9ca986af0ca91bd 100644 (file)
--- a/src/WINNT/install/wix/feature.wxi
+++ b/src/WINNT/install/wix/feature.wxi
@@ -6,6 +6,13 @@
            <ComponentRef Id="efl_desktop_INI" />
            <ComponentRef Id="efl_replace_afs_CMD" />
            <ComponentRef Id="efl_uninstall_EXE" />
+
+           <ComponentRef Id="cmp_Release_Notes_en_US" />
+           <ComponentRef Id="cmp_relnotes_files_en_US"/>
+           <ComponentRef Id="cmf_index2_HTM_en_US" />
+           <ComponentRef Id="cmp_index_files_en_US" />
+           <ComponentRef Id="cmp_logo_files_en_US" />
+
             <Feature Id="feaClient" AllowAdvertise="no" Description="$(loc.StrAFSClientLongDesc)" Display="expand"
                 InstallDefault="followParent" Level="30" Title="$(loc.StrAFSClientDesc)">
                 
@@ -235,15 +242,14 @@
                                <ComponentRef Id="rcm_Documentation" />
                 
                 <ComponentRef Id="efl_Readme_TXT_$(var.Language)" />                
-                <ComponentRef Id="cmf_index2_HTM_en_US" />
-                               <ComponentRef Id="efl_DocHtml_en_US" />
-                               <ComponentRef Id="cmp_Cmd_Ref_en_US" />
-                               <ComponentRef Id="cmp_Install_Guide_en_US" />
-                               <ComponentRef Id="cmp_Sys_Admin_Guide_en_US" />
-                               <ComponentRef Id="cmp_Release_Notes_en_US" />
-                               <ComponentRef Id="cmf_afs_nt_HLP_en_US" />
-                               <ComponentRef Id="cmp_Lang_en_US" />
-                               
+                <ComponentRef Id="efl_DocHtml_en_US" />
+                <ComponentRef Id="cmp_Cmd_Ref_en_US" />
+                <ComponentRef Id="cmp_Install_Guide_en_US" />
+                <ComponentRef Id="cmp_Sys_Admin_Guide_en_US" />
+
+                <ComponentRef Id="cmf_afs_nt_HLP_en_US" />
+                <ComponentRef Id="cmp_Lang_en_US" />
+               
             </Feature>
         </Feature>
 </Include>

diff --git a/src/WINNT/install/wix/files.wxi b/src/WINNT/install/wix/files.wxi
index 7acc16cd1ff0423c643986d3838e57b88036283e..14be601f6b03eb7b4b9e6ffb94a9742402a9c858 100644 (file)
--- a/src/WINNT/install/wix/files.wxi
+++ b/src/WINNT/install/wix/files.wxi
@@ -398,6 +398,13 @@
                             <File Id="filetop_GIF_$(var.Language)" Name="top.gif" LongName="top.gif" DiskId="1" />
                             <File Id="file$(var.Language)_RTF" Name="$(var.Language).rtf" LongName="$(var.Language).rtf" KeyPath="yes" DiskId="1" src="$(var.SrcDir)\WINNT\license\lang\$(var.Language).rtf"/>
                         </Component>
+                        <Directory Id="dirindex_files_$(var.Language)" Name="index" LongName="index_files" src="$(var.SrcDir)\WINNT\doc\install\Documentation\$(var.Language)\html\index_files\">
+                            <Component Id="cmp_index_files_$(var.Language)" Guid="$(var.DocHtmlIndexFilesGuid)">
+                                <File Id="filefilelist_XML_$(var.Language)" Name="filelist.xml" LongName="filelist.xml" DiskId="1" />
+                                <File Id="fileimage001_JPG_$(var.Language)" Name="image001.jpg" LongName="image001.jpg" DiskId="1" />
+                                <File Id="fileimage002_JPG_$(var.Language)" Name="image002.jpg" LongName="image002.jpg" DiskId="1" />
+                            </Component>
+                        </Directory>
                         <Directory Id="dirCmdRef_$(var.Language)" Name="CmdRef" src="$(var.SrcDir)\WINNT\doc\install\Documentation\$(var.Language)\html\CmdRef\">
                             <Component Id="cmp_Cmd_Ref_$(var.Language)" Guid="$(var.DocHtmlCmdRefGuid)">
                                 <File Id="fileauarf000_HTM_$(var.Language)" Name="auarf000.htm" LongName="auarf000.htm" KeyPath="yes" DiskId="1" />
@@ -742,7 +749,25 @@
                                 <File Id="fileawrns005_HTM_$(var.Language)" Name="awrns~5.htm" LongName="awrns005.htm" DiskId="1" />
                                 <File Id="fileawrns006_HTM_$(var.Language)" Name="awrns~6.htm" LongName="awrns006.htm" DiskId="1" />
                                 <File Id="fileawrns007_HTM_$(var.Language)" Name="awrns~7.htm" LongName="awrns007.htm" DiskId="1" />
+                                <File Id="fileframes_HTM_$(var.Language)" Name="frames.htm" LongName="frames.htm" DiskId="1" />
+                                <File Id="filelogo_HTM_$(var.Language)" Name="logo.htm" LongName="logo.htm" DiskId="1" />
+                                <File Id="filerelnotes_HTM_$(var.Language)" Name="relnotes.htm" LongName="relnotes.htm" DiskId="1" />
+                                <File Id="filetoc_HTM_$(var.Language)" Name="toc.htm" LongName="toc.htm" DiskId="1" />
                             </Component>
+                            <Directory Id="dirrelnotes_files_$(var.Language)" Name="relnotes" LongName="relnotes_files" src="$(var.SrcDir)\WINNT\doc\install\Documentation\$(var.Language)\html\ReleaseNotes\relnotes_files\">
+                                <Component Id="cmp_relnotes_files_$(var.Language)" Guid="$(var.DocHtmlRelnotesFilesGuid)">
+                                    <File Id="filernfilelist_XML_$(var.Language)" Name="filelist.xml" LongName="filelist.xml" DiskId="1"/>
+                                    <File Id="filernheader_HTM_$(var.Language)" Name="header.htm" LongName="header.htm" DiskId="1"/>
+                                    <File Id="filernpreview_WMF_$(var.Language)" Name="preview.wmf" LongName="preview.wmf" DiskId="1"/>
+                                </Component>
+                            </Directory> <!-- relnotes_files -->
+                            <Directory Id="dirlogo_files_$(var.Language)" Name="logo" LongName="logo_files" src="$(var.SrcDir)\WINNT\doc\install\Documentation\$(var.Language)\html\ReleaseNotes\logo_files\">
+                                <Component Id="cmp_logo_files_$(var.Language)" Guid="$(var.DocHtmlLogoFilesGuid)">
+                                    <File Id="filelffilelist_XML_$(var.Language)" Name="filelist.xml" LongName="filelist.xml" DiskId="1"/>
+                                    <File Id="filelfimage001_JPG_$(var.Language)" Name="image001.jpg" LongName="image001.jpg" DiskId="1"/>
+                                    <File Id="filelfimage002_JPG_$(var.Language)" Name="image002.jpg" LongName="image002.jpg" DiskId="1"/>
+                                </Component>
+                            </Directory> <!-- logo_files -->
                         </Directory> <!-- Release Notes -->
                     </Directory> <!-- Html -->
                 </Directory> <!-- $(var.Language) -->

diff --git a/src/WINNT/install/wix/language_config.wxi b/src/WINNT/install/wix/language_config.wxi
index af0fdde4d8664672b9fba063d75afc6550d897f0..770da3a76904cf3f0c89f1d41c875c6000a16e6f 100644 (file)
--- a/src/WINNT/install/wix/language_config.wxi
+++ b/src/WINNT/install/wix/language_config.wxi
@@ -39,6 +39,9 @@
     <?define DocHtmlInstallGuid="921E151E-9FD2-49A8-B297-0222E22ECAC7"?>
     <?define DocHtmlSysAdminGuid="F82AD828-C412-4211-88D7-DF18D5C79DBA"?>
     <?define DocHtmlRelNotesGuid="CC369D09-B786-412F-B832-720AC06CC3BC"?>
+    <?define DocHtmlRelnotesFilesGuid="D39E1662-F475-4D33-A6B5-CBC7B77891D0"?>
+    <?define DocHtmlLogoFilesGuid="24E7F4AF-5D41-4D7B-B9DF-FA5787BAC787"?>
+    <?define DocHtmlIndexFilesGuid="EEEA73B6-36CD-4471-BF5C-9317B90CA3CC"?>
 
        <!-- other language specific strings are defined in the strings.wxl file -->