From 92e8ef774a3de745553377c59f26d2135c4bebad Mon Sep 17 00:00:00 2001 From: Tom Yu Date: Mon, 2 Apr 2007 20:46:39 +0000 Subject: [PATCH] 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 --- src/windows/build/bkw.pl | 19 +++- src/windows/build/corebinaryfiles.xml | 140 +++++++++++++------------- src/windows/build/makeZip.pl | 5 - 3 files changed, 86 insertions(+), 78 deletions(-) diff --git a/src/windows/build/bkw.pl b/src/windows/build/bkw.pl index 7c25399aa..a5d014233 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 672bca0d0..41c569e6c 100644 --- a/src/windows/build/corebinaryfiles.xml +++ b/src/windows/build/corebinaryfiles.xml @@ -5,77 +5,77 @@ - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +