Windows: Wix 2.0.4221 updates
authorJeffrey Altman <jaltman@secure-endpoints.com>
Tue, 18 Jul 2006 19:24:23 +0000 (19:24 +0000)
committerJeffrey Altman <jaltman@secure-endpoints.com>
Tue, 18 Jul 2006 19:24:23 +0000 (19:24 +0000)
This commit corrects errors in the Wix installer script
files that violate the Wix schema but which were not
caught by earlier releases of the Wix 2.0 installer.

ticket: new

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@18335 dc483132-0cff-0310-8789-dd5450dbe970

src/windows/installer/wix/config.wxi
src/windows/installer/wix/features.wxi
src/windows/installer/wix/files.wxi
src/windows/installer/wix/kfw.wxs
src/windows/installer/wix/lang/ui_1033.wxi
src/windows/installer/wix/property.wxi
src/windows/installer/wix/site-local.wxi

index fa756bbb2abf1a4cae6e3620e53a11360769ccca..7b6507ae14480fcdd6a70019f04380fd639c1517 100644 (file)
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
 
-  Copyright (C) 2004 by the Massachusetts Institute of Technology.
+  Copyright (C) 2004, 2005, 2006 by the Massachusetts Institute of Technology.
   All rights reserved.
  
   Export of this software from the United States of America may
index 68ead13a7e1f26f756185b994394893ad50c8154..a5cebbe1c62f6ce1acb7b026fa564f031ea00464 100644 (file)
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
 
-  Copyright (C) 2004 by the Massachusetts Institute of Technology.
+  Copyright (C) 2004, 2005, 2006 by the Massachusetts Institute of Technology.
   All rights reserved.
  
   Export of this software from the United States of America may
@@ -58,7 +58,6 @@
             <ComponentRef Id="cmf_leash32_exe" />
             <ComponentRef Id="csc_leash32_exe" />
 
-            <ComponentRef Id="cmf_aklog_exe" />
             <ComponentRef Id="cmf_comerr32_dll" />
             <ComponentRef Id="cmf_gss_exe" />
             <ComponentRef Id="cmf_gss_client_exe" />
index 5dad4f17b8b44b3882aea701cc3e5bf625dbe984..02766114127b348df20e5d3b47ebe085ff9bfdbe 100644 (file)
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
 
-  Copyright (C) 2004, 2005 by the Massachusetts Institute of Technology.
+  Copyright (C) 2004, 2005, 2006 by the Massachusetts Institute of Technology.
   All rights reserved.
  
   Export of this software from the United States of America may
                        <Condition>KRB5PRESERVEIDENTITY</Condition>
                    </Component>
                 
-                    <Component Id="cmf_aklog_exe" Guid="38840074-3D15-45CB-8022-C4A603FC697A" DiskId="1">
-                           <File Id="fil_aklog_exe" LongName="aklog.exe" Name="aklog.exe" KeyPath="yes" />
-                           <Registry Id="reg_ts_aklog_0" Root="HKLM" Key="Software\Microsoft\Windows NT\CurrentVersion\Terminal Server\Compatibility\Applications\aklog" Action="createKeyAndRemoveKeyOnUninstall" />
-                           <Registry Id="reg_ts_aklog_1" Root="HKLM" Key="Software\Microsoft\Windows NT\CurrentVersion\Terminal Server\Compatibility\Applications\aklog" Name="Flags" Type="integer" Value="1032" />
-                    </Component>
                     <Component Id="cmf_comerr32_dll" Guid="D8F455F9-E648-4C61-A69D-7116ADEC2DBB" DiskId="1">
                            <File Id="fil_comerr32_dll" LongName="comerr32.dll" Name="comerr32.dll" KeyPath="yes" />
                     </Component>
                     
                     <Component Id="csc_NetIDMgrStartup" Guid="669227E3-0ADC-4173-90C3-631FCFC8EBC3" DiskId="1">
                         <Registry Id="reg_sc_nidmgr_marker" Root="HKLM" Key="$(var.KfwRegRoot)\Client\$(var.VersionString)" Name="NetIDMgrAutoStart" Type="integer" Value="1" KeyPath="yes" />
-                        <Shortcut Id="sc_netidmgr_exe_startup" Advertise="no" Directory="StartupFolder" LongName="Network Identity Manager.lnk" Name="netidmgr.lnk" Arguments="" Target="[dirbin]netidmgr.exe" Show="minimized" />
+                        <Shortcut Id="sc_netidmgr_exe_startup" Advertise="no" Directory="StartupFolder" LongName="Network Identity Manager.lnk" Name="netidmgr.lnk" Target="[dirbin]netidmgr.exe" Show="minimized" />
                         <Condition>USENETIDMGR</Condition>
                     </Component>
 
                        <File Id="fil_netidmgr_chm" LongName="netidmgr.chm" Name="netidmgr.chm" />
                         <Registry Id="reg_ts_netidmgr_0" Root="HKLM" Key="Software\Microsoft\Windows NT\CurrentVersion\Terminal Server\Compatibility\Applications\netidmgr" Action="createKeyAndRemoveKeyOnUninstall" />
                         <Registry Id="reg_ts_netidmgr_1" Root="HKLM" Key="Software\Microsoft\Windows NT\CurrentVersion\Terminal Server\Compatibility\Applications\netidmgr" Name="Flags" Type="integer" Value="1032" />
-                        <Shortcut Id="sc_netidmgr_exe" Advertise="no" Directory="dirShortcut" LongName="Network Identity Manager.lnk" Name="netidmgr.lnk" Arguments="" Target="[dirbin]netidmgr.exe" Show="minimized" WorkingDirectory="[dirbin]"/>
+                        <Shortcut Id="sc_netidmgr_exe" Advertise="no" Directory="dirShortcut" LongName="Network Identity Manager.lnk" Name="netidmgr.lnk" Target="[dirbin]netidmgr.exe" Show="minimized" WorkingDirectory="[dirbin]"/>
                         <Shortcut Id="sc_netidmgr_chm" Advertise="no" Directory="dirShortcut" LongName="Network Identity Manager Documentation.lnk" Name="netidchm.lnk" Target="[dirbin]netidmgr.chm" WorkingDirectory="[dirbin]"/>
                     </Component>
                     <!-- /NetIDMgr -->
                     <!-- Debug symbols -->
                 <?ifdef DebugSyms?>
                     <Component Id="cmf_bin_debug" Guid="C8468854-8261-4781-8119-A612636841E3" DiskId="1">
-                           <File Id="fil_aklog_pdb" LongName="aklog.pdb" Name="aklog.pdb" />
                            <File Id="fil_comerr32_pdb" LongName="comerr32.pdb" Name="comerr32.pdb" />
                            <File Id="fil_gss_pdb" LongName="gss.pdb" Name="gss.pdb" />
                            <File Id="fil_gss_client_pdb" LongName="gss-client.pdb" Name="gss-clnt.pdb" />
index 667413c9e7198e791feb7892a18b4a5b89564675..bc0ab2a8d84d411eaa3faed89d1b3254a3563b48 100644 (file)
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
 
-  Copyright (C) 2004,2005 by the Massachusetts Institute of Technology.
+  Copyright (C) 2004,2005, 2006 by the Massachusetts Institute of Technology.
   All rights reserved.
  
   Export of this software from the United States of America may
             Execute="immediate" />
 
        <CustomAction
-            Id="AbortCantRemoveNSIS"
-            Value="[CantRemoveNSISError]" />
+            Id="AbortCantRemoveNSIS" 
+            Value="[CantRemoveNSISError]" 
+            Property="CantRemoveNSISError" />
 
        <CustomAction
             Id="AbortNoIE"
-            Value="[NoIE501Error]" />
+            Value="[NoIE501Error]" 
+            Property="NoIE501Error" />
             
         <CustomAction
             Id="ListRunningProcesses"
index e3cb3dc55a51e24be2f6522729f779dac14f8e8d..de4cc366da3d049d398330b073fb8714cd1ab7e5 100644 (file)
@@ -1,4 +1,29 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--
+
+  Copyright (C) 2004,2005, 2006 by the Massachusetts Institute of Technology.
+  All rights reserved.
+  Export of this software from the United States of America may
+    require a specific license from the United States Government.
+    It is the responsibility of any person or organization contemplating
+    export to obtain such a license before exporting.
+  WITHIN THAT CONSTRAINT, permission to use, copy, modify, and
+  distribute this software and its documentation for any purpose and
+  without fee is hereby granted, provided that the above copyright
+  notice appear in all copies and that both that copyright notice and
+  this permission notice appear in supporting documentation, and that
+  the name of M.I.T. not be used in advertising or publicity pertaining
+  to distribution of the software without specific, written prior
+  permission.  Furthermore if you modify this software you must label
+  your software as modified software and not distribute it in such a
+  fashion that it might be confused with the original M.I.T. software.
+  M.I.T. makes no representations about the suitability of
+  this software for any purpose.  It is provided "as is" without express
+  or implied warranty.
+  
+  -->
 <Include xmlns="http://schemas.microsoft.com/wix/2003/01/wi">
     <UI>
       <Dialog Id="AdminWelcomeDlg" Width="370" Height="270" Title="[ProductName] [Setup]" NoMinimize="yes">
           <Text>{\VerdanaBold13}Welcome to the [ProductName] [Wizard]</Text>
         </Control>
       </Dialog>
-      <RadioGroup Property="IAgree">
+      <RadioButtonGroup Property="IAgree">
         <RadioButton Text="{\DlgFont8}I &amp;accept the terms in the License Agreement" X="5" Y="0" Width="250" Height="15" Value="Yes"></RadioButton>
         <RadioButton Text="{\DlgFont8}I &amp;do not accept the terms in the License Agreement" X="5" Y="20" Width="250" Height="15" Value="No"></RadioButton>
-      </RadioGroup>
+      </RadioButtonGroup>
       <TextStyle Id="DlgFont8" FaceName="Tahoma" Size="8" />
       <TextStyle Id="DlgFontBold8" FaceName="Tahoma" Size="8" Bold="yes" />
       <TextStyle Id="VerdanaBold13" FaceName="Verdana" Size="13" Bold="yes" />
index f969d912bc1c8c0f6aa13abad4bb96c85f8ec9e5..b392333fc7dbeed16b19bb2e6ee555db3c5c2571 100644 (file)
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
 
-  Copyright (C) 2004 by the Massachusetts Institute of Technology.
+  Copyright (C) 2004, 2005, 2006 by the Massachusetts Institute of Technology.
   All rights reserved.
  
   Export of this software from the United States of America may
     <Property Id="ComponentDownload">http://web.mit.edu/kerberos</Property>
 
     <Property Id="UPGRADENSIS">
-        <RegistrySearch Id="regsrch_NSIS" Root="HKLM" Key="Software\Microsoft\Windows\CurrentVersion\Uninstall\Kerberos for Windows" Name="UninstallString" Type="registry" />
+        <RegistrySearch Id="regsrch_NSIS" Root="HKLM" Key="Software\Microsoft\Windows\CurrentVersion\Uninstall\Kerberos for Windows" Name="UninstallString" Type="file"/>
     </Property>
     
     <Property Id="NSISVERSION">
-        <RegistrySearch Id="regsrch_NSISV" Root="HKLM" Key="Software\Microsoft\Windows\CurrentVersion\Uninstall\Kerberos for Windows" Name="DisplayVersion" Type="registry" />
+        <RegistrySearch Id="regsrch_NSISV" Root="HKLM" Key="Software\Microsoft\Windows\CurrentVersion\Uninstall\Kerberos for Windows" Name="DisplayVersion" Type="raw" />
     </Property>
 
     <Property Id="CantRemoveNSISError">$(loc.CantRemoveNSIS)</Property>
     <Property Id="NoIE501Error">$(loc.IE501Required)</Property>
+
     <!--  Additional properties relating to the UI are in the appropriate UI.wxi file -->
     
     <!-- Configuration properties.  If these properties are defined, then
index 03fadea8c83b870808ac4f97bfd7085837632e59..2e270826d679e1ae778832862a30929ae1b9b735 100644 (file)
@@ -6,7 +6,7 @@
     <!-- TargetDir should point to build target directory and must end with 
          a backslash.  If not specified, assume we are in TargetDir\install -->
 
-    <?define TargetDir="c:\temp\kfw\kfw-3.0.0-beta-2\"?>
+    <?define TargetDir="c:\temp\kfw\kfw-3.1.0-alpha\"?>
 
     <!-- ConfigDir should point to directory containing configuration files 
          (krb5.ini, krb.con, krbrealm.con) to be bundled with the installer.
@@ -53,7 +53,7 @@
     <?define DebugSyms?>
 
     <!-- Optional defines -->
-    <!-- <?define Beta="2"?> Numeric Beta identifier -->
+    <?define Beta="1"?> <!-- Numeric Beta identifier -->
     <!-- <?define OldHelp?> --> <!-- Specifies the use of the old leash32.hlp file 
                            instead of the new leash32.chm file -->
 
@@ -73,7 +73,7 @@
 
     <?ifndef VersionMajor?>
         <?define VersionMajor="3"?>
-        <?define VersionMinor="0"?>
+        <?define VersionMinor="1"?>
         <?define VersionPatch="0"?>
     <?else?>
         <?if Not ($(var.VersionMinor) And $(var.VersionPatch))?>