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

diff --git a/src/windows/build/bkw.pl b/src/windows/build/bkw.pl
index e935b3213f329793d6c9b8b92ce6f59a10078f01..c7ecf072088cea966f5a41158ff0ca915c01eff5 100644 (file)
--- 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";\r
         print "Info -- chdir to ".`cd`."\n"         if ($verbose);\r
         local $dbgswitch = ($odr->{debug}->{def}) ? " " : "NODEBUG=1";\r
-        !system("perl ../scripts/build.pl --softdirs --nolog $buildtarget $dbgswitch BUILD_OFFICIAL=1")    or die "Fatal -- build $buildtarget failed.";\r
+        !system("perl ../scripts/build.pl --softdirs --nolog $buildtarget $dbgswitch BUILD_KFW=1 BUILD_OFFICIAL=1 DEBUG_SYMBOL=1")\r
+            or die "Fatal -- build $buildtarget failed.";\r
             \r
-        chdir("$wd")               or die "Fatal -- couldn't chdir to $wd.";\r
+        chdir("$wd")                        or die "Fatal -- couldn't chdir to $wd.";\r
+        print "Info -- chdir to ".`cd`."\n" if ($verbose);\r
         if ($clean) {\r
             if (-d "staging") {\r
                 !system("rm -rf staging")   or die "Fatal -- Couldn't remove $wd\\staging.";\r
@@ -588,17 +590,15 @@ sub main {
         print "Info -- chdir to ".`cd`."\n"                                 if ($verbose);\r
         !system("sed -f ..\\wix\\$tmpfile site-local-tagged.nsi > b.tmp")   or die "Fatal -- Couldn't modify site-local.wxi.";\r
         # Add DEBUG or RELEASE:\r
-        if ($odr->{debug}->{def}) {                               ## debug build\r
-            !system("echo !define DEBUG >> b.tmp")                          or die "Fatal -- Couldn't modify b.tmp.";    \r
+        if ($odr->{debug}->{def}) {                    ## debug build\r
+            !system("echo !define DEBUG >> b.tmp")     or die "Fatal -- Couldn't modify b.tmp.";    \r
             }\r
-        else {                                                    ## release build\r
-            if (!exists $config->{Versions}->{'BETA_STR'}) {!system("echo !define RELEASE >> b.tmp")   or die "Fatal -- Couldn't modify b.tmp.";}\r
-            !system("echo !define NO_DEBUG >> b.tmp")                       or die "Fatal -- Couldn't modify b.tmp.";    \r
+        else {                                         ## release build\r
+            !system("echo !define RELEASE >> b.tmp")   or die "Fatal -- Couldn't modify b.tmp.";\r
             }\r
         # Add BETA if present:\r
         if (exists $config->{Versions}->{'BETA_STR'}) {\r
             !system("echo !define BETA $config->{Versions}->{'BETA_STR'} >> b.tmp") or die "Fatal -- Couldn't modify b.tmp.";    \r
-            !system("echo !define NOT_RELEASE >> b.tmp")                            or die "Fatal -- Couldn't modify b.tmp.";    \r
             }\r
         !system("mv -f b.tmp $wd\\buildnsi\\site-local.nsi")                        or die "Fatal -- Couldn't replace site-local.nsi.";\r
 \r