From: Tom Yu <tlyu@mit.edu>
Date: Fri, 30 Mar 2007 21:37:18 +0000 (+0000)
Subject: pull up r19363 from trunk
X-Git-Tag: kfw-3.2.0-beta1~15
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=993c504c392edae390f6582fdc212fd08c16b352;p=krb5.git

pull up r19363 from trunk

 r19363@cathode-dark-space:  kpkoch | 2007-03-30 17:24:18 -0400
 Target_Version: 1.6.1
 Ticket: 5490
 Tags: pullup

 For the sdk zip, copy *.* and then [the new part] remove *.exe and *.msi.  Further tweaks should be suggested in the form of mods to sdkfiles.xml.

 Minor formatting and removing redundant code.

ticket: 5490

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

diff --git a/src/windows/build/BKWconfig.xml b/src/windows/build/BKWconfig.xml
index 7e1fd24c7..9d8ed193e 100644
--- a/src/windows/build/BKWconfig.xml
+++ b/src/windows/build/BKWconfig.xml
@@ -115,7 +115,8 @@
                         </CopyList>
                     <Prunes> 
                         <Prune dummy="foo" />
-                        <Prune name="MIT*.exe" />   <!-- MITKerberosForWindows.exe was copied to a new name in sdkfiles.xml. -->
+                        <Prune name="*.exe" />
+                        <Prune name="*.msi" />
                         </Prunes>
                 </Zip>
                 <Zip name="SRC" filename="%filestem%-src.zip" topdir="%filestem%-final">
diff --git a/src/windows/build/bkw.pl b/src/windows/build/bkw.pl
index ca8b3f825..20d219e01 100644
--- a/src/windows/build/bkw.pl
+++ b/src/windows/build/bkw.pl
@@ -266,7 +266,7 @@ sub main {
         if ($verbose) {print "Info -- *** Begin fetching sources.\n";}
         if (! -d $wd) {                        ## xcopy will create the entire path for us.
             !system("echo foo > a.tmp")                     or die "Fatal -- Couldn't create temporary file in ".`cd`;
-            !system("echo F | xcopy a.tmp $wd\\CVS\\a.tmp") or die "Fatal -- Couldn't xcopy to $wd.";
+            !system("echo F | xcopy a.tmp $wd\\CVS\\a.tmp") or die "Fatal -- Couldn't xcopy to $wd\\CVS.";
             !system("rm a.tmp")                             or die "Fatal -- Couldn't remove temporary file.";
             !system("rm $wd\\CVS\\a.tmp")                   or die "Fatal -- Couldn't remove temporary file.";
             }
@@ -506,7 +506,6 @@ sub main {
         # Now update site-local.nsi:
         chdir "..\\nsis";
         print "Info -- chdir to ".`cd`."\n"                                 if ($verbose);
-        local $tmpfile    = "site-local.sed" ;
         !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 ($switches[0]->{debug}->{value}) {                               ## debug build
diff --git a/src/windows/build/sdkfiles.xml b/src/windows/build/sdkfiles.xml
index 355358541..d62b962b2 100644
--- a/src/windows/build/sdkfiles.xml
+++ b/src/windows/build/sdkfiles.xml
@@ -11,28 +11,14 @@
 		<File  name="*.h"           from="staging\inc"                  to="inc" />
 
 		<File  name="*.*"           from="staging\install\nsis"         to="install\nsis\" />
+        <!-- We'll clean up the exes in the target directory in a later step.  -->
 
-		<File  name="MITKerberosForWindows%-DEBUG%.exe"
-		                            from="staging\install\nsis"         to="install\nsis\"  newname="%filestem%.exe" />
-        <!-- We'll clean up the MITKerberosForWindows.exe in the target directory in a later step.  -->
-
-		<File  name="config.wxi"    from="staging\install\wix"          to="install\wix\" />
-		<File  name="features.wxi"  from="staging\install\wix"          to="install\wix\" />
-		<File  name="files.wxi"     from="staging\install\wix"          to="install\wix\" />
-		<File  name="kfw.wxs"       from="staging\install\wix"          to="install\wix\" />
-		<File  name="Makefile"      from="staging\install\wix"          to="install\wix\" />
-		<File  name="msi-deployment-guide.txt" from="staging\install\wix" to="install\wix\" />
-		<File  name="property.wxi"  from="staging\install\wix"          to="install\wix\" />
-		<File  name="site-local.wxi" from="staging\install\wix"         to="install\wix\" />
-
-		<File  name="*.*"           from="staging\install\wix\Binary"   to="install\wix\Binary\" />
+		<File  name="*.*"           from="staging\install\wix"          to="install\wix\" />
+        <!-- We'll clean up the msi in the target directory in a later step.  -->
 
 		<File  name="custom.cpp"    from="staging\install\wix\custom"   to="install\wix\custom\" />
 		<File  name="custom.h"      from="staging\install\wix\custom"   to="install\wix\custom\" />
 
-		<File  name="config_1033.wxi" from="staging\install\wix\lang"   to="install\wix\lang\" />
-		<File  name="strings_1033.wxl" from="staging\install\wix\lang"  to="install\wix\lang\" />
-		<File  name="ui_1033.wxi"   from="staging\install\wix\lang"     to="install\wix\lang\" />
 		<!-- Why not license.rtf? -->
 
 		<File  name="*.lib"         from="staging\lib\i386"             to="lib\i386\" />
diff --git a/src/windows/build/signFiles.pl b/src/windows/build/signFiles.pl
index a94c4f2d9..058eff2a4 100644
--- a/src/windows/build/signFiles.pl
+++ b/src/windows/build/signFiles.pl
@@ -13,7 +13,7 @@ sub signFiles {
     foreach $expr (split(" ", $exprs)) {            ## exprs is something like "*.exe *.dll"
         local $cmd  = "find . -iname \"$expr\"";
         local $list = `$cmd`;                       ## $list is files matching *.exe, for example.
-    foreach $target (split("\n", $list)) {
+        foreach $target (split("\n", $list)) {
             $target =~ s|/|\\|g;                    ## Flip path separators from unix-style to windows-style.
             local $template2    = $template;
             $template2          =~ s/%filename%/$target/;