Be smarter about cleaning the staging area.

Clean output area if packaging.  (Will not clean if -nopackage specified.)

Pull corebinaries from staging area instead of from target area.

Don't sign before making zips.  Build products are only signed in the staging area before any packaging is done.  (Packaging products are signed when copied to the output area.)

Previous change: Add relnotes.html to output area.

Target_Version: 1.6.1
Ticket: 5490
Tags: pullup

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

3 files changed, 86 insertions, 78 deletions

diff --git a/src/windows/build/bkw.pl b/src/windows/build/bkw.pl
index 7c25399aa0..a5d0142335 100644
--- a/src/windows/build/bkw.pl
+++ b/src/windows/build/bkw.pl
@@ -403,10 +403,20 @@ print Dumper($prunes);
 ##++ Package action:

     if ($switches[0]->{nopackage}->{value}) {      ## If /clean, this switch will have been cleared.

         print "Info -- *** Skipping packaging.";

+        if (-d $out) {

+            print "Warning -- *** Output directory $out will not be cleaned.\n";

+            }

         }

     else {

         if ($verbose) {print "Info -- *** Begin prepackage.\n";}

 

+        if (-d $out) {

+            !system("rm -rf $out/*")            or die "Fatal -- Couldn't clean $out.";

+            }

+        else {

+            mkdir($out)                         or die "Fatal -- Couldn't create $out.";

+            }

+

         # We read in the version information to be able to update the site-local files in the install build areas:

         local $version_path = $config->{Stages}->{Package}->{Config}->{Paths}->{Versions}->{path};

         open(DAT, "$src/$version_path")     or die "Could not open $version_path.";

@@ -467,9 +477,12 @@ print Dumper($prunes);
         my $staging     = "$wd\\staging";

         chdir($wd)                          or die "Fatal -- couldn't chdir to $wd\n";

         print "Info -- chdir to ".`cd`."\n" if ($verbose);

-        !system("rm -rf $staging/*")        or die "Fatal -- Couldn't clean $staging.";

-        !system("rmdir $staging")           or die "Fatal -- Couldn't remove $staging.";

-        mkdir($staging)                     or die "Fatal -- Couldn't create $staging.";

+        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";

diff --git a/src/windows/build/corebinaryfiles.xml b/src/windows/build/corebinaryfiles.xml
index 672bca0d0e..41c569e6c1 100644
--- a/src/windows/build/corebinaryfiles.xml
+++ b/src/windows/build/corebinaryfiles.xml
@@ -5,77 +5,77 @@
 		<File dummy="foo" /> <!-- Forces XML::Simple behavior -->

 			<!-- Without this, XML::Simple does not make an anonymous array and I can't figure out how to iterate over it. -->

 

-		<File name="leash_userdoc.pdf" from="staging\doc" to="doc" />

-		<File name="relnotes.html" from="doc\kerberos" to="doc" />

+		<File name="leash_userdoc.pdf" from="staging\doc"       to="doc" />

+		<File name="relnotes.html"  from="doc\kerberos"         to="doc" />

 

-		<File name="comerr32.dll" from="target\bin\i386\%bldtype%\" to="\bin\i386\" />

-		<File name="comerr32.pdb" from="target\bin\i386\%bldtype%\" to="\bin\i386\" />

-		<File name="gss-client.exe" from="target\bin\i386\%bldtype%\" to="\bin\i386\" />

-		<File name="gss-client.pdb" from="target\bin\i386\%bldtype%\" to="\bin\i386\" />

-		<File name="gss-server.exe" from="target\bin\i386\%bldtype%\" to="\bin\i386\" />

-		<File name="gss-server.pdb" from="target\bin\i386\%bldtype%\" to="\bin\i386\" />

-		<File name="gss.exe" from="target\bin\i386\%bldtype%\" to="\bin\i386\" />

-		<File name="gss.pdb" from="target\bin\i386\%bldtype%\" to="\bin\i386\" />

-		<File name="gssapi32.dll" from="target\bin\i386\%bldtype%\" to="\bin\i386\" />

-		<File name="gssapi32.pdb" from="target\bin\i386\%bldtype%\" to="\bin\i386\" />

-		<File name="k524init.exe" from="target\bin\i386\%bldtype%\" to="\bin\i386\" />

-		<File name="k524init.pdb" from="target\bin\i386\%bldtype%\" to="\bin\i386\" />

-		<File name="k5sprt32.dll" from="target\bin\i386\%bldtype%\" to="\bin\i386\" />

-		<File name="k5sprt32.pdb" from="target\bin\i386\%bldtype%\" to="\bin\i386\" />

-		<File name="kclnt32.dll" from="target\bin\i386\%bldtype%\" to="\bin\i386\" />

-		<File name="kclnt32.pdb" from="target\bin\i386\%bldtype%\" to="\bin\i386\" />

-		<File name="kcpytkt.exe" from="target\bin\i386\%bldtype%\" to="\bin\i386\" />

-		<File name="kcpytkt.pdb" from="target\bin\i386\%bldtype%\" to="\bin\i386\" />

-		<File name="kdeltkt.exe" from="target\bin\i386\%bldtype%\" to="\bin\i386\" />

-		<File name="kdeltkt.pdb" from="target\bin\i386\%bldtype%\" to="\bin\i386\" />

-		<File name="kdestroy.exe" from="target\bin\i386\%bldtype%\" to="\bin\i386\" />

-		<File name="kdestroy.pdb" from="target\bin\i386\%bldtype%\" to="\bin\i386\" />

-		<File name="kfwcpcc.exe" from="target\bin\i386\%bldtype%\" to="\bin\i386\" />

-		<File name="kfwcpcc.pdb" from="target\bin\i386\%bldtype%\" to="\bin\i386\" />

-		<File name="kfwlogon.dll" from="target\bin\i386\%bldtype%\" to="\bin\i386\" />

-		<File name="kfwlogon.pdb" from="target\bin\i386\%bldtype%\" to="\bin\i386\" />

-		<File name="kinit.exe" from="target\bin\i386\%bldtype%\" to="\bin\i386\" />

-		<File name="kinit.pdb" from="target\bin\i386\%bldtype%\" to="\bin\i386\" />

-		<File name="klist.exe" from="target\bin\i386\%bldtype%\" to="\bin\i386\" />

-		<File name="klist.pdb" from="target\bin\i386\%bldtype%\" to="\bin\i386\" />

-		<File name="kpasswd.exe" from="target\bin\i386\%bldtype%\" to="\bin\i386\" />

-		<File name="kpasswd.pdb" from="target\bin\i386\%bldtype%\" to="\bin\i386\" />

-		<File name="krb4cred.dll" from="target\bin\i386\%bldtype%\" to="\bin\i386\" />

-		<File name="krb4cred.pdb" from="target\bin\i386\%bldtype%\" to="\bin\i386\" />

-		<File name="krb4cred_en_us.dll" from="target\bin\i386\%bldtype%\" to="\bin\i386\" />

-		<File name="krb524.dll" from="target\bin\i386\%bldtype%\" to="\bin\i386\" />

-		<File name="krb524.pdb" from="target\bin\i386\%bldtype%\" to="\bin\i386\" />

-		<File name="krb5cred.dll" from="target\bin\i386\%bldtype%\" to="\bin\i386\" />

-		<File name="krb5cred.pdb" from="target\bin\i386\%bldtype%\" to="\bin\i386\" />

-		<File name="krb5cred_en_us.dll" from="target\bin\i386\%bldtype%\" to="\bin\i386\" />

-		<File name="krb5_32.dll" from="target\bin\i386\%bldtype%\" to="\bin\i386\" />

-		<File name="krb5_32.pdb" from="target\bin\i386\%bldtype%\" to="\bin\i386\" />

-		<File name="krbcc32.dll" from="target\bin\i386\%bldtype%\" to="\bin\i386\" />

-		<File name="krbcc32.pdb" from="target\bin\i386\%bldtype%\" to="\bin\i386\" />

-		<File name="krbcc32s.exe" from="target\bin\i386\%bldtype%\" to="\bin\i386\" />

-		<File name="krbcc32s.pdb" from="target\bin\i386\%bldtype%\" to="\bin\i386\" />

-		<File name="krbv4w32.dll" from="target\bin\i386\%bldtype%\" to="\bin\i386\" />

-		<File name="krbv4w32.pdb" from="target\bin\i386\%bldtype%\" to="\bin\i386\" />

-		<File name="kvno.exe" from="target\bin\i386\%bldtype%\" to="\bin\i386\" />

-		<File name="kvno.pdb" from="target\bin\i386\%bldtype%\" to="\bin\i386\" />

-		<File name="leash32.chm" from="target\bin\i386\%bldtype%\" to="\bin\i386\" />

-		<File name="leash32.exe" from="target\bin\i386\%bldtype%\" to="\bin\i386\" />

-		<File name="leash32.pdb" from="target\bin\i386\%bldtype%\" to="\bin\i386\" />

-		<File name="leashw32.dll" from="target\bin\i386\%bldtype%\" to="\bin\i386\" />

-		<File name="leashw32.pdb" from="target\bin\i386\%bldtype%\" to="\bin\i386\" />

-		<File name="mit2ms.exe" from="target\bin\i386\%bldtype%\" to="\bin\i386\" />

-		<File name="mit2ms.pdb" from="target\bin\i386\%bldtype%\" to="\bin\i386\" />

-		<File name="ms2mit.exe" from="target\bin\i386\%bldtype%\" to="\bin\i386\" />

-		<File name="ms2mit.pdb" from="target\bin\i386\%bldtype%\" to="\bin\i386\" />

-		<File name="netidmgr.chm" from="target\bin\i386\%bldtype%\" to="\bin\i386\" />

-		<File name="netidmgr.exe" from="target\bin\i386\%bldtype%\" to="\bin\i386\" />

-		<File name="netidmgr.pdb" from="target\bin\i386\%bldtype%\" to="\bin\i386\" />

-		<File name="nidmgr32.dll" from="target\bin\i386\%bldtype%\" to="\bin\i386\" />

-		<File name="nidmgr32.pdb" from="target\bin\i386\%bldtype%\" to="\bin\i386\" />

-		<File name="wshelp32.dll" from="target\bin\i386\%bldtype%\" to="\bin\i386\" />

-		<File name="wshelp32.pdb" from="target\bin\i386\%bldtype%\" to="\bin\i386\" />

-		<File name="xpprof32.dll" from="target\bin\i386\%bldtype%\" to="\bin\i386\" />

-		<File name="xpprof32.pdb" from="target\bin\i386\%bldtype%\" to="\bin\i386\" />

+		<File name="comerr32.dll"   from="staging\bin\i386"     to="\bin\i386\" />

+		<File name="comerr32.pdb"   from="staging\bin\i386"     to="\bin\i386\" />

+		<File name="gss-client.exe" from="staging\bin\i386"     to="\bin\i386\" />

+		<File name="gss-client.pdb" from="staging\bin\i386"     to="\bin\i386\" />

+		<File name="gss-server.exe" from="staging\bin\i386"     to="\bin\i386\" />

+		<File name="gss-server.pdb" from="staging\bin\i386"     to="\bin\i386\" />

+		<File name="gss.exe"        from="staging\bin\i386"     to="\bin\i386\" />

+		<File name="gss.pdb"        from="staging\bin\i386"     to="\bin\i386\" />

+		<File name="gssapi32.dll"   from="staging\bin\i386"     to="\bin\i386\" />

+		<File name="gssapi32.pdb"   from="staging\bin\i386"     to="\bin\i386\" />

+		<File name="k524init.exe"   from="staging\bin\i386"     to="\bin\i386\" />

+		<File name="k524init.pdb"   from="staging\bin\i386"     to="\bin\i386\" />

+		<File name="k5sprt32.dll"   from="staging\bin\i386"     to="\bin\i386\" />

+		<File name="k5sprt32.pdb"   from="staging\bin\i386"     to="\bin\i386\" />

+		<File name="kclnt32.dll"    from="staging\bin\i386"     to="\bin\i386\" />

+		<File name="kclnt32.pdb"    from="staging\bin\i386"     to="\bin\i386\" />

+		<File name="kcpytkt.exe"    from="staging\bin\i386"     to="\bin\i386\" />

+		<File name="kcpytkt.pdb"    from="staging\bin\i386"     to="\bin\i386\" />

+		<File name="kdeltkt.exe"    from="staging\bin\i386"     to="\bin\i386\" />

+		<File name="kdeltkt.pdb"    from="staging\bin\i386"     to="\bin\i386\" />

+		<File name="kdestroy.exe"   from="staging\bin\i386"     to="\bin\i386\" />

+		<File name="kdestroy.pdb"   from="staging\bin\i386"     to="\bin\i386\" />

+		<File name="kfwcpcc.exe"    from="staging\bin\i386"     to="\bin\i386\" />

+		<File name="kfwcpcc.pdb"    from="staging\bin\i386"     to="\bin\i386\" />

+		<File name="kfwlogon.dll"   from="staging\bin\i386"     to="\bin\i386\" />

+		<File name="kfwlogon.pdb"   from="staging\bin\i386"     to="\bin\i386\" />

+		<File name="kinit.exe"      from="staging\bin\i386"     to="\bin\i386\" />

+		<File name="kinit.pdb"      from="staging\bin\i386"     to="\bin\i386\" />

+		<File name="klist.exe"      from="staging\bin\i386"     to="\bin\i386\" />

+		<File name="klist.pdb"      from="staging\bin\i386"     to="\bin\i386\" />

+		<File name="kpasswd.exe"    from="staging\bin\i386"     to="\bin\i386\" />

+		<File name="kpasswd.pdb"    from="staging\bin\i386"     to="\bin\i386\" />

+		<File name="krb4cred.dll"   from="staging\bin\i386"     to="\bin\i386\" />

+		<File name="krb4cred.pdb"   from="staging\bin\i386"     to="\bin\i386\" />

+		<File name="krb4cred_en_us.dll" from="staging\bin\i386" to="\bin\i386\" />

+		<File name="krb524.dll"     from="staging\bin\i386"     to="\bin\i386\" />

+		<File name="krb524.pdb"     from="staging\bin\i386"     to="\bin\i386\" />

+		<File name="krb5cred.dll"   from="staging\bin\i386"     to="\bin\i386\" />

+		<File name="krb5cred.pdb"   from="staging\bin\i386"     to="\bin\i386\" />

+		<File name="krb5cred_en_us.dll" from="staging\bin\i386" to="\bin\i386\" />

+		<File name="krb5_32.dll"    from="staging\bin\i386"     to="\bin\i386\" />

+		<File name="krb5_32.pdb"    from="staging\bin\i386"     to="\bin\i386\" />

+		<File name="krbcc32.dll"    from="staging\bin\i386"     to="\bin\i386\" />

+		<File name="krbcc32.pdb"    from="staging\bin\i386"     to="\bin\i386\" />

+		<File name="krbcc32s.exe"   from="staging\bin\i386"     to="\bin\i386\" />

+		<File name="krbcc32s.pdb"   from="staging\bin\i386"     to="\bin\i386\" />

+		<File name="krbv4w32.dll"   from="staging\bin\i386"     to="\bin\i386\" />

+		<File name="krbv4w32.pdb"   from="staging\bin\i386"     to="\bin\i386\" />

+		<File name="kvno.exe"       from="staging\bin\i386"     to="\bin\i386\" />

+		<File name="kvno.pdb"       from="staging\bin\i386"     to="\bin\i386\" />

+		<File name="leash32.chm"    from="staging\bin\i386"     to="\bin\i386\" />

+		<File name="leash32.exe"    from="staging\bin\i386"     to="\bin\i386\" />

+		<File name="leash32.pdb"    from="staging\bin\i386"     to="\bin\i386\" />

+		<File name="leashw32.dll"   from="staging\bin\i386"     to="\bin\i386\" />

+		<File name="leashw32.pdb"   from="staging\bin\i386"     to="\bin\i386\" />

+		<File name="mit2ms.exe"     from="staging\bin\i386"     to="\bin\i386\" />

+		<File name="mit2ms.pdb"     from="staging\bin\i386"     to="\bin\i386\" />

+		<File name="ms2mit.exe"     from="staging\bin\i386"     to="\bin\i386\" />

+		<File name="ms2mit.pdb"     from="staging\bin\i386"     to="\bin\i386\" />

+		<File name="netidmgr.chm"   from="staging\bin\i386"     to="\bin\i386\" />

+		<File name="netidmgr.exe"   from="staging\bin\i386"     to="\bin\i386\" />

+		<File name="netidmgr.pdb"   from="staging\bin\i386"     to="\bin\i386\" />

+		<File name="nidmgr32.dll"   from="staging\bin\i386"     to="\bin\i386\" />

+		<File name="nidmgr32.pdb"   from="staging\bin\i386"     to="\bin\i386\" />

+		<File name="wshelp32.dll"   from="staging\bin\i386"     to="\bin\i386\" />

+		<File name="wshelp32.pdb"   from="staging\bin\i386"     to="\bin\i386\" />

+		<File name="xpprof32.dll"   from="staging\bin\i386"     to="\bin\i386\" />

+		<File name="xpprof32.pdb"   from="staging\bin\i386"     to="\bin\i386\" />

 

 <!--		

 target\bin\i386\%bldtype%\ w2k\netidmgr.exe

diff --git a/src/windows/build/makeZip.pl b/src/windows/build/makeZip.pl
index a805b74538..4162386df4 100644
--- a/src/windows/build/makeZip.pl
+++ b/src/windows/build/makeZip.pl
@@ -89,11 +89,6 @@ sub makeZip {
         $ENV{PATH} = $savedPATH;

         }

                     

-    # Sign files:

-    if ($switches[0]->{sign}->{value}) {

-        signFiles($zip->{Config}->{Signing}, $config);

-        }

-            

     local $zipfile  = Archive::Zip->new();

     local $topdir   = $zip->{topdir};

     $topdir         =~ s/%filestem%/$filestem/g;