Remove obsolete comment

Add -nolog switch; always pass build.pl --nolog.  Logging will be done in bkw.pl.log

Create <src>/pismere/CVS if missing so checkout works.

Target_Version: 1.6.1
Ticket: 5490
Tags: pullup

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@19304 dc483132-0cff-0310-8789-dd5450dbe970

2 files changed, 16 insertions, 5 deletions

diff --git a/src/windows/build/BKWconfig.xml b/src/windows/build/BKWconfig.xml
index 28939444d..15c72f21b 100644
--- a/src/windows/build/BKWconfig.xml
+++ b/src/windows/build/BKWconfig.xml
@@ -78,7 +78,6 @@
 				</Config>

 			<MSI></MSI>

 			<NSIS></NSIS> <!-- NB:  Most config is done in site-local.nsi.	-->

-			<!-- Theoretically, writing site-local.nsi from xml settings could be done, but isn't.	-->

 		</Package>

 		<PostPackage>

 			<Config>													<!-- This config info will be copied into each CopyList in PostPackage. -->

diff --git a/src/windows/build/bkw.pl b/src/windows/build/bkw.pl
index 1593f134f..674498b76 100644
--- a/src/windows/build/bkw.pl
+++ b/src/windows/build/bkw.pl
@@ -54,7 +54,8 @@ Usage: $0 (-f --config) config-file [options] NMAKE-options
     /clean          Build clean target.

     /nopackage      Skip packaging step.

     /verbose /v        Debug mode - verbose output.

-    /logfile /l path   Where to write output.  If omitted, ...

+    /logfile /l path   Where to write output.  Default is bkw.pl.log

+    /nolog     Don't save output

   Other:

     NMAKE-options    any options you want to pass to NMAKE, which can be:

                      (note: /nologo is always used)

@@ -90,6 +91,7 @@ sub main {
 	       'debug|d',

 	       'config|f:s',

 	       'logfile|l:s',

+	       'nolog',

 	       'repository:s',

 	       'username|u:s',

 	       'verbose|v',

@@ -176,6 +178,9 @@ sub main {
 		$switches[0]->{logfile}->{path} = $OPT->{logfile};

 		$switches[0]->{logfile}->{value} = 1;

 		}

+	if (exists $OPT->{nolog}) {

+		$switches[0]->{logfile}->{value} = 0;

+		}

     our $verbose		= $config->{CommandLine}->{Options}->{verbose}->{value};

     our $vverbose		= $config->{CommandLine}->{Options}->{vverbose}->{value};

     our $clean				= $switches[0]->{clean}->{value};

@@ -221,7 +226,7 @@ sub main {
 			}

 		}

 

-	if ($rverb =~ /checkout/) {

+	if ( ($rverb =~ /checkout/) && (-d $wd) ){

 		print "\n\nHEADS UP!!\n\n";

 		print "/REPOSITORY CHECKOUT will cause everything under $wd to be deleted.\n";

 		print "If this is not what you intended, here's your chance to bail out!\n\n\n";

@@ -248,7 +253,13 @@ sub main {
 	if ($rverb =~ /skip/) {print "Info -- *** Skipping repository access.\n"	if ($verbose);}

 	else {

 		if ($verbose) {print "Info -- *** Begin fetching sources.\n";}

-

+		if (! -d $wd) {						## xcopy will create the entire path for us.

+			!system("echo foo > a.tmp")											or die "Fatal -- Couldn't create temporary file in ".`cd`;

+			!system("echo F | xcopy a.tmp $wd\\CVS\\a.tmp")	or die "Fatal -- Couldn't xcopy to $wd.";

+			!system("rm a.tmp")														or die "Fatal -- Couldn't remove temporary file.";

+			!system("rm $wd\\CVS\\a.tmp")									or die "Fatal -- Couldn't remove temporary file.";

+			}

+		

 		# Set up cvs environment variables:

 		$ENV{CVSROOT} = $fetch[0]->{CVSROOT}->{name};

 		chdir($src)											or die "Fatal -- couldn't chdir to $src\n";

@@ -363,7 +374,8 @@ sub main {
 		

 		chdir("pismere/athena") or die "Fatal -- couldn't chdir to source directory $wd\\pismere\\athena\n";

 		if ($verbose) {print "Info -- chdir to $wd\\pismere\\athena\n";}

-			!system("perl ../scripts/build.pl --softdirs $buildtarget")	or die "Fatal -- build $buildtarget failed.";

+		local $log	= ($switches[0]->{logfile}->{value}) ? " " : " --nolog ";

+		!system("perl ../scripts/build.pl --softdirs --nolog $buildtarget")	or die "Fatal -- build $buildtarget failed.";

 			

 		chdir("$wd\\pismere") or die "Fatal -- couldn't chdir to $wd\\pismere.";

 		if ($clean) {