--- loncom/build/lpml_parse.pl	2001/11/16 21:10:32	1.18
+++ loncom/build/lpml_parse.pl	2001/11/17 18:35:21	1.19
@@ -8,7 +8,7 @@
 # 9/17,9/18 - Scott Harrison
 # 11/4,11/5,11/6,11/7,11/16 - Scott Harrison
 #
-# $Id: lpml_parse.pl,v 1.18 2001/11/16 21:10:32 harris41 Exp $
+# $Id: lpml_parse.pl,v 1.19 2001/11/17 18:35:21 harris41 Exp $
 ###
 
 ###############################################################################
@@ -86,6 +86,8 @@ if (@ARGV) {
 $sourceroot=~s/\/$//;
 $targetroot=~s/\/$//;
 
+my $logcmd='| tee -a WARNINGS';
+
 my $invocation;
 # --------------------------------------------------- Record program invocation
 if ($mode eq 'install' or $mode eq 'configinstall' or $mode eq 'build') {
@@ -695,22 +697,22 @@ sub format_files {
 		$depstring.="\telif !(test -r $command/$dep);\\\n";
 		$depstring.="\t\tthen echo ".
 		"\"**** WARNING **** missing the file: ".
- 	        "$command/$dep\";\\\n";
+ 	        "$command/$dep\"$logcmd;\\\n";
 		$depstring.="\t\ttest -e $source || test -e $target || echo ".
 		    "'**** ERROR **** neither source=$source nor target=".
-		    "$target exist and they cannot be built';\\\n";
+		    "$target exist and they cannot be built'$logcmd;\\\n";
 		$depstring.="\t\tmake -f Makefile.build ${source}___DEPS;\\\n";
 		if ($olddep) {
 		    $depstring2.="\t\tECODE=0;\\\n";
 		    $depstring2.="\t\t! test -e $source && test -r $command/$olddep &&".
-			" { perl filecompare.pl -b2 $command/$olddep $target ||  ECODE=\$\$?; } && { [ \$\$ECODE != \"2\" ] || echo \"**** WARNING **** dependency $command/$olddep is newer than target file $target; SOMETHING MAY BE WRONG\"; };\\\n";
+			" { perl filecompare.pl -b2 $command/$olddep $target ||  ECODE=\$\$?; } && { [ \$\$ECODE != \"2\" ] || echo \"**** WARNING **** dependency $command/$olddep is newer than target file $target; SOMETHING MAY BE WRONG\"$logcmd; };\\\n";
 		}
 		$olddep=$dep;
 	    }
 	    $binfo.="$source: $tword\n".
 		"\t\@if !(echo \"\");\\\n\t\tthen echo ".
 		"\"**** WARNING **** Strange shell. ".
- 	        "Check your path settings.\";\\\n".
+ 	        "Check your path settings.\"$logcmd;\\\n".
 		$depstring.
 		"\telse \\\n\t\t$command2\n\tfi\n\n";
 	    $binfo.="${source}___DEPS:\n".$depstring2."\t\tECODE=0;\n\n";
@@ -770,17 +772,17 @@ sub format_file {
 		foreach my $dep (@deps) {
 		    $depstring.=<<END;
 		ECODE=0; DEP=''; \\
-		test -e $command/$dep || (echo '**** WARNING **** cannot evaluate status of dependency $command/$dep (for building ${sourceroot}/${source} with)'); DEP="1"; \\
+		test -e $command/$dep || (echo '**** WARNING **** cannot evaluate status of dependency $command/$dep (for building ${sourceroot}/${source} with)'$logcmd); DEP="1"; \\
 		[ -n DEP ] && { perl filecompare.pl -b2 $command/$dep ${targetroot}/${target} || ECODE=\$\$?; } || DEP="1"; \\
 		case "\$\$ECODE" in \\
-			2) echo "**** WARNING **** dependency $command/$dep is newer than target file ${targetroot}/${target}; you may want to run make build";; \\
+			2) echo "**** WARNING **** dependency $command/$dep is newer than target file ${targetroot}/${target}; you may want to run make build"$logcmd;; \\
 		esac; \\
 END
 		}
                 chomp $depstring;
 		$buildtest=<<END;
 	\@if !(test -e "${sourceroot}/${source}") && !(test -e "${targetroot}/${target}"); then \\
-		echo "**** ERROR **** ${sourceroot}/${source} is missing and is also not present at target location ${targetroot}/${target}; you must run make build"; exit; \\
+		echo "**** ERROR **** ${sourceroot}/${source} is missing and is also not present at target location ${targetroot}/${target}; you must run make build"$logcmd; exit; \\
 END
                 $buildtest.=<<END if $depstring;
 	elif !(test -e "${sourceroot}/${source}"); then \\
@@ -793,14 +795,16 @@ END
             my $bflag='-b1';
             $bflag='-b3' if $dependencies or $buildlink;
 	    return <<END;
-$buildtest	\@if !(test -e "${sourceroot}/${source}"); then \\
-		echo "**** WARNING **** CVS source file does not exist: ${sourceroot}/${source}"; \\
+$buildtest	\@if !(test -e "${sourceroot}/${source}") && !(test -e "${targetroot}/${target}"); then \\
+		echo "**** ERROR **** CVS source file does not exist: ${sourceroot}/${source} and neither does target: ${targetroot}/${target}"$logcmd; \\
+	elif !(test -e "${sourceroot}/${source}"); then \\
+		echo "**** WARNING **** CVS source file does not exist: ${sourceroot}/${source}"$logcmd; \\
 	else \\
 		ECODE=0; \\
 		perl filecompare.pl $bflag ${sourceroot}/${source} ${targetroot}/${target} || ECODE=\$\$?; \\
 		case "\$\$ECODE" in \\
 			1) echo "${targetroot}/${target} is unchanged";; \\
-			2) echo "**** WARNING **** target file ${targetroot}/${target} is newer than CVS source; creating ${targetroot}/${target}.lpmlnewfile instead" && install -o www -g www -m 0500 ${sourceroot}/${source} ${targetroot}/${target}.lpmlnewfile;; \\
+			2) echo "**** WARNING **** target file ${targetroot}/${target} is newer than CVS source; creating ${targetroot}/${target}.lpmlnewfile instead"$logcmd && install -o www -g www -m 0500 ${sourceroot}/${source} ${targetroot}/${target}.lpmlnewfile;; \\
 			0) echo "install -o www -g www -m 0500 ${sourceroot}/${source} ${targetroot}/${target}" && install -o www -g www -m 0500 ${sourceroot}/${source} ${targetroot}/${target};; \\
 		esac; \\
 	fi
@@ -812,7 +816,7 @@ END
 #		$categoryhash{$categoryname}.' '.
 #		$sourceroot.'/'.$source.' '.
 #		$targetroot.'/'.$target.
-#		' || echo "**** LON-CAPA WARNING '.
+#		' || echo "**** WARNING '.
 #		'**** CVS source file does not exist: '.$sourceroot.'/'.
 #		$source.'"'."\n";
 	}
@@ -822,11 +826,12 @@ END
 		"\t".'@echo -n ""; ECODE=0 && { perl filecompare.pl -b4 '.$sourceroot.'/'.$source.' '.$targetroot.'/'.$target.' || ECODE=$$?; } && { [ $$ECODE != "2" ] || (install '.$categoryhash{$categoryname}.' '.
 		$sourceroot.'/'.$source.' '.
 		$targetroot.'/'.$target.'.lpmlnewconf'.
-		' && echo "*** CONFIGURATION FILE CHANGE ***" && echo "'.
+		' && echo "**** NOTE: CONFIGURATION FILE CHANGE ****"'.
+		$logcmd.' && echo "'.
 		'You likely need to compare contents of '.
 		''.$targetroot.'/'.$target.' with the new '.
                 ''.$targetroot.'/'.$target.'.lpmlnewconf"'.
-		"); };\n\n";
+		"$logcmd); };\n\n";
 	}
 	elsif ($mode eq 'build' && $build) {
 	    push @buildall,$sourceroot.'/'.$source;