pullup from trunk

ticket: 2835
version_fixed: 1.4

git-svn-id: svn://anonsvn.mit.edu/krb5/branches/krb5-1-4@16958 dc483132-0cff-0310-8789-dd5450dbe970

diff --git a/src/windows/installer/wix/ChangeLog b/src/windows/installer/wix/ChangeLog
index ac568354879d21da89cffef77d2385b72a4f0446..fe818ac8c784c206392d3c15108f1b14862ef67d 100644 (file)
--- a/src/windows/installer/wix/ChangeLog
+++ b/src/windows/installer/wix/ChangeLog
@@ -1,3 +1,8 @@
+2004-12-18  Jeffrey Altman <jaltman@mit.edu>
+
+        Add Debug Symbols as an optional install feature for
+        release builds of KFW
+
 2004-12-15  Jeffrey Altman <jaltman@mit.edu>
 
         Add kcpytkt.exe, kdeltkt.exe, k5sprt32.dll mit2ms.exe

diff --git a/src/windows/installer/wix/config.wxi b/src/windows/installer/wix/config.wxi
index f3f5afcf799cb6f926fb3021235ebdb44f390fc2..8c361eb1f0bc1542b3bb75116bf6971bf113ef99 100644 (file)
--- a/src/windows/installer/wix/config.wxi
+++ b/src/windows/installer/wix/config.wxi
@@ -52,6 +52,19 @@
 
     <?include lang\config_$(var.BuildLang).wxi?>
     
+    <!-- Parameters for the features containing debug symbols -->
+    <?ifdef DebugSyms?>
+         <?ifdef Debug?>
+             <?define DebugSymInstallDefault="followParent"?>
+             <?define DebugSymLowLevel="30"?>
+             <?define DebugSymHighLevel="130"?>
+         <?else?>
+             <?define DebugSymInstallDefault="followParent"?>
+             <?define DebugSymLowLevel="130"?>
+             <?define DebugSymHighLevel="130"?>
+         <?endif?>
+    <?endif?>
+    
     <!-- Configuration macros -->
     <?ifndef LeashAfsStatus?>
         <?define LeashAfsStatus="1"?>

diff --git a/src/windows/installer/wix/features.wxi b/src/windows/installer/wix/features.wxi
index dcc99faecb061cb08abf4d82287bbdd3b2297fa8..12e25c9cb2797345aa4f576e636495d64023d191 100644 (file)
--- a/src/windows/installer/wix/features.wxi
+++ b/src/windows/installer/wix/features.wxi
@@ -41,6 +41,19 @@
             Title="$(loc.KerberosClientTitle)"
             Level="30">
             
+            <?ifdef DebugSyms?>
+               <Feature 
+                    Id="feaKfwClientDebug" 
+                    AllowAdvertise="no" 
+                    Description="$(loc.StrKerberosClientDebugDesc)" 
+                    Display="expand"
+                   InstallDefault="$(var.DebugSymInstallDefault)" 
+                    Level="$(var.DebugSymLowLevel)" 
+                    Title="$(loc.StrKerberosClientDebugTitle)">
+                        <ComponentRef Id="cmf_bin_debug"/>
+               </Feature>
+           <?endif?>
+
             <ComponentRef Id="cmf_aklog_exe" />
             <ComponentRef Id="cmf_comerr32_dll" />
             <ComponentRef Id="cmf_gss_exe" />
@@ -112,10 +125,6 @@
             <ComponentRef Id="cmf_wshelp32_dll" />
             <ComponentRef Id="cmf_xpprof32_dll" />
 
-        <?ifdef Debug?>            
-            <ComponentRef Id="cmf_bin_debug"/>
-        <?endif?>
-        
             <ComponentRef Id="cmf_psapi_dll" />
             
         <?ifndef Debug?>

diff --git a/src/windows/installer/wix/lang/ChangeLog b/src/windows/installer/wix/lang/ChangeLog
index ca8e72edda40a1ec1ff604c1ee44fd03ebba8cdc..23a6add21dc56c146534bf84dbe7e591fb1ba90b 100644 (file)
--- a/src/windows/installer/wix/lang/ChangeLog
+++ b/src/windows/installer/wix/lang/ChangeLog
@@ -1,4 +1,9 @@
-2004-08-20  Jeffrey Altman <jaltman@mit.edu>
+2004-12-18  Jeffrey Altman <jaltman@mit.edu>
+
+        Add Debug Symbols as an optional install feature for
+        release builds of KFW2004-08-20  Jeffrey Altman <jaltman@mit.edu>
+
+2004-12-15  Jeffrey Altman <jaltman@mit.edu>
 
         Update for WiX 2.1 installer
 

diff --git a/src/windows/installer/wix/lang/strings_1033.wxl b/src/windows/installer/wix/lang/strings_1033.wxl
index c2ab6967a05da44127c5f57643eed750f243679c..41067361ab8b203f869da192be5348de1005f04d 100644 (file)
--- a/src/windows/installer/wix/lang/strings_1033.wxl
+++ b/src/windows/installer/wix/lang/strings_1033.wxl
@@ -39,6 +39,9 @@
     <String Id="KerberosClientTitle">Client</String>
     <String Id="KerberosClientDesc">Kerberos client utilities, libraries and documentation</String>
     
+    <String Id="StrKerberosClientDebugTitle">Debug symbols</String>
+    <String Id="StrKerberosClientDebugDesc">Debugging symbols for Kerberos for Windows components.</String>
+
     <String Id="KerberosSDKTitle">SDK</String>
     <String Id="KerberosSDKDesc">Libraries and header files for developing software with Kerberos</String>
     
@@ -51,5 +54,5 @@
     <String Id="IE501Required">Kerberos for Windows requires Microsoft Internet Explorer version 5.01 or higher.  Please resolve this and run the installer again.</String>
 
     <String Id="ARPComments">Build of</String>
-    
+
 </WixLocalization>
\ No newline at end of file

diff --git a/src/windows/installer/wix/site-local.wxi b/src/windows/installer/wix/site-local.wxi
index 074492e312e649acb2239999b694c356c4aba5df..e0081309d9ef311bd9035f8489bc279bdf08ed58 100644 (file)
--- a/src/windows/installer/wix/site-local.wxi
+++ b/src/windows/installer/wix/site-local.wxi
@@ -6,13 +6,13 @@
     <!-- TargetDir should point to build target directory and must end with 
          a backslash.  If not specified, assume we are in TargetDir\install -->
 
-    <?define TargetDir="d:\work\kfwbins\"?>
+    <?define TargetDir="c:\temp\kfw\kfw-2.6.6-alpha\"?>
 
     <!-- ConfigDir should point to directory containing configuration files 
          (krb5.ini, krb.con, krbrealm.con) to be bundled with the installer.
          The directory name should end with a backslash. -->
 
-    <?define ConfigDir="$(env.SystemRoot)\"?>
+    <?define ConfigDir="c:\temp\kfw\kfw-2.5-extra\sample-config\"?>
     
     <!-- VersionMajor, VersionMinor and VersionPatch must all be specified, or 
          none should be specified (in which case, the defaults will be
@@ -44,11 +44,14 @@
 
     <!-- At most one of the following could be defined and must correspond
          to the type of build performed. -->
-    <!-- <?define Debug?> -->
-    <?define Release?>
-    
+    <?define Debug?>
+    <!-- <?define Release?> -->
+
+    <!-- We are including debug symbols anyway.  Undefine this for a leaner installer without debug syms. -->
+    <?define DebugSyms?>
+
     <!-- Optional defines -->
-    <!-- <?define Beta=""?> --> <!-- 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 -->
 
@@ -69,7 +72,7 @@
     <?ifndef VersionMajor?>
         <?define VersionMajor="2"?>
         <?define VersionMinor="6"?>
-        <?define VersionPatch="0001"?>
+        <?define VersionPatch="6"?>
     <?else?>
         <?if Not ($(var.VersionMinor) And $(var.VersionPatch))?>
             <?error VersionMajor, VersionMinor and VersionPatch should be specified together?>