From: Tom Yu <tlyu@mit.edu>
Date: Mon, 2 Apr 2007 20:46:00 +0000 (+0000)
Subject: pull up r19368 from trunk
X-Git-Tag: kfw-3.2.0-beta1~7
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=68c740f0e167806cb3d4d2347e11ead080dc584b;p=krb5.git

pull up r19368 from trunk

 r19368@cathode-dark-space:  kpkoch | 2007-03-31 18:31:33 -0400
 Target_Version: 1.6.1
 Ticket: 5490
 Tags: pullup

 Add signing in staging area before building installers.

ticket: 5490

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

diff --git a/src/windows/build/bkw.pl b/src/windows/build/bkw.pl
index 5a2f7230c..55d60dfe8 100644
--- a/src/windows/build/bkw.pl
+++ b/src/windows/build/bkw.pl
@@ -463,18 +463,25 @@ print Dumper($prunes);
         
         # The build results are copied to a staging area, where the packager expects to find them.
         #  We put the staging area in the fixed area .../pismere/staging.
-        my $prepackage    = $config->{Stages}->{PrePackage};
-        my $staging_area = "$wd\\staging";
+        my $prepackage  = $config->{Stages}->{PrePackage};
+        my $staging     = "$wd\\staging";
         chdir($wd) or die "Fatal -- couldn't chdir to $wd\n";
         if ($verbose) {print "Info -- chdir to $wd\n";}
-        (-e $staging_area) or mkdir($staging_area);
+        (-e $staging) or mkdir($staging);
         
         # Force Where From and To are relative to:
         $prepackage->{CopyList}->{Config}->{From}->{root}   = "$wd\\athena";
         $prepackage->{CopyList}->{Config}->{To}->{root}     = "$wd\\staging";
         copyFiles($prepackage->{CopyList}, $config);        ## Copy any files [this step takes a while]
 
-        chdir("staging\\install\\wix") or die "Fatal -- Couldn't cd to $wd\\staging\\install\\wix";
+        # Sign files:
+        chdir($staging) or die "Fatal -- couldn't chdir to $staging\n";
+        print "Info -- chdir to ".`cd`."\n"     if ($verbose);
+        if ($switches[0]->{sign}->{value}) {
+            signFiles($config->{Stages}->{PostPackage}->{Config}->{Signing}, $config);
+            }
+            
+        chdir("$staging\\install\\wix") or die "Fatal -- Couldn't cd to $staging\\install\\wix";
         # Correct errors in files.wxi:
         !system("sed 's/WorkingDirectory=\"\\[dirbin\\]\"/WorkingDirectory=\"dirbin\"/g' files.wxi > a.tmp") or die "Fatal -- Couldn't modify files.wxi.";
         !system("mv a.tmp files.wxi") or die "Fatal -- Couldn't update files.wxi.";