diff options
| author | Tom Yu <tlyu@mit.edu> | 2007-04-18 22:16:28 +0000 |
|---|---|---|
| committer | Tom Yu <tlyu@mit.edu> | 2007-04-18 22:16:28 +0000 |
| commit | 31efbd9d56f0d98b28b51f14a682ed3a5276179f (patch) | |
| tree | 0ea2761e0cb4edb05fe1a2c3f33fae990063f47d /src | |
| parent | 7504a764352c7f546343c378d04d1e7396273bb6 (diff) | |
| download | krb5-31efbd9d56f0d98b28b51f14a682ed3a5276179f.zip krb5-31efbd9d56f0d98b28b51f14a682ed3a5276179f.tar.gz krb5-31efbd9d56f0d98b28b51f14a682ed3a5276179f.tar.bz2 | |
pull up r19465 from trunk
r19465@cathode-dark-space: kpkoch | 2007-04-13 14:11:35 -0400
Target_Version: 1.6.1
Ticket: 5521
Tags: pullup
Add BUILD_KFW=1 & DEBUG_SYMBOL=1 to build.pl invocation.
Align setting of RELEASE/DEBUG/BETA with release notes.
ticket: 5521
git-svn-id: svn://anonsvn.mit.edu/krb5/branches/krb5-1-6@19501 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src')
| -rw-r--r-- | src/windows/build/bkw.pl | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/windows/build/bkw.pl b/src/windows/build/bkw.pl index e935b32..c7ecf07 100644 --- a/src/windows/build/bkw.pl +++ b/src/windows/build/bkw.pl @@ -491,9 +491,11 @@ sub main { chdir("$wd\\athena") or die "Fatal -- couldn't chdir to source directory $wd\\athena\n";
print "Info -- chdir to ".`cd`."\n" if ($verbose);
local $dbgswitch = ($odr->{debug}->{def}) ? " " : "NODEBUG=1";
- !system("perl ../scripts/build.pl --softdirs --nolog $buildtarget $dbgswitch BUILD_OFFICIAL=1") or die "Fatal -- build $buildtarget failed.";
+ !system("perl ../scripts/build.pl --softdirs --nolog $buildtarget $dbgswitch BUILD_KFW=1 BUILD_OFFICIAL=1 DEBUG_SYMBOL=1")
+ or die "Fatal -- build $buildtarget failed.";
- chdir("$wd") or die "Fatal -- couldn't chdir to $wd.";
+ chdir("$wd") or die "Fatal -- couldn't chdir to $wd.";
+ print "Info -- chdir to ".`cd`."\n" if ($verbose);
if ($clean) {
if (-d "staging") {
!system("rm -rf staging") or die "Fatal -- Couldn't remove $wd\\staging.";
@@ -588,17 +590,15 @@ sub main { print "Info -- chdir to ".`cd`."\n" if ($verbose);
!system("sed -f ..\\wix\\$tmpfile site-local-tagged.nsi > b.tmp") or die "Fatal -- Couldn't modify site-local.wxi.";
# Add DEBUG or RELEASE:
- if ($odr->{debug}->{def}) { ## debug build
- !system("echo !define DEBUG >> b.tmp") or die "Fatal -- Couldn't modify b.tmp.";
+ if ($odr->{debug}->{def}) { ## debug build
+ !system("echo !define DEBUG >> b.tmp") or die "Fatal -- Couldn't modify b.tmp.";
}
- else { ## release build
- if (!exists $config->{Versions}->{'BETA_STR'}) {!system("echo !define RELEASE >> b.tmp") or die "Fatal -- Couldn't modify b.tmp.";}
- !system("echo !define NO_DEBUG >> b.tmp") or die "Fatal -- Couldn't modify b.tmp.";
+ else { ## release build
+ !system("echo !define RELEASE >> b.tmp") or die "Fatal -- Couldn't modify b.tmp.";
}
# Add BETA if present:
if (exists $config->{Versions}->{'BETA_STR'}) {
!system("echo !define BETA $config->{Versions}->{'BETA_STR'} >> b.tmp") or die "Fatal -- Couldn't modify b.tmp.";
- !system("echo !define NOT_RELEASE >> b.tmp") or die "Fatal -- Couldn't modify b.tmp.";
}
!system("mv -f b.tmp $wd\\buildnsi\\site-local.nsi") or die "Fatal -- Couldn't replace site-local.nsi.";
|