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 7e1fd24c7d3d1472bdb06105db0c43881a62c0ac..9d8ed193e90b598f016d50e66a2d1a1395e28deb 100644 (file)
--- a/src/windows/build/BKWconfig.xml
+++ b/src/windows/build/BKWconfig.xml
@@ -115,7 +115,8 @@
                         </CopyList>\r
                     <Prunes> \r
                         <Prune dummy="foo" />\r
-                        <Prune name="MIT*.exe" />   <!-- MITKerberosForWindows.exe was copied to a new name in sdkfiles.xml. -->\r
+                        <Prune name="*.exe" />\r
+                        <Prune name="*.msi" />\r
                         </Prunes>\r
                 </Zip>\r
                 <Zip name="SRC" filename="%filestem%-src.zip" topdir="%filestem%-final">\r

diff --git a/src/windows/build/bkw.pl b/src/windows/build/bkw.pl
index ca8b3f82593ceec60bbad16d16f969bdc7304e35..20d219e0150a4129499880611698fb83247cea9f 100644 (file)
--- 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";}\r
         if (! -d $wd) {                        ## xcopy will create the entire path for us.\r
             !system("echo foo > a.tmp")                     or die "Fatal -- Couldn't create temporary file in ".`cd`;\r
-            !system("echo F | xcopy a.tmp $wd\\CVS\\a.tmp") or die "Fatal -- Couldn't xcopy to $wd.";\r
+            !system("echo F | xcopy a.tmp $wd\\CVS\\a.tmp") or die "Fatal -- Couldn't xcopy to $wd\\CVS.";\r
             !system("rm a.tmp")                             or die "Fatal -- Couldn't remove temporary file.";\r
             !system("rm $wd\\CVS\\a.tmp")                   or die "Fatal -- Couldn't remove temporary file.";\r
             }\r
@@ -506,7 +506,6 @@ sub main {
         # Now update site-local.nsi:\r
         chdir "..\\nsis";\r
         print "Info -- chdir to ".`cd`."\n"                                 if ($verbose);\r
-        local $tmpfile    = "site-local.sed" ;\r
         !system("sed -f ..\\wix\\$tmpfile site-local-tagged.nsi > b.tmp")   or die "Fatal -- Couldn't modify site-local.wxi.";\r
         # Add DEBUG or RELEASE:\r
         if ($switches[0]->{debug}->{value}) {                               ## debug build\r

diff --git a/src/windows/build/sdkfiles.xml b/src/windows/build/sdkfiles.xml
index 35535854145ee678ad616200ce8e82cdefe8a66d..d62b962b2db381252834231436acfa363cae9f59 100644 (file)
--- a/src/windows/build/sdkfiles.xml
+++ b/src/windows/build/sdkfiles.xml
@@ -11,28 +11,14 @@
                <File  name="*.h"           from="staging\inc"                  to="inc" />\r
 \r
                <File  name="*.*"           from="staging\install\nsis"         to="install\nsis\" />\r
+        <!-- We'll clean up the exes in the target directory in a later step.  -->\r
 \r
-               <File  name="MITKerberosForWindows%-DEBUG%.exe"\r
-                                           from="staging\install\nsis"         to="install\nsis\"  newname="%filestem%.exe" />\r
-        <!-- We'll clean up the MITKerberosForWindows.exe in the target directory in a later step.  -->\r
-\r
-               <File  name="config.wxi"    from="staging\install\wix"          to="install\wix\" />\r
-               <File  name="features.wxi"  from="staging\install\wix"          to="install\wix\" />\r
-               <File  name="files.wxi"     from="staging\install\wix"          to="install\wix\" />\r
-               <File  name="kfw.wxs"       from="staging\install\wix"          to="install\wix\" />\r
-               <File  name="Makefile"      from="staging\install\wix"          to="install\wix\" />\r
-               <File  name="msi-deployment-guide.txt" from="staging\install\wix" to="install\wix\" />\r
-               <File  name="property.wxi"  from="staging\install\wix"          to="install\wix\" />\r
-               <File  name="site-local.wxi" from="staging\install\wix"         to="install\wix\" />\r
-\r
-               <File  name="*.*"           from="staging\install\wix\Binary"   to="install\wix\Binary\" />\r
+               <File  name="*.*"           from="staging\install\wix"          to="install\wix\" />\r
+        <!-- We'll clean up the msi in the target directory in a later step.  -->\r
 \r
                <File  name="custom.cpp"    from="staging\install\wix\custom"   to="install\wix\custom\" />\r
                <File  name="custom.h"      from="staging\install\wix\custom"   to="install\wix\custom\" />\r
 \r
-               <File  name="config_1033.wxi" from="staging\install\wix\lang"   to="install\wix\lang\" />\r
-               <File  name="strings_1033.wxl" from="staging\install\wix\lang"  to="install\wix\lang\" />\r
-               <File  name="ui_1033.wxi"   from="staging\install\wix\lang"     to="install\wix\lang\" />\r
                <!-- Why not license.rtf? -->\r
 \r
                <File  name="*.lib"         from="staging\lib\i386"             to="lib\i386\" />\r

diff --git a/src/windows/build/signFiles.pl b/src/windows/build/signFiles.pl
index a94c4f2d990e7049168e23c5078123ad3a66cc9f..058eff2a46f53c9e56117788a0e3e09bd7d2863a 100644 (file)
--- 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"\r
         local $cmd  = "find . -iname \"$expr\"";\r
         local $list = `$cmd`;                       ## $list is files matching *.exe, for example.\r
-    foreach $target (split("\n", $list)) {\r
+        foreach $target (split("\n", $list)) {\r
             $target =~ s|/|\\|g;                    ## Flip path separators from unix-style to windows-style.\r
             local $template2    = $template;\r
             $template2          =~ s/%filename%/$target/;\r