Leave built installers in their temp areas and change final copy step to copy them...

Target_Version: 1.6.1
Ticket: 5521
Tags: pullup

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

diff --git a/src/windows/build/BKWconfig.xml b/src/windows/build/BKWconfig.xml
index b7c11d181c4682f409700c070e39ca69ac9e24a1..93167f3dca87379f02f89c351ecb63c0688018aa 100644 (file)
--- a/src/windows/build/BKWconfig.xml
+++ b/src/windows/build/BKWconfig.xml
@@ -43,7 +43,7 @@
         <SVNURL     def="A" value="svn.mit.edu" />   <!-- NB:  No protocol or slashes!! -->\r
         <username   def="0" value="" />  <!-- Needed for svn/plink.  Override from command line -->\r
 \r
-        <!-- Environment variables: -->>\r
+        <!-- Environment variables: -->\r
         <KH_RELEASE def="1" env="1" value="OFFICIAL" options="OFFICIAL PRERELEASE PRIVATE" />\r
         <NODEBUG    def="1" env="1" />  <!-- Interacts with /DEBUG -->\r
         </Config>\r
@@ -164,16 +164,16 @@
                         </Prunes>\r
                     </Zip>\r
                 </Zips>            \r
-            <CopyList>            <!-- Copied at end of post-package step.    -->\r
+            <CopyList>            <!-- Copied at end of post-package step.  -->\r
                 <Files>\r
                     <File dummy="foo" />\r
-                    <!-- File from    paths are relative to <src>/pismere.    -->\r
-                    <!-- File to      paths are relative to <out>.            -->\r
+                    <!-- File from    paths are relative to <src/pismere>.  -->\r
+                    <!-- File to      paths are relative to <out>.          -->\r
                     <File name="msi-deployment-guide.txt"   from="staging\install\wix\" to="" />\r
-                    <File name="netidmgr_userdoc.pdf"       from="staging\doc"          to="." />\r
-                    <File name="kfw.msi"                    from="staging\install\wix\" to="" newname="%filestem%.msi" />\r
-                    <File name="MITKerberosForWindows%-DEBUG%.exe" from="staging\install\nsis" to="" newname="%filestem%%-DEBUG%.exe" />\r
-                    <File name="relnotes.html"              from="staging\doc"          to="." />\r
+                    <File name="netidmgr_userdoc.pdf"       from="staging\doc"          to="" />\r
+                    <File name="kfw.msi"                    from="buildwix"             to="" newname="%filestem%.msi" />\r
+                    <File name="MITKerberosForWindows%-DEBUG%.exe" from="buildnsi"      to="" newname="%filestem%%-DEBUG%.exe" />\r
+                    <File name="relnotes.html"              from="staging\doc"          to="" />\r
                     </Files>\r
                 </CopyList>\r
             </PostPackage>\r

diff --git a/src/windows/build/bkw.pl b/src/windows/build/bkw.pl
index 6ea7c7f33484c7ee38866e5ec8c29b4cb5dcc5b6..f397654a7d513f21723c644546f4c521c6972e57 100644 (file)
--- a/src/windows/build/bkw.pl
+++ b/src/windows/build/bkw.pl
@@ -245,7 +245,7 @@ sub main {
     # Test the unix find command:\r
     if (! exists $odr->{unixfind}->{value})    {\r
         $odr->{unixfind}->{value}   = "C:\\tools\\cygwin\\bin";\r
-        }\r
+         }\r
     local $unixfind     = $odr->{unixfind}->{value};\r
 \r
     local $savedPATH    = $ENV{PATH};\r
@@ -629,23 +629,22 @@ sub main {
         !system("rename killer.exe Killer.exe")     or die "Error -- Couldn't rename killer.exe";\r
         !system("makensis kfw.nsi")                 or die "Error -- executable installer build failed.";\r
 \r
-        chdir("$wd")                                or die "Fatal -- Couldn't cd to $wd";\r
+# Begin packaging extra items:\r
+        chdir($wd)                                  or die "Fatal -- Couldn't cd to $wd";\r
         print "Info -- chdir to ".`cd`."\n"         if ($verbose);\r
-        !system("xcopy /s $wd\\buildwix\\*.msi $wd\\staging\\install\\wix")     or die "Fatal -- Couldn't copy $wd\\buildwix\\*.msi.";\r
-        !system("del $wd\\buildnsi\\killer.exe")    or die "Fatal -- Couldn't clean $wd\\buildnsi\\killer.exe.";\r
-        !system("xcopy /s $wd\\buildnsi\\*.exe $wd\\staging\\install\\nsis")    or die "Fatal -- Couldn't copy $wd\\buildnsi\\install\\nsis\\*.exe.";\r
-        !system("rm -rf $wd\\buildwix")            or die "Fatal -- Couldn't remove $wd\\buildwix.";\r
-        !system("rm -rf $wd\\buildnsi")            or die "Fatal -- Couldn't remove $wd\\buildnsi.";\r
 \r
-# Begin packaging extra items:\r
         zipXML($config->{Stages}->{PostPackage}, $config);                      ## Make zips.\r
 \r
         $config->{Stages}->{PostPackage}->{CopyList}->{Config} = $config->{Stages}->{PostPackage}->{Config};    ## Use the post package config.\r
         $config->{Stages}->{PostPackage}->{CopyList}->{Config}->{From}->{root}  = "$src\\pismere";\r
-        $config->{Stages}->{PostPackage}->{CopyList}->{Config}->{To}->{root}    = "$out";\r
+        $config->{Stages}->{PostPackage}->{CopyList}->{Config}->{To}->{root}    = $out;\r
         copyFiles($config->{Stages}->{PostPackage}->{CopyList}, $config);       ## Copy any files\r
 \r
-        print "Info -- chdir to ".`cd`."\n"     if ($verbose);\r
+        !system("rm -rf $wd\\buildwix")             or die "Fatal -- Couldn't remove $wd\\buildwix.";\r
+        !system("rm -rf $wd\\buildnsi")             or die "Fatal -- Couldn't remove $wd\\buildnsi.";\r
+\r
+        chdir($out)                                 or die "Fatal -- Couldn't cd to $out";\r
+        print "Info -- chdir to ".`cd`."\n"         if ($verbose);\r
         if ($odr->{sign}->{def}) {\r
             signFiles($config->{Stages}->{PostPackage}->{Config}->{Signing}, $config);\r
             }\r