--- loncom/build/lpml_parse.pl	2001/11/16 21:10:32	1.18
+++ loncom/build/lpml_parse.pl	2001/11/29 15:01:04	1.23
@@ -6,9 +6,9 @@
 # 06/19/2001,06/20,06/24 - Scott Harrison
 # 9/5/2001,9/6,9/7,9/8 - Scott Harrison
 # 9/17,9/18 - Scott Harrison
-# 11/4,11/5,11/6,11/7,11/16 - Scott Harrison
+# 11/4,11/5,11/6,11/7,11/16,11/17 - Scott Harrison
 #
-# $Id: lpml_parse.pl,v 1.18 2001/11/16 21:10:32 harris41 Exp $
+# $Id: lpml_parse.pl,v 1.23 2001/11/29 15:01:04 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') {
@@ -334,7 +336,46 @@ sub format_lpml {
     my (@tokeninfo)=@_;
     my $date=`date`; chop $date;
     if ($mode eq 'html') {
-	$lpml = "<br />LPML BEGINNING: $date";
+	$lpml = "<br /><font size='+2'>LPML Description Page (dist=$dist, ".
+	    "$date)".
+	    "</font>";
+	$lpml .=<<END;
+<ul>
+<li>About this file</li>
+<li>Software Package Description</li>
+<li>Directory Structure</li>
+<li>File Type Ownership and Permissions</li>
+<li>File and Directory Structure</li>
+</ul>
+END
+        $lpml .=<<END;
+<font size='+2'>About this file</font>
+<p>
+This file is generated dynamically by <tt>lpml_parse.pl</tt> as
+part of a development compilation process.  Author: Scott
+Harrison (harris41\@msu.edu).
+</p>
+END
+    }
+    elsif ($mode eq 'text') {
+	$lpml = "LPML Description Page (dist=$dist, $date)";
+	$lpml .=<<END;
+
+* About this file
+* Software Package Description
+* Directory Structure
+* File Type Ownership and Permissions
+* File and Directory Structure
+END
+        $lpml .=<<END;
+
+About this file
+
+This file is generated dynamically by lpml_parse.pl as
+part of a development compilation process.  Author: Scott
+Harrison (harris41\@msu.edu).
+
+END
     }
     elsif ($mode eq 'install') {
 	print '# LPML install targets. Linux Packaging Markup Language,';
@@ -454,7 +495,22 @@ sub format_rpm {
     my $text=&trim($parser->get_text('/rpm'));
     $parser->get_tag('/rpm');
     if ($mode eq 'html') {
-	return $rpm="\n<br />BEGIN RPM\n$text\n<br />END RPM";
+	return $rpm=<<END;
+<font size='+2'>Software Package Description</font>
+<p>
+<table bgcolor='#ffffff' border='0' cellpadding='10' cellspacing='0'>
+<tr><td><pre>
+$text
+</pre></td></tr>
+</table>
+END
+    }
+    elsif ($mode eq 'text') {
+	return $rpm=<<END;
+Software Package Description
+
+$text
+END
     }
     else {
 	return '';
@@ -465,7 +521,10 @@ sub format_rpmSummary {
     my $text=&trim($parser->get_text('/rpmSummary'));
     $parser->get_tag('/rpmSummary');
     if ($mode eq 'html') {
-	return $rpmSummary="\n<br />RPMSUMMARY $text";
+	return $rpmSummary="\nSummary     : $text";
+    }
+    elsif ($mode eq 'text') {
+	return $rpmSummary="\nSummary     : $text";
     }
     else {
 	return '';
@@ -695,22 +754,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 +829,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,16 +852,20 @@ 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; \\
+		perl verifymodown.pl ${targetroot}/${target} "$categoryhash{$categoryname}"$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;; \\
-			0) echo "install -o www -g www -m 0500 ${sourceroot}/${source} ${targetroot}/${target}" && install -o www -g www -m 0500 ${sourceroot}/${source} ${targetroot}/${target};; \\
+			2) echo "**** WARNING **** target file ${targetroot}/${target} is newer than CVS source; saving current (old) target file to ${targetroot}/${target}.lpmlsave and then overwriting"$logcmd && install -o www -g www -m 0600 ${targetroot}/${target} ${targetroot}/${target}.lpmlsave && install $categoryhash{$categoryname} ${sourceroot}/${source} ${targetroot}/${target};; \\
+			0) echo "install $categoryhash{$categorname} ${sourceroot}/${source} ${targetroot}/${target}" && install $categoryhash{$categoryname} ${sourceroot}/${source} ${targetroot}/${target};; \\
 		esac; \\
+		perl verifymodown.pl ${targetroot}/${target} "$categoryhash{$categoryname}"$logcmd; \\
 	fi
 END
 #	    return "\t".'@test -e '.$sourceroot.'/'.$source.
@@ -812,21 +875,42 @@ END
 #		$categoryhash{$categoryname}.' '.
 #		$sourceroot.'/'.$source.' '.
 #		$targetroot.'/'.$target.
-#		' || echo "**** LON-CAPA WARNING '.
+#		' || echo "**** WARNING '.
 #		'**** CVS source file does not exist: '.$sourceroot.'/'.
 #		$source.'"'."\n";
 	}
 	elsif ($mode eq 'configinstall' && $categoryname eq 'conf') {
 	    push @configall,$targetroot.'/'.$target;
 	    return $targetroot.'/'.$target.': alwaysrun'."\n".
-		"\t".'@echo -n ""; ECODE=0 && { perl filecompare.pl -b4 '.$sourceroot.'/'.$source.' '.$targetroot.'/'.$target.' || ECODE=$$?; } && { [ $$ECODE != "2" ] || (install '.$categoryhash{$categoryname}.' '.
+		"\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 "'.
+		$targetroot.'/'.$target.'.lpmlnew'.
+		' && echo "**** NOTE: CONFIGURATION FILE CHANGE ****"'.
+		$logcmd.' && echo "'.
 		'You likely need to compare contents of '.
 		''.$targetroot.'/'.$target.' with the new '.
-                ''.$targetroot.'/'.$target.'.lpmlnewconf"'.
-		"); };\n\n";
+                ''.$targetroot.'/'.$target.'.lpmlnew"'.
+		"$logcmd); } && ".
+		'{ [ $$ECODE != "3" ] || (install '.
+                $categoryhash{$categoryname}.' '.
+		$sourceroot.'/'.$source.' '.
+		$targetroot.'/'.$target.''.
+		' && echo "**** WARNING: NEW CONFIGURATION FILE ADDED ****"'.
+		$logcmd.' && echo "'.
+		'You likely need to review the contents of '.
+		''.$targetroot.'/'.$target.' to make sure its '.
+                'settings are compatible with your overall system"'.
+		"$logcmd); } && ".
+		'{ [ $$ECODE != "1" ] || ('.
+		'echo "**** ERROR ****"'.
+		$logcmd.' && echo "'.
+		'Configuration source file does not exist '.
+		''.$sourceroot.'/'.$source.'"'.
+		"$logcmd); } && perl verifymodown.pl ${targetroot}/${target} \"$categoryhash{$categoryname}\"$logcmd;\n\n";
 	}
 	elsif ($mode eq 'build' && $build) {
 	    push @buildall,$sourceroot.'/'.$source;