pull up r19371 from trunk

 r19371@cathode-dark-space:  kpkoch | 2007-04-01 14:42:18 -0400
 Target_Version: 1.6.1
 Ticket: 5490
 Tags: pullup

 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.

ticket: 5490

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

diff --git a/src/windows/build/bkw.pl b/src/windows/build/bkw.pl
index 7c25399aa09b48a7dd66843c28b819e6396a2c4c..a5d0142335b4692a4970c898428ab37e73de9557 100644 (file)
--- a/src/windows/build/bkw.pl
+++ b/src/windows/build/bkw.pl
@@ -403,10 +403,20 @@ print Dumper($prunes);
 ##++ Package action:\r
     if ($switches[0]->{nopackage}->{value}) {      ## If /clean, this switch will have been cleared.\r
         print "Info -- *** Skipping packaging.";\r
+        if (-d $out) {\r
+            print "Warning -- *** Output directory $out will not be cleaned.\n";\r
+            }\r
         }\r
     else {\r
         if ($verbose) {print "Info -- *** Begin prepackage.\n";}\r
 \r
+        if (-d $out) {\r
+            !system("rm -rf $out/*")            or die "Fatal -- Couldn't clean $out.";\r
+            }\r
+        else {\r
+            mkdir($out)                         or die "Fatal -- Couldn't create $out.";\r
+            }\r
+\r
         # We read in the version information to be able to update the site-local files in the install build areas:\r
         local $version_path = $config->{Stages}->{Package}->{Config}->{Paths}->{Versions}->{path};\r
         open(DAT, "$src/$version_path")     or die "Could not open $version_path.";\r
@@ -467,9 +477,12 @@ print Dumper($prunes);
         my $staging     = "$wd\\staging";\r
         chdir($wd)                          or die "Fatal -- couldn't chdir to $wd\n";\r
         print "Info -- chdir to ".`cd`."\n" if ($verbose);\r
-        !system("rm -rf $staging/*")        or die "Fatal -- Couldn't clean $staging.";\r
-        !system("rmdir $staging")           or die "Fatal -- Couldn't remove $staging.";\r
-        mkdir($staging)                     or die "Fatal -- Couldn't create $staging.";\r
+        if (-d "staging") {\r
+            !system("rm -rf $staging/*")        or die "Fatal -- Couldn't clean $staging.";\r
+            }\r
+        else {\r
+            mkdir($staging)                     or die "Fatal -- Couldn't create $staging.";\r
+            }\r
         \r
         # Force Where From and To are relative to:\r
         $prepackage->{CopyList}->{Config}->{From}->{root}   = "$wd\\athena";\r

diff --git a/src/windows/build/corebinaryfiles.xml b/src/windows/build/corebinaryfiles.xml
index 672bca0d0e72058dce6d0a44ccc476d901d197bb..41c569e6c1826f9f4e5979f1e263c7a769bcef73 100644 (file)
--- a/src/windows/build/corebinaryfiles.xml
+++ b/src/windows/build/corebinaryfiles.xml
@@ -5,77 +5,77 @@
                <File dummy="foo" /> <!-- Forces XML::Simple behavior -->\r
                        <!-- Without this, XML::Simple does not make an anonymous array and I can't figure out how to iterate over it. -->\r
 \r
-               <File name="leash_userdoc.pdf" from="staging\doc" to="doc" />\r
-               <File name="relnotes.html" from="doc\kerberos" to="doc" />\r
+               <File name="leash_userdoc.pdf" from="staging\doc"       to="doc" />\r
+               <File name="relnotes.html"  from="doc\kerberos"         to="doc" />\r
 \r
-               <File name="comerr32.dll" from="target\bin\i386\%bldtype%\" to="\bin\i386\" />\r
-               <File name="comerr32.pdb" from="target\bin\i386\%bldtype%\" to="\bin\i386\" />\r
-               <File name="gss-client.exe" from="target\bin\i386\%bldtype%\" to="\bin\i386\" />\r
-               <File name="gss-client.pdb" from="target\bin\i386\%bldtype%\" to="\bin\i386\" />\r
-               <File name="gss-server.exe" from="target\bin\i386\%bldtype%\" to="\bin\i386\" />\r
-               <File name="gss-server.pdb" from="target\bin\i386\%bldtype%\" to="\bin\i386\" />\r
-               <File name="gss.exe" from="target\bin\i386\%bldtype%\" to="\bin\i386\" />\r
-               <File name="gss.pdb" from="target\bin\i386\%bldtype%\" to="\bin\i386\" />\r
-               <File name="gssapi32.dll" from="target\bin\i386\%bldtype%\" to="\bin\i386\" />\r
-               <File name="gssapi32.pdb" from="target\bin\i386\%bldtype%\" to="\bin\i386\" />\r
-               <File name="k524init.exe" from="target\bin\i386\%bldtype%\" to="\bin\i386\" />\r
-               <File name="k524init.pdb" from="target\bin\i386\%bldtype%\" to="\bin\i386\" />\r
-               <File name="k5sprt32.dll" from="target\bin\i386\%bldtype%\" to="\bin\i386\" />\r
-               <File name="k5sprt32.pdb" from="target\bin\i386\%bldtype%\" to="\bin\i386\" />\r
-               <File name="kclnt32.dll" from="target\bin\i386\%bldtype%\" to="\bin\i386\" />\r
-               <File name="kclnt32.pdb" from="target\bin\i386\%bldtype%\" to="\bin\i386\" />\r
-               <File name="kcpytkt.exe" from="target\bin\i386\%bldtype%\" to="\bin\i386\" />\r
-               <File name="kcpytkt.pdb" from="target\bin\i386\%bldtype%\" to="\bin\i386\" />\r
-               <File name="kdeltkt.exe" from="target\bin\i386\%bldtype%\" to="\bin\i386\" />\r
-               <File name="kdeltkt.pdb" from="target\bin\i386\%bldtype%\" to="\bin\i386\" />\r
-               <File name="kdestroy.exe" from="target\bin\i386\%bldtype%\" to="\bin\i386\" />\r
-               <File name="kdestroy.pdb" from="target\bin\i386\%bldtype%\" to="\bin\i386\" />\r
-               <File name="kfwcpcc.exe" from="target\bin\i386\%bldtype%\" to="\bin\i386\" />\r
-               <File name="kfwcpcc.pdb" from="target\bin\i386\%bldtype%\" to="\bin\i386\" />\r
-               <File name="kfwlogon.dll" from="target\bin\i386\%bldtype%\" to="\bin\i386\" />\r
-               <File name="kfwlogon.pdb" from="target\bin\i386\%bldtype%\" to="\bin\i386\" />\r
-               <File name="kinit.exe" from="target\bin\i386\%bldtype%\" to="\bin\i386\" />\r
-               <File name="kinit.pdb" from="target\bin\i386\%bldtype%\" to="\bin\i386\" />\r
-               <File name="klist.exe" from="target\bin\i386\%bldtype%\" to="\bin\i386\" />\r
-               <File name="klist.pdb" from="target\bin\i386\%bldtype%\" to="\bin\i386\" />\r
-               <File name="kpasswd.exe" from="target\bin\i386\%bldtype%\" to="\bin\i386\" />\r
-               <File name="kpasswd.pdb" from="target\bin\i386\%bldtype%\" to="\bin\i386\" />\r
-               <File name="krb4cred.dll" from="target\bin\i386\%bldtype%\" to="\bin\i386\" />\r
-               <File name="krb4cred.pdb" from="target\bin\i386\%bldtype%\" to="\bin\i386\" />\r
-               <File name="krb4cred_en_us.dll" from="target\bin\i386\%bldtype%\" to="\bin\i386\" />\r
-               <File name="krb524.dll" from="target\bin\i386\%bldtype%\" to="\bin\i386\" />\r
-               <File name="krb524.pdb" from="target\bin\i386\%bldtype%\" to="\bin\i386\" />\r
-               <File name="krb5cred.dll" from="target\bin\i386\%bldtype%\" to="\bin\i386\" />\r
-               <File name="krb5cred.pdb" from="target\bin\i386\%bldtype%\" to="\bin\i386\" />\r
-               <File name="krb5cred_en_us.dll" from="target\bin\i386\%bldtype%\" to="\bin\i386\" />\r
-               <File name="krb5_32.dll" from="target\bin\i386\%bldtype%\" to="\bin\i386\" />\r
-               <File name="krb5_32.pdb" from="target\bin\i386\%bldtype%\" to="\bin\i386\" />\r
-               <File name="krbcc32.dll" from="target\bin\i386\%bldtype%\" to="\bin\i386\" />\r
-               <File name="krbcc32.pdb" from="target\bin\i386\%bldtype%\" to="\bin\i386\" />\r
-               <File name="krbcc32s.exe" from="target\bin\i386\%bldtype%\" to="\bin\i386\" />\r
-               <File name="krbcc32s.pdb" from="target\bin\i386\%bldtype%\" to="\bin\i386\" />\r
-               <File name="krbv4w32.dll" from="target\bin\i386\%bldtype%\" to="\bin\i386\" />\r
-               <File name="krbv4w32.pdb" from="target\bin\i386\%bldtype%\" to="\bin\i386\" />\r
-               <File name="kvno.exe" from="target\bin\i386\%bldtype%\" to="\bin\i386\" />\r
-               <File name="kvno.pdb" from="target\bin\i386\%bldtype%\" to="\bin\i386\" />\r
-               <File name="leash32.chm" from="target\bin\i386\%bldtype%\" to="\bin\i386\" />\r
-               <File name="leash32.exe" from="target\bin\i386\%bldtype%\" to="\bin\i386\" />\r
-               <File name="leash32.pdb" from="target\bin\i386\%bldtype%\" to="\bin\i386\" />\r
-               <File name="leashw32.dll" from="target\bin\i386\%bldtype%\" to="\bin\i386\" />\r
-               <File name="leashw32.pdb" from="target\bin\i386\%bldtype%\" to="\bin\i386\" />\r
-               <File name="mit2ms.exe" from="target\bin\i386\%bldtype%\" to="\bin\i386\" />\r
-               <File name="mit2ms.pdb" from="target\bin\i386\%bldtype%\" to="\bin\i386\" />\r
-               <File name="ms2mit.exe" from="target\bin\i386\%bldtype%\" to="\bin\i386\" />\r
-               <File name="ms2mit.pdb" from="target\bin\i386\%bldtype%\" to="\bin\i386\" />\r
-               <File name="netidmgr.chm" from="target\bin\i386\%bldtype%\" to="\bin\i386\" />\r
-               <File name="netidmgr.exe" from="target\bin\i386\%bldtype%\" to="\bin\i386\" />\r
-               <File name="netidmgr.pdb" from="target\bin\i386\%bldtype%\" to="\bin\i386\" />\r
-               <File name="nidmgr32.dll" from="target\bin\i386\%bldtype%\" to="\bin\i386\" />\r
-               <File name="nidmgr32.pdb" from="target\bin\i386\%bldtype%\" to="\bin\i386\" />\r
-               <File name="wshelp32.dll" from="target\bin\i386\%bldtype%\" to="\bin\i386\" />\r
-               <File name="wshelp32.pdb" from="target\bin\i386\%bldtype%\" to="\bin\i386\" />\r
-               <File name="xpprof32.dll" from="target\bin\i386\%bldtype%\" to="\bin\i386\" />\r
-               <File name="xpprof32.pdb" from="target\bin\i386\%bldtype%\" to="\bin\i386\" />\r
+               <File name="comerr32.dll"   from="staging\bin\i386"     to="\bin\i386\" />\r
+               <File name="comerr32.pdb"   from="staging\bin\i386"     to="\bin\i386\" />\r
+               <File name="gss-client.exe" from="staging\bin\i386"     to="\bin\i386\" />\r
+               <File name="gss-client.pdb" from="staging\bin\i386"     to="\bin\i386\" />\r
+               <File name="gss-server.exe" from="staging\bin\i386"     to="\bin\i386\" />\r
+               <File name="gss-server.pdb" from="staging\bin\i386"     to="\bin\i386\" />\r
+               <File name="gss.exe"        from="staging\bin\i386"     to="\bin\i386\" />\r
+               <File name="gss.pdb"        from="staging\bin\i386"     to="\bin\i386\" />\r
+               <File name="gssapi32.dll"   from="staging\bin\i386"     to="\bin\i386\" />\r
+               <File name="gssapi32.pdb"   from="staging\bin\i386"     to="\bin\i386\" />\r
+               <File name="k524init.exe"   from="staging\bin\i386"     to="\bin\i386\" />\r
+               <File name="k524init.pdb"   from="staging\bin\i386"     to="\bin\i386\" />\r
+               <File name="k5sprt32.dll"   from="staging\bin\i386"     to="\bin\i386\" />\r
+               <File name="k5sprt32.pdb"   from="staging\bin\i386"     to="\bin\i386\" />\r
+               <File name="kclnt32.dll"    from="staging\bin\i386"     to="\bin\i386\" />\r
+               <File name="kclnt32.pdb"    from="staging\bin\i386"     to="\bin\i386\" />\r
+               <File name="kcpytkt.exe"    from="staging\bin\i386"     to="\bin\i386\" />\r
+               <File name="kcpytkt.pdb"    from="staging\bin\i386"     to="\bin\i386\" />\r
+               <File name="kdeltkt.exe"    from="staging\bin\i386"     to="\bin\i386\" />\r
+               <File name="kdeltkt.pdb"    from="staging\bin\i386"     to="\bin\i386\" />\r
+               <File name="kdestroy.exe"   from="staging\bin\i386"     to="\bin\i386\" />\r
+               <File name="kdestroy.pdb"   from="staging\bin\i386"     to="\bin\i386\" />\r
+               <File name="kfwcpcc.exe"    from="staging\bin\i386"     to="\bin\i386\" />\r
+               <File name="kfwcpcc.pdb"    from="staging\bin\i386"     to="\bin\i386\" />\r
+               <File name="kfwlogon.dll"   from="staging\bin\i386"     to="\bin\i386\" />\r
+               <File name="kfwlogon.pdb"   from="staging\bin\i386"     to="\bin\i386\" />\r
+               <File name="kinit.exe"      from="staging\bin\i386"     to="\bin\i386\" />\r
+               <File name="kinit.pdb"      from="staging\bin\i386"     to="\bin\i386\" />\r
+               <File name="klist.exe"      from="staging\bin\i386"     to="\bin\i386\" />\r
+               <File name="klist.pdb"      from="staging\bin\i386"     to="\bin\i386\" />\r
+               <File name="kpasswd.exe"    from="staging\bin\i386"     to="\bin\i386\" />\r
+               <File name="kpasswd.pdb"    from="staging\bin\i386"     to="\bin\i386\" />\r
+               <File name="krb4cred.dll"   from="staging\bin\i386"     to="\bin\i386\" />\r
+               <File name="krb4cred.pdb"   from="staging\bin\i386"     to="\bin\i386\" />\r
+               <File name="krb4cred_en_us.dll" from="staging\bin\i386" to="\bin\i386\" />\r
+               <File name="krb524.dll"     from="staging\bin\i386"     to="\bin\i386\" />\r
+               <File name="krb524.pdb"     from="staging\bin\i386"     to="\bin\i386\" />\r
+               <File name="krb5cred.dll"   from="staging\bin\i386"     to="\bin\i386\" />\r
+               <File name="krb5cred.pdb"   from="staging\bin\i386"     to="\bin\i386\" />\r
+               <File name="krb5cred_en_us.dll" from="staging\bin\i386" to="\bin\i386\" />\r
+               <File name="krb5_32.dll"    from="staging\bin\i386"     to="\bin\i386\" />\r
+               <File name="krb5_32.pdb"    from="staging\bin\i386"     to="\bin\i386\" />\r
+               <File name="krbcc32.dll"    from="staging\bin\i386"     to="\bin\i386\" />\r
+               <File name="krbcc32.pdb"    from="staging\bin\i386"     to="\bin\i386\" />\r
+               <File name="krbcc32s.exe"   from="staging\bin\i386"     to="\bin\i386\" />\r
+               <File name="krbcc32s.pdb"   from="staging\bin\i386"     to="\bin\i386\" />\r
+               <File name="krbv4w32.dll"   from="staging\bin\i386"     to="\bin\i386\" />\r
+               <File name="krbv4w32.pdb"   from="staging\bin\i386"     to="\bin\i386\" />\r
+               <File name="kvno.exe"       from="staging\bin\i386"     to="\bin\i386\" />\r
+               <File name="kvno.pdb"       from="staging\bin\i386"     to="\bin\i386\" />\r
+               <File name="leash32.chm"    from="staging\bin\i386"     to="\bin\i386\" />\r
+               <File name="leash32.exe"    from="staging\bin\i386"     to="\bin\i386\" />\r
+               <File name="leash32.pdb"    from="staging\bin\i386"     to="\bin\i386\" />\r
+               <File name="leashw32.dll"   from="staging\bin\i386"     to="\bin\i386\" />\r
+               <File name="leashw32.pdb"   from="staging\bin\i386"     to="\bin\i386\" />\r
+               <File name="mit2ms.exe"     from="staging\bin\i386"     to="\bin\i386\" />\r
+               <File name="mit2ms.pdb"     from="staging\bin\i386"     to="\bin\i386\" />\r
+               <File name="ms2mit.exe"     from="staging\bin\i386"     to="\bin\i386\" />\r
+               <File name="ms2mit.pdb"     from="staging\bin\i386"     to="\bin\i386\" />\r
+               <File name="netidmgr.chm"   from="staging\bin\i386"     to="\bin\i386\" />\r
+               <File name="netidmgr.exe"   from="staging\bin\i386"     to="\bin\i386\" />\r
+               <File name="netidmgr.pdb"   from="staging\bin\i386"     to="\bin\i386\" />\r
+               <File name="nidmgr32.dll"   from="staging\bin\i386"     to="\bin\i386\" />\r
+               <File name="nidmgr32.pdb"   from="staging\bin\i386"     to="\bin\i386\" />\r
+               <File name="wshelp32.dll"   from="staging\bin\i386"     to="\bin\i386\" />\r
+               <File name="wshelp32.pdb"   from="staging\bin\i386"     to="\bin\i386\" />\r
+               <File name="xpprof32.dll"   from="staging\bin\i386"     to="\bin\i386\" />\r
+               <File name="xpprof32.pdb"   from="staging\bin\i386"     to="\bin\i386\" />\r
 \r
 <!--           \r
 target\bin\i386\%bldtype%\ w2k\netidmgr.exe\r

diff --git a/src/windows/build/makeZip.pl b/src/windows/build/makeZip.pl
index a805b745386b27d45fa1898770baf5729b2aea89..4162386df402eeab6b846820ff52cde51176dd22 100644 (file)
--- a/src/windows/build/makeZip.pl
+++ b/src/windows/build/makeZip.pl
@@ -89,11 +89,6 @@ sub makeZip {
         $ENV{PATH} = $savedPATH;\r
         }\r
                     \r
-    # Sign files:\r
-    if ($switches[0]->{sign}->{value}) {\r
-        signFiles($zip->{Config}->{Signing}, $config);\r
-        }\r
-            \r
     local $zipfile  = Archive::Zip->new();\r
     local $topdir   = $zip->{topdir};\r
     $topdir         =~ s/%filestem%/$filestem/g;\r