pull up r19305 from trunk

 r19305@cathode-dark-space:  kpkoch | 2007-03-29 11:48:15 -0400
 Target_Version: 1.6.1
 Ticket: 5490
 Tags: pullup

 Change DEBUG and VERBOSE defaults so that omitting them from the command line has an effect!

 Pass NODEBUG=1 to build.pl.

ticket: 5490

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

diff --git a/src/windows/build/BKWconfig.xml b/src/windows/build/BKWconfig.xml
index 15c72f21bf7cd25ea8f2b4da07fe3a7c46af751b..9818db79c1a2844ae9cc213319b04e1360e244df 100644 (file)
--- a/src/windows/build/BKWconfig.xml
+++ b/src/windows/build/BKWconfig.xml
@@ -15,13 +15,13 @@
                        <unixfind       path    ="c:\cygwin\bin" />\r
                        </Directories>\r
                <Options>\r
-                       <debug value="1" />\r
+                       <debug value="0" />\r
                        <logfile value="1" path="bkw.pl.log" />\r
                        <repository value="skip" />\r
                        <clean value="0" />\r
                        <nomake value="0" />\r
                        <nopackage value="0" />\r
-                       <verbose value="1" />\r
+                       <verbose value="0" />\r
                        <vverbose value="0" />\r
                        </Options>\r
                </CommandLine>\r

diff --git a/src/windows/build/bkw.pl b/src/windows/build/bkw.pl
index 674498b768db76b17666f72984a70ff96f27532a..69b523c5d86387f83d301be48f60a2f4f765cf25 100644 (file)
--- a/src/windows/build/bkw.pl
+++ b/src/windows/build/bkw.pl
@@ -374,8 +374,8 @@ sub main {
                \r
                chdir("pismere/athena") or die "Fatal -- couldn't chdir to source directory $wd\\pismere\\athena\n";\r
                if ($verbose) {print "Info -- chdir to $wd\\pismere\\athena\n";}\r
-               local $log      = ($switches[0]->{logfile}->{value}) ? " " : " --nolog ";\r
-               !system("perl ../scripts/build.pl --softdirs --nolog $buildtarget")     or die "Fatal -- build $buildtarget failed.";\r
+               my $dbgswitch = ($switches[0]->{debug}->{value}) ? " " : "NODEBUG=1";\r
+               !system("perl ../scripts/build.pl --softdirs --nolog $buildtarget $dbgswitch")  or die "Fatal -- build $buildtarget failed.";\r
                        \r
                chdir("$wd\\pismere") or die "Fatal -- couldn't chdir to $wd\\pismere.";\r
                if ($clean) {\r