Installer wip. Actually builds semi-functional kfw.msi

Still many things missing and/or misplaced

Signed-off-by: Kevin Wasserman <kevin.wasserman@painless-security.com>

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

3 files changed, 59 insertions, 123 deletions

diff --git a/src/windows/build/BKWconfig.xml b/src/windows/build/BKWconfig.xml
index 92fdc6ecd9..c787befae0 100644
--- a/src/windows/build/BKWconfig.xml
+++ b/src/windows/build/BKWconfig.xml
@@ -24,19 +24,19 @@
         <debug      def="0" abbr="d" />
         <help       def="0" abbr="h|?" />
         <logfile    def="1" abbr="l" value="bkw.pl.log" />
-        <make       def="1" />
+        <make       def="0" />
         <nolog      def="0" />
         <package    def="1" />
         <repository def="A" abbr="r" value="skip" options="skip checkout|co export|ex update|up" />
         <sign       def="0" />
-        <verbose    def="0" abbr="v" />
+        <verbose    def="1" abbr="v" />
         <vverbose   def="0" />
 
         <!-- Directory settings: -->
         <!--    Sources will be checked out of repositories into <src>.  The structure
                 of the repositories will cause pismere/athena to be created under <src>.    -->
-        <src        def="A" abbr="s" value="C:\KfW" />        <!-- Must be absolute path. -->
-        <out        def="A" abbr="o" value="C:\KfW\public" /> <!-- Must be absolute path. -->
+        <src        def="A" abbr="s" value="C:\MinGW\kfw-updates\src" />    <!-- Must be absolute path. -->
+        <out        def="A" abbr="o" value="C:\MinGW\kfw-updates\public" /> <!-- Must be absolute path. -->
 
         <!-- Repository settings: -->
         <cvstag     def="0" abbr="c" value="" />
@@ -114,7 +114,7 @@
         <Package>
             <Config>
                 <Paths>    
-                    <Versions path="pismere/athena/include/kerberos.ver" /> <!-- Relative to <src>. -->
+                    <Versions path="kerberos.ver" /> <!-- Relative to <src>. -->
                     </Paths>
                 </Config>
             <MSI></MSI>
diff --git a/src/windows/build/bkw.pl b/src/windows/build/bkw.pl
index 24c32a035d..f23c9be631 100644
--- a/src/windows/build/bkw.pl
+++ b/src/windows/build/bkw.pl
@@ -132,9 +132,10 @@ sub main {
 
 ##++ Validate required conditions:
 
-    # List of programs which must be in PATH:
-    my @required_list = ('sed', 'awk', 'which', 'cat', 'rm', 'cvs', 'svn', 'doxygen', 
-                         'hhc', 'candle', 'light', 'makensis', 'nmake', 'plink', 'filever');
+    # List of programs which must be in PATH:'
+    # 'cvs', 'svn', 'hhc', 'makensis', 'plink', 'filever'
+    my @required_list = ('sed', 'awk', 'which', 'cat', 'rm', 'doxygen',
+                         'candle', 'light', 'nmake');
     my $requirements_met    = 1;
     my $first_missing       = 0;
     my $error_list          = "";
@@ -190,7 +191,7 @@ sub main {
         # If the switch can be negated, test that, too:
         if ( ! ($val->{def} =~ /A/)) {
             local $nosw = "no".$sw;
-            if (exists $OPT->{$sw}) {         ## -NO<environment variable> ?
+            if (exists $OPT->{$nosw}) {         ## -NO<environment variable> ?
                 if ($val->{env}) {              
                     if (!$val->{def}) {
                         print "Deleting environment variable $sw\n";
@@ -288,7 +289,7 @@ sub main {
         $clean  = $odr->{clean}->{def}    = 0;
         }
 
-    my $wd  = $src."\\pismere";
+    my $wd  = $src;
 
     if (! ($rverb =~ /skip/)) {
         local $len = 0;
@@ -421,7 +422,7 @@ sub main {
     # ** Do this now (after repository update and before first zip) 
     #    because making zip files requires some configuration data be set up.
     local $version_path = $config->{Stages}->{Package}->{Config}->{Paths}->{Versions}->{path};
-    open(DAT, "$src/$version_path")     or die "Could not open $version_path.";
+    open(DAT, "$src/$version_path")     or die "Could not open $src/$version_path.";
     @raw = <DAT>;
     close DAT;
     foreach $line (@raw) {
@@ -562,40 +563,40 @@ sub main {
 
         # The build results are copied to a staging area, where the packager expects to find them.
         #  We put the staging area in the fixed area .../pismere/staging.
-        my $prepackage  = $config->{Stages}->{PrePackage};
-        my $staging     = "$wd\\staging";
-        chdir($wd)                          or die "Fatal -- couldn't chdir to $wd\n";
-        print "Info -- chdir to ".`cd`."\n" if ($verbose);
-        if (-d "staging") {
-            !system("rm -rf $staging/*")        or die "Fatal -- Couldn't clean $staging.";
-            }
-        else {
-            mkdir($staging)                     or die "Fatal -- Couldn't create $staging.";
-            }
+        #my $prepackage  = $config->{Stages}->{PrePackage};
+        #my $staging     = "$wd\\staging";
+        #chdir($wd)                          or die "Fatal -- couldn't chdir to $wd\n";
+        #print "Info -- chdir to ".`cd`."\n" if ($verbose);
+        #if (-d "staging") {
+        #    !system("rm -rf $staging/*")        or die "Fatal -- Couldn't clean $staging.";
+        #    }
+        #else {
+        #    mkdir($staging)                     or die "Fatal -- Couldn't create $staging.";
+        #    }
         
         # Force Where From and To are relative to:
-        $prepackage->{CopyList}->{Config}->{From}->{root}   = "$wd\\athena";
-        $prepackage->{CopyList}->{Config}->{To}->{root}     = "$wd\\staging";
-        copyFiles($prepackage->{CopyList}, $config);        ## Copy any files [this step takes a while]
+        #$prepackage->{CopyList}->{Config}->{From}->{root}   = "$wd\\athena";
+        #$prepackage->{CopyList}->{Config}->{To}->{root}     = "$wd\\staging";
+        #copyFiles($prepackage->{CopyList}, $config);        ## Copy any files [this step takes a while]
 
         # Sign files:
-        chdir($staging) or die "Fatal -- couldn't chdir to $staging\n";
-        print "Info -- chdir to ".`cd`."\n"     if ($verbose);
-        if ($odr->{sign}->{def}) {
-            signFiles($config->{Stages}->{PostPackage}->{Config}->{Signing}, $config);
-            }
+        #chdir($staging) or die "Fatal -- couldn't chdir to $staging\n";
+        #print "Info -- chdir to ".`cd`."\n"     if ($verbose);
+        #if ($odr->{sign}->{def}) {
+        #    signFiles($config->{Stages}->{PostPackage}->{Config}->{Signing}, $config);
+        #    }
             
         # Create working directories for building the installers:
         if (-d "$wd\\buildwix")    {!system("rm -rf $wd\\buildwix/*")               or die "Fatal -- Couldn't clean $wd\\buildwix."}    
-        !system("echo D | xcopy /s $wd\\staging\\install\\wix\\*.* $wd\\buildwix")  or die "Fatal -- Couldn't create $wd\\buildwix.";
-        if (-d "$wd\\buildnsi")    {!system("rm -rf $wd\\buildnsi/*")               or die "Fatal -- Couldn't clean $wd\\buildnsi."}    
-        !system("echo D | xcopy /s $wd\\staging\\install\\nsis\\*.* $wd\\buildnsi") or die "Fatal -- Couldn't create $wd\\buildnsi.";
+        !system("echo D | xcopy /s $wd\\windows\\installer\\wix\\*.* $wd\\buildwix")  or die "Fatal -- Couldn't create $wd\\buildwix.";
+        #if (-d "$wd\\buildnsi")    {!system("rm -rf $wd\\buildnsi/*")               or die "Fatal -- Couldn't clean $wd\\buildnsi."}
+        #!system("echo D | xcopy /s $wd\\staging\\install\\nsis\\*.* $wd\\buildnsi") or die "Fatal -- Couldn't create $wd\\buildnsi.";
 
-        chdir("$staging\\install\\wix") or die "Fatal -- Couldn't cd to $staging\\install\\wix";
+        chdir("$wd\\windows\\installer\\wix") or die "Fatal -- Couldn't cd to $wd\\windows\\installer\\wix";
         print "Info -- chdir to ".`cd`."\n"     if ($verbose);
         # Correct errors in files.wxi:
-        !system("sed 's/WorkingDirectory=\"\\[dirbin\\]\"/WorkingDirectory=\"dirbin\"/g' files.wxi > a.tmp") or die "Fatal -- Couldn't modify files.wxi.";
-        !system("mv a.tmp files.wxi") or die "Fatal -- Couldn't update files.wxi.";
+        #!system("sed 's/WorkingDirectory=\"\\[dirbin\\]\"/WorkingDirectory=\"dirbin\"/g' files.wxi > a.tmp") or die "Fatal -- Couldn't modify files.wxi.";
+        #!system("mv a.tmp files.wxi") or die "Fatal -- Couldn't update files.wxi.";
             
         # Make sed script to run on the site-local configuration files:
         local $tmpfile      = "site-local.sed" ;
@@ -623,41 +624,41 @@ sub main {
         !system("sed -f $tmpfile site-local-tagged.wxi > $wd\\buildwix\\site-local.wxi")   or die "Fatal -- Couldn't modify site-local.wxi.";
 
         # Now update site-local.nsi:
-        chdir "..\\nsis";
-        print "Info -- chdir to ".`cd`."\n"                                 if ($verbose);
-        !system("sed -f ..\\wix\\$tmpfile site-local-tagged.nsi > b.tmp")   or die "Fatal -- Couldn't modify site-local.wxi.";
+        #chdir "..\\nsis";
+        #print "Info -- chdir to ".`cd`."\n"                                 if ($verbose);
+        #!system("sed -f ..\\wix\\$tmpfile site-local-tagged.nsi > b.tmp")   or die "Fatal -- Couldn't modify site-local.wxi.";
         # Add DEBUG or RELEASE:
-        if ($odr->{debug}->{def}) {                    ## debug build
-            !system("echo !define DEBUG >> b.tmp")     or die "Fatal -- Couldn't modify b.tmp.";    
-            }
-        else {                                         ## release build
-            !system("echo !define RELEASE >> b.tmp")   or die "Fatal -- Couldn't modify b.tmp.";
-            }
+        #if ($odr->{debug}->{def}) {                    ## debug build
+        #    !system("echo !define DEBUG >> b.tmp")     or die "Fatal -- Couldn't modify b.tmp.";
+        #    }
+        #else {                                         ## release build
+        #    !system("echo !define RELEASE >> b.tmp")   or die "Fatal -- Couldn't modify b.tmp.";
+        #    }
         # Add BETA if present:
-        if (exists $config->{Versions}->{'BETA_STR'}) {
-            !system("echo !define BETA $config->{Versions}->{'BETA_STR'} >> b.tmp") or die "Fatal -- Couldn't modify b.tmp.";    
-            }
-        !system("mv -f b.tmp $wd\\buildnsi\\site-local.nsi")                        or die "Fatal -- Couldn't replace site-local.nsi.";
+        #if (exists $config->{Versions}->{'BETA_STR'}) {
+        #    !system("echo !define BETA $config->{Versions}->{'BETA_STR'} >> b.tmp") or die "Fatal -- Couldn't modify b.tmp.";
+        #    }
+        #!system("mv -f b.tmp $wd\\buildnsi\\site-local.nsi")                        or die "Fatal -- Couldn't replace site-local.nsi.";
 
         # Run the script on nsi-includes-tagged.nsi:
-        !system("sed -f ..\\wix\\$tmpfile nsi-includes-tagged.nsi > $wd\\buildnsi\\nsi-includes.nsi")  or die "Fatal -- Couldn't modify nsi-includes.nsi.";
-        !system("rm ..\\wix\\$tmpfile")                                     or die "Fatal -- Couldn't remove $tmpfile.";
+        #!system("sed -f ..\\wix\\$tmpfile nsi-includes-tagged.nsi > $wd\\buildnsi\\nsi-includes.nsi")  or die "Fatal -- Couldn't modify nsi-includes.nsi.";
+        #!system("rm ..\\wix\\$tmpfile")                                     or die "Fatal -- Couldn't remove $tmpfile.";
 
-        if ($verbose) {print "Info -- ***   End prepackage.\n";}
+        #if ($verbose) {print "Info -- ***   End prepackage.\n";}
         
-        if ($verbose) {print "Info -- *** Begin package.\n";}
+        #if ($verbose) {print "Info -- *** Begin package.\n";}
         # Make the msi:
         chdir("$wd\\buildwix")                      or die "Fatal -- Couldn't cd to $wd\\buildwix";
         print "Info -- *** Make .msi:\n"            if ($verbose);
         print "Info -- chdir to ".`cd`."\n"         if ($verbose);
         !system("$MAKE")                            or die "Error -- msi installer build failed.";
                 
-        chdir("$wd\\buildnsi")                      or die "Fatal -- Couldn't cd to $wd\\buildnsi";
-        print "Info -- *** Make NSIS:\n"            if ($verbose);
-        print "Info -- chdir to ".`cd`."\n"         if ($verbose);
-        !system("cl.exe killer.cpp advapi32.lib")   or die "Error -- nsis killer.exe not built.";
-        !system("rename killer.exe Killer.exe")     or die "Error -- Couldn't rename killer.exe";
-        !system("makensis kfw.nsi")                 or die "Error -- executable installer build failed.";
+        #chdir("$wd\\buildnsi")                      or die "Fatal -- Couldn't cd to $wd\\buildnsi";
+        #print "Info -- *** Make NSIS:\n"            if ($verbose);
+        #print "Info -- chdir to ".`cd`."\n"         if ($verbose);
+        #!system("cl.exe killer.cpp advapi32.lib")   or die "Error -- nsis killer.exe not built.";
+        #!system("rename killer.exe Killer.exe")     or die "Error -- Couldn't rename killer.exe";
+        #!system("makensis kfw.nsi")                 or die "Error -- executable installer build failed.";
 
 # Begin packaging extra items:
         chdir($wd)                                  or die "Fatal -- Couldn't cd to $wd";
diff --git a/src/windows/build/copyfiles.xml b/src/windows/build/copyfiles.xml
index 11809ca740..4b24e1f65d 100644
--- a/src/windows/build/copyfiles.xml
+++ b/src/windows/build/copyfiles.xml
@@ -6,40 +6,11 @@
             <!-- Without this, XML::Simple does not make an anonymous array and I can't figure out how to iterate over it. -->
 
         <!-- Build-dependent files (from release or debug build): -->
-          <File name="netidmgr_version.h"   from="auth\krb5\src\windows\identity\obj\i386\%bldtype%\inc\"    to="\inc\netidmgr"/>
-          <File name="netidmgr.h"           from="auth\krb5\src\windows\identity\obj\i386\%bldtype%\inc\"    to="\inc\netidmgr" />
-          <File name="perfstat.h"           from="auth\krb5\src\windows\identity\obj\i386\%bldtype%\inc\"    to="\inc\netidmgr"/>
-          <File name="utils.h"              from="auth\krb5\src\windows\identity\obj\i386\%bldtype%\inc\"    to="\inc\netidmgr" />
-          <File name="sync.h"               from="auth\krb5\src\windows\identity\obj\i386\%bldtype%\inc\"    to="\inc\netidmgr" />
-          <File name="mstring.h"            from="auth\krb5\src\windows\identity\obj\i386\%bldtype%\inc\"    to="\inc\netidmgr" />
-          <File name="kplugin.h"            from="auth\krb5\src\windows\identity\obj\i386\%bldtype%\inc\"    to="\inc\netidmgr" />
-          <File name="kmq.h"                from="auth\krb5\src\windows\identity\obj\i386\%bldtype%\inc\"    to="\inc\netidmgr" />
-          <File name="kmm.h"                from="auth\krb5\src\windows\identity\obj\i386\%bldtype%\inc\"    to="\inc\netidmgr" />
-          <File name="khuidefs.h"           from="auth\krb5\src\windows\identity\obj\i386\%bldtype%\inc\"    to="\inc\netidmgr" />
-          <File name="khtracker.h"          from="auth\krb5\src\windows\identity\obj\i386\%bldtype%\inc\"    to="\inc\netidmgr" />
-          <File name="khrescache.h"         from="auth\krb5\src\windows\identity\obj\i386\%bldtype%\inc\"    to="\inc\netidmgr" />
-          <File name="khremote.h"           from="auth\krb5\src\windows\identity\obj\i386\%bldtype%\inc\"    to="\inc\netidmgr" />
-          <File name="khprops.h"            from="auth\krb5\src\windows\identity\obj\i386\%bldtype%\inc\"    to="\inc\netidmgr" />
-          <File name="khnewcred.h"          from="auth\krb5\src\windows\identity\obj\i386\%bldtype%\inc\"    to="\inc\netidmgr" />
-          <File name="khmsgtypes.h"         from="auth\krb5\src\windows\identity\obj\i386\%bldtype%\inc\"    to="\inc\netidmgr" />
-          <File name="khlist.h"             from="auth\krb5\src\windows\identity\obj\i386\%bldtype%\inc\"    to="\inc\netidmgr" />
-          <File name="khhtlink.h"           from="auth\krb5\src\windows\identity\obj\i386\%bldtype%\inc\"    to="\inc\netidmgr" />
-          <File name="kherror.h"            from="auth\krb5\src\windows\identity\obj\i386\%bldtype%\inc\"    to="\inc\netidmgr" />
-          <File name="kherr.h"              from="auth\krb5\src\windows\identity\obj\i386\%bldtype%\inc\"    to="\inc\netidmgr" />
-          <File name="khdefs.h"             from="auth\krb5\src\windows\identity\obj\i386\%bldtype%\inc\"    to="\inc\netidmgr" />
-          <File name="khconfigui.h"         from="auth\krb5\src\windows\identity\obj\i386\%bldtype%\inc\"    to="\inc\netidmgr" />
-          <File name="khalerts.h"           from="auth\krb5\src\windows\identity\obj\i386\%bldtype%\inc\"    to="\inc\netidmgr" />
-          <File name="khactiondef.h"        from="auth\krb5\src\windows\identity\obj\i386\%bldtype%\inc\"    to="\inc\netidmgr" />
-          <File name="khaction.h"           from="auth\krb5\src\windows\identity\obj\i386\%bldtype%\inc\"    to="\inc\netidmgr" />
-          <File name="kcreddb.h"            from="auth\krb5\src\windows\identity\obj\i386\%bldtype%\inc\"    to="\inc\netidmgr" />
-          <File name="kconfig.h"            from="auth\krb5\src\windows\identity\obj\i386\%bldtype%\inc\"    to="\inc\netidmgr" />
-          <File name="hashtable.h"          from="auth\krb5\src\windows\identity\obj\i386\%bldtype%\inc\"    to="\inc\netidmgr" />
           <File name="nidmgr32.lib"         from="..\target\lib\i386\%bldtype%\"    to="\lib\i386" />
           <File name="xpprof32.lib"         from="..\target\lib\i386\%bldtype%\"    to="\lib\i386" />
           <File name="wshelp32.lib"         from="..\target\lib\i386\%bldtype%\"    to="\lib\i386" />
           <File name="loadfuncs.lib"        from="..\target\lib\i386\%bldtype%\"    to="\lib\i386" />
           <File name="leashw32.lib"         from="..\target\lib\i386\%bldtype%\"    to="\lib\i386" />
-          <File name="krbv4w32.lib"         from="..\target\lib\i386\%bldtype%\"    to="\lib\i386" />
           <File name="krbcc32.lib"          from="..\target\lib\i386\%bldtype%\"    to="\lib\i386" />
           <File name="krb5_32.lib"          from="..\target\lib\i386\%bldtype%\"    to="\lib\i386" />
           <File name="krb524.lib"           from="..\target\lib\i386\%bldtype%\"    to="\lib\i386" />
@@ -48,10 +19,6 @@
           <File name="getopt.lib"           from="..\target\lib\i386\%bldtype%\"    to="\lib\i386" />
           <File name="delaydlls.lib"        from="..\target\lib\i386\%bldtype%\"    to="\lib\i386" />
           <File name="comerr32.lib"         from="..\target\lib\i386\%bldtype%\"    to="\lib\i386" />
-          <File name="netidmgr.exe"         from="auth\krb5\src\windows\identity\obj\i386\%bldtype%\w2k\"    to="\bin\i386\w2k" />
-          <File name="nidmgr32.dll"         from="auth\krb5\src\windows\identity\obj\i386\%bldtype%\w2k\"    to="\bin\i386\w2k" />
-          <File name="netidmgr.pdb"         from="auth\krb5\src\windows\identity\obj\i386\%bldtype%\w2k\"    to="\bin\i386\w2k" />
-          <File name="nidmgr32.pdb"         from="auth\krb5\src\windows\identity\obj\i386\%bldtype%\w2k\"    to="\bin\i386\w2k" />
           <File name="kfwcpcc.pdb"          from="..\target\bin\i386\%bldtype%\"    to="\bin\i386" />
           <File name="kfwlogon.pdb"         from="..\target\bin\i386\%bldtype%\"    to="\bin\i386" />
           <File name="netidmgr.pdb"         from="..\target\bin\i386\%bldtype%\"    to="\bin\i386" />
@@ -128,21 +95,6 @@
         <File name="leash_userdoc.pdf"      from="auth\leash\help\"                                         to="\doc" />
         <File name="NetIdMgr.pdf"           from="auth\krb5\src\windows\identity\doc\"                      to="\doc" newname="netidmgr_userdoc.pdf" />
         <File name="msi-deployment-guide.txt" from="auth\krb5\src\windows\installer\wix\"   to="\doc" />
-        <File name="*"                      from="auth\krb5\src\windows\identity\sample\templates\credprov\"            to="\sample\templates\credprov\" />
-        <File name="*"                      from="auth\krb5\src\windows\identity\sample\templates\credprov\images\"     to="\sample\templates\credprov\images" />
-        <File name="*"                      from="auth\krb5\src\windows\identity\sample\templates\credprov\lang\"       to="\sample\templates\credprov\lang" />
-        <File name="*"                      from="auth\krb5\src\windows\identity\sample\templates\credprov\lang\en_us\" to="\sample\templates\credprov\lang\en_us" />
-        <File name="kclient.h"              from="auth\krb4\kclient\include\"    to="\inc\kclient" />
-        <File name="kcmacerr.h"             from="auth\krb4\kclient\include\"    to="\inc\kclient" />
-        <File name="com_err.h"              from="auth\krb4\include\"    to="\inc\krb4" />
-        <File name="conf-pc.h"              from="auth\krb4\include\"    to="\inc\krb4" />
-        <File name="conf.h"                 from="auth\krb4\include\"    to="\inc\krb4" />
-        <File name="des.h"                  from="auth\krb4\include\"    to="\inc\krb4" />
-        <File name="kadm_err.h"             from="auth\krb4\include\"    to="\inc\krb4" />
-        <File name="krb.h"                  from="auth\krb4\include\"    to="\inc\krb4" />
-        <File name="krberr.h"               from="auth\krb4\include\"    to="\inc\krb4" />
-        <File name="mit_copy.h"             from="auth\krb4\include\"    to="\inc\krb4" />
-        <File name="osconf.h"               from="auth\krb4\include\"    to="\inc\krb4" />
         <File name="com_err.h"              from="auth\krb5\src\include\"       to="\inc\krb5" />
         <File name="krb5.h"                 from="auth\krb5\src\include\"       to="\inc\krb5" />
         <File name="profile.h"              from="auth\krb5\src\include\"       to="\inc\krb5" />
@@ -151,11 +103,6 @@
         <File name="gssapi.h"               from="auth\krb5\src\include\gssapi\"    to="\inc\krb5\gssapi" />
         <File name="gssapi_generic.h"       from="auth\krb5\src\include\gssapi\"    to="\inc\krb5\gssapi" />
         <File name="gssapi_krb5.h"          from="auth\krb5\src\include\gssapi\"    to="\inc\krb5\gssapi" />
-        <File name="des.h"                  from="auth\krb5\src\include\KerberosIV\"    to="\inc\krb5\KerberosIV" />
-        <File name="kadm_err.h"             from="auth\krb5\src\include\KerberosIV\"    to="\inc\krb5\KerberosIV" />
-        <File name="krb_err.h"              from="auth\krb5\src\include\KerberosIV\"    to="\inc\krb5\KerberosIV" />
-        <File name="krb.h"                  from="auth\krb5\src\include\KerberosIV\"    to="\inc\krb5\KerberosIV" />
-        <File name="mit-copyright.h"        from="auth\krb5\src\include\KerberosIV\"    to="\inc\krb5\KerberosIV" />
         <File name="cacheapi.h"             from="auth\krbcc\include\"    to="\inc\krbcc" />
         <File name="leasherr.h"             from="auth\leash\include\"    to="\inc\leash" />
         <File name="leashinfo.h"            from="auth\leash\include\"    to="\inc\leash" />
@@ -177,16 +124,6 @@
         <File name="mitwhich.h"             from="wshelper\include\"        to="\inc\wshelper" />
         <File name="resolv.h"               from="wshelper\include\"        to="\inc\wshelper" />
         <File name="wshelper.h"             from="wshelper\include\"        to="\inc\wshelper" />
-        <File name="kfw-fixed.nsi"          from="auth\krb5\src\windows\installer\nsis\"    to="\install\nsis" />
-        <File name="kfw.ico"                from="auth\krb5\src\windows\installer\nsis\"    to="\install\nsis" />
-        <File name="kfw.nsi"                from="auth\krb5\src\windows\installer\nsis\"    to="\install\nsis" />
-        <File name="KfWConfigPage.ini"      from="auth\krb5\src\windows\installer\nsis\"    to="\install\nsis" />
-        <File name="KfWConfigPage2.ini"     from="auth\krb5\src\windows\installer\nsis\"    to="\install\nsis" />
-        <File name="killer.cpp"             from="auth\krb5\src\windows\installer\nsis\"    to="\install\nsis" />
-        <File name="licenses.rtf"           from="auth\krb5\src\windows\installer\nsis\"    to="\install\nsis" />
-        <File name="site-local-tagged.nsi"  from="auth\krb5\src\windows\installer\nsis\"    to="\install\nsis" />
-        <File name="nsi-includes-tagged.nsi" from="auth\krb5\src\windows\installer\nsis\"   to="\install\nsis" />
-        <File name="utils.nsi"              from="auth\krb5\src\windows\installer\nsis\"    to="\install\nsis" />
         <File name="msi-deployment-guide.txt" from="auth\krb5\src\windows\installer\wix\"   to="\install\wix" />
         <File name="config.wxi"             from="auth\krb5\src\windows\installer\wix\"     to="\install\wix" />
         <File name="features.wxi"           from="auth\krb5\src\windows\installer\wix\"     to="\install\wix" />
@@ -216,6 +153,4 @@
         <File name="ui_1033.wxi"            from="auth\krb5\src\windows\installer\wix\lang\"    to="\install\wix\lang" />
         <File name="license.rtf"            from="auth\krb5\src\windows\installer\wix\lang\"    to="\install\wix\lang" />
         <File name="krb5.conf"              from="auth\krb5\src\config-files\"  to="\sample" newname="krb5.ini" />
-        <File name="krb.con"                from="auth\krb4\sample-config\"     to="\sample" />
-        <File name="krbrealm.con"           from="auth\krb4\sample-config\"     to="\sample" />
     </Files>
\ No newline at end of file