--- loncom/build/lpml_parse.pl	2002/04/13 19:29:32	1.45
+++ loncom/build/lpml_parse.pl	2002/05/19 17:46:19	1.48
@@ -12,7 +12,7 @@
 # The LearningOnline Network with CAPA
 # lpml_parse.pl - Linux Packaging Markup Language parser
 #
-# $Id: lpml_parse.pl,v 1.45 2002/04/13 19:29:32 harris41 Exp $
+# $Id: lpml_parse.pl,v 1.48 2002/05/19 17:46:19 harris41 Exp $
 #
 # Written by Scott Harrison, codeharrison@yahoo.com
 #
@@ -1056,7 +1056,10 @@ sub format_description {
 sub format_files {
     my $text=$parser->get_text('/files');
     $parser->get_tag('/files');
-    if ($mode eq 'html') {
+    if ($mode eq 'MANIFEST') {
+	return $text;
+    }
+    elsif ($mode eq 'html') {
 	return $directories="\n<br />&nbsp;<br />".
 	    "<a name='files' />".
 	    "<font size='+2'>Files</font><br />&nbsp;<br />".
@@ -1174,7 +1177,21 @@ sub format_file {
     $categorycount{$categoryname}++;
     if ($source) {
 	$parser->get_tag('/file');
-	if ($mode eq 'html') {
+	if ($mode eq 'MANIFEST') {
+	    my $command=$build;
+	    if ($command!~/\s/) {
+		$command=~s/\/([^\/]*)$//;
+	    }
+	    else {
+		$command=~s/(.*?\/)([^\/]+\s+.*)$/$1/;
+	    }
+	    $command=~s/^$sourceroot\///;
+	    my (@deps)=split(/\;/,$dependencies);
+	    my $retval=join("\n",($source,
+		       (map {"$command$_"} @deps)));
+	    return $retval."\n";
+	}
+	elsif ($mode eq 'html') {
 	    return ($file="\n<!-- FILESORT:$target -->".
 		    "<tr>".
           "<td><!-- POSTEVAL [$categoryname] verify.pl file '$sourcerootarg' ".
@@ -1249,36 +1266,55 @@ END
 	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}.' '.
-		$sourceroot.'/'.$source.' '.
-		$targetroot.'/'.$target.'.lpmlnew'.
+		"\t".'@# Compare source with target and intelligently respond'.
+		"\n\t\n\t\n".
+
+
+		"\t".'@echo -n ""; ECODE=0 && { perl filecompare.pl -b4 \\'.
+		"\n\t".$sourceroot.'/'.$source." \\\n\t".
+		$targetroot.'/'.$target." \\\n\t".
+		' || ECODE=$$?; } && '."\\\n\t"."\\\n\t"."\\\n\t".
+
+
+		'{ [ $$ECODE != "2" ] || '." \\\n\t".'(install '.
+                $categoryhash{$categoryname}." \\\n\t\t".
+		$sourceroot.'/'.$source." \\\n\t\t".
+		$targetroot.'/'.$target.'.lpmlnew'." \\\n\t\t".
 		' && echo "**** NOTE: CONFIGURATION FILE CHANGE ****"'.
-		$logcmd.' && echo "'.
-		'You likely need to compare contents of '.
-		''.$targetroot.'/'.$target.' with the new '.
-                ''.$targetroot.'/'.$target.'.lpmlnew"'.
-		"$logcmd); } && ".
-		'{ [ $$ECODE != "3" ] || (install '.
-                $categoryhash{$categoryname}.' '.
-		$sourceroot.'/'.$source.' '.
-		$targetroot.'/'.$target.''.
+		" \\\n\t\t".$logcmd.' && '." \\\n\t\t"."echo -n \"".
+		'You likely need to compare contents of "'."\\\n\t\t\t".
+		'echo -n "'.$targetroot.'/'.$target.'"'."\\\n\t\t".
+		'echo -n "with the new "'."\\\n\t\t\t".
+                'echo "'.$targetroot.'/'.$target.'.lpmlnew"'."\\\n\t\t".
+		"$logcmd); } && "." \\\n\t"."\\\n\t"."\\\n\t".
+
+
+		'{ [ $$ECODE != "3" ] || '."\\\n\t".
+		'(install '.
+                $categoryhash{$categoryname}."\\\n\t\t".
+		$sourceroot.'/'.$source."\\\n\t\t".
+		$targetroot.'/'.$target."\\\n\t\t".
 		' && 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";
+		"\\\n\t\t".$logcmd.' && '."\\\n\t\t".
+		'echo -n "'.
+		'You likely need to review the contents of "'."\\\n\t\t\t".
+		'echo -n "'.
+		$targetroot.'/'.$target.'"'."\\\n\t\t\t".
+		'echo -n "'.
+		'to make sure its "'."\\\n\t\t".
+		'echo "'.
+                'settings are compatible with your overall system"'."\\\n\t\t".
+		"$logcmd); } && "."\\\n\t"."\\\n\t"."\\\n\t".
+
+
+		'{ [ $$ECODE != "1" ] || ('."\\\n\t\t".
+		'echo "**** ERROR ****"'.$logcmd.' && '."\\\n\t\t".'echo -n "'.
+		'Configuration source file does not exist "'."\\\n\t\t".
+		'echo -n "'.$sourceroot.'/'.$source.'"'."\\\n\t\t".
+		"$logcmd); } && "."\\\n\t\t".
+		"perl verifymodown.pl ${targetroot}/${target} "."\\\n\t\t\t".
+		"\"$categoryhash{$categoryname}\""."\\\n\t\t\t".
+		"$logcmd;\n\n";
 	}
 	elsif ($mode eq 'build' && $build) {
 	    push @buildall,$sourceroot.'/'.$source;
@@ -1385,7 +1421,10 @@ sub format_fileglob {
     $categorycount{$categoryname}+=scalar(@semi)+1;
     if ($sourcedir) {
 	$parser->get_tag('/fileglob');
-	if ($mode eq 'html') {
+	if ($mode eq 'MANIFEST') {
+         return join("\n",(map {"$sourcedir$_"} split(/\;/,$filenames2)))."\n";
+	}
+	elsif ($mode eq 'html') {
 	    return $fileglob="\n<tr>".
       "<td><!-- POSTEVAL [$categoryname] verify.pl fileglob '$sourcerootarg' ".
 		"'$targetrootarg' ".