--- loncom/build/lpml_parse.pl	2001/11/07 16:53:52	1.16
+++ loncom/build/lpml_parse.pl	2001/11/16 21:10:32	1.18
@@ -6,7 +6,10 @@
 # 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 - 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 $
+###
 
 ###############################################################################
 ##                                                                           ##
@@ -85,7 +88,7 @@ $targetroot=~s/\/$//;
 
 my $invocation;
 # --------------------------------------------------- Record program invocation
-if ($mode eq 'install') {
+if ($mode eq 'install' or $mode eq 'configinstall' or $mode eq 'build') {
     $invocation=(<<END);
 # Invocation: STDINPUT | lpml_parse.pl
 #             1st argument (mode) is: $mode
@@ -341,7 +344,8 @@ sub format_lpml {
 	$lpml .= "SHELL=\"/bin/bash\"\n\n";
     }
     elsif ($mode eq 'configinstall') {
-	print '# LPML configuration targets. Linux Packaging Markup Language,';
+	print '# LPML configuration file targets (configinstall).'."\n";
+	print '# Linux Packaging Markup Language,';
 	print ' by Scott Harrison 2001'."\n";
 	print '# This file was automatically generated on '.`date`;
 	print "\n".$invocation;
@@ -351,7 +355,7 @@ sub format_lpml {
 	$lpml = "# LPML build targets. Linux Packaging Markup Language,";
 	$lpml .= ' by Scott Harrison 2001'."\n";
 	$lpml .= '# This file was automatically generated on '.`date`;
-	$lpml .= "\n";
+	$lpml .= "\n".$invocation;
 	$lpml .= "SHELL=\"/bin/sh\"\n\n";
     }
     else {
@@ -366,10 +370,8 @@ sub format_targetroot {
     if ($mode eq 'html') {
 	return $targetroot="\n<br />TARGETROOT: $text";
     }
-    elsif ($mode eq 'install') {
-	return '# TARGET INSTALL LOCATION is "'.$targetroot."\"\n";
-    }
-    elsif ($mode eq 'build') {
+    elsif ($mode eq 'install' or $mode eq 'build' or
+	   $mode eq 'configinstall') {
 	return '# TARGET INSTALL LOCATION is "'.$targetroot."\"\n";
     }
     else {
@@ -384,10 +386,8 @@ sub format_sourceroot {
     if ($mode eq 'html') {
 	return $sourceroot="\n<br />SOURCEROOT: $text";
     }
-    elsif ($mode eq 'install') {
-	return '# SOURCE CODE LOCATION IS "'.$sourceroot."\"\n";;
-    }
-    elsif ($mode eq 'build') {
+    elsif ($mode eq 'install' or $mode eq 'build' or
+	   $mode eq 'configinstall') {
 	return '# SOURCE CODE LOCATION IS "'.$sourceroot."\"\n";;
     }
     else {
@@ -703,7 +703,7 @@ sub format_files {
 		if ($olddep) {
 		    $depstring2.="\t\tECODE=0;\\\n";
 		    $depstring2.="\t\t! test -e $source && test -r $command/$olddep &&".
-			" { perl filecompare.pl -B $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\"; };\\\n";
 		}
 		$olddep=$dep;
 	    }
@@ -771,7 +771,7 @@ sub format_file {
 		    $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"; \\
-		[ -n DEP ] && { perl filecompare.pl -B $command/$dep ${targetroot}/${target} || ECODE=\$\$?; } || 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";; \\
 		esac; \\
@@ -790,8 +790,8 @@ END
 	fi
 END
 	    }
-            my $bflag='-b';
-            $bflag='-g' if $dependencies or $buildlink;
+            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}"; \\
@@ -819,7 +819,7 @@ 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 -G '.$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 "'.
@@ -1031,3 +1031,72 @@ sub trim {
 } 
 
 # ----------------------------------- POD (plain old documentation, CPAN style)
+
+=head1 NAME
+
+lpml_parse.pl - This is meant to parse files meeting the lpml document type.
+See lpml.dtd.  LPML=Linux Packaging Markup Language.
+
+=head1 SYNOPSIS
+
+Usage is for lpml file to come in through standard input.
+
+=over 4
+
+=item *
+
+1st argument is the mode of parsing.
+
+=item * 
+
+2nd argument is the category permissions to use (runtime or development)
+
+=item *
+
+3rd argument is the distribution
+(default,redhat6.2,debian2.2,redhat7.1,etc).
+
+=item *
+
+4th argument is to manually specify a sourceroot.
+
+=item *
+
+5th argument is to manually specify a targetroot.
+
+=back
+
+Only the 1st argument is mandatory for the program to run.
+
+Example:
+
+cat ../../doc/loncapafiles.lpml |\\
+perl lpml_parse.pl html default /home/sherbert/loncapa /tmp/install
+
+=head1 DESCRIPTION
+
+I am using a multiple pass-through approach to parsing
+the lpml file.  This saves memory and makes sure the server
+will never be overloaded.
+
+=head1 README
+
+I am using a multiple pass-through approach to parsing
+the lpml file.  This saves memory and makes sure the server
+will never be overloaded.
+
+=head1 PREREQUISITES
+
+HTML::TokeParser
+
+=head1 COREQUISITES
+
+=head1 OSNAMES
+
+linux
+
+=head1 SCRIPT CATEGORIES
+
+Packaging/Administrative
+
+=cut