[LON-CAPA-cvs] cvs: loncom /build lpml_parse.pl

[harris41]

harris41		Thu Mar 21 20:55:04 2002 EDT

  Modified files:              
    /loncom/build	lpml_parse.pl 
  Log:
  adding in dates of work, fixing overly long lines, allowing build tag
  to have commands split into multiple lines with the slash character
  
  
Index: loncom/build/lpml_parse.pl
diff -u loncom/build/lpml_parse.pl:1.40 loncom/build/lpml_parse.pl:1.41
--- loncom/build/lpml_parse.pl:1.40	Mon Feb  4 20:28:57 2002
+++ loncom/build/lpml_parse.pl	Thu Mar 21 20:55:04 2002
@@ -3,7 +3,7 @@
 # The LearningOnline Network with CAPA
 # lpml_parse.pl - Linux Packaging Markup Language parser
 #
-# $Id: lpml_parse.pl,v 1.40 2002/02/05 01:28:57 harris41 Exp $
+# $Id: lpml_parse.pl,v 1.41 2002/03/22 01:55:04 harris41 Exp $
 #
 # Written by Scott Harrison, harris41@msu.edu
 #
@@ -37,8 +37,7 @@
 # 11/4,11/5,11/6,11/7,11/16,11/17 - Scott Harrison
 # 12/2,12/3,12/4,12/5,12/6,12/13,12/19,12/29 - Scott Harrison
 # YEAR=2002
-# 1/8,1/9 - Scott Harrison
-#
+# 1/8,1/9,1/29,1/31,2/5,3/21 - Scott Harrison
 ###
 
 ###############################################################################
@@ -949,7 +948,9 @@
 	my ($chmod,$chown)=split(/\s/,$categoryhash{$categoryname});
 	return $directory="\n<tr><td rowspan='2' bgcolor='#ffffff'>".
 	    "$categoryname</td>".
-	    "<td rowspan='2' bgcolor='#ffffff'><!-- POSTEVAL [$categoryname] verify.pl directory /$targetdir $categoryhash{$categoryname} -->&nbsp;</td>".
+	    "<td rowspan='2' bgcolor='#ffffff'><!-- POSTEVAL [$categoryname] ".
+	    "verify.pl directory /$targetdir $categoryhash{$categoryname} -->".
+	    "&nbsp;</td>".
 	    "<td rowspan='2' bgcolor='#ffffff'>$chmod<br />$chown</td>".
 	    "<td bgcolor='#ffffff'>$thtml</td></tr>".
 	    "<tr><td bgcolor='#ffffff' colspan='[{{{{{DPATHLENGTH}}}}}]'>".
@@ -1128,7 +1129,7 @@
 	if ($mode eq 'html') {
 	    return ($file="\n<!-- FILESORT:$target -->".
 		    "<tr>".
-		    "<td><!-- POSTEVAL [$categoryname] verify.pl file '$sourcerootarg' ".
+          "<td><!-- POSTEVAL [$categoryname] verify.pl file '$sourcerootarg' ".
 		    "'$targetrootarg' ".
 		    "'$source' '$target' ".
 		    "$categoryhash{$categoryname} -->&nbsp;</td><td>".
@@ -1228,7 +1229,8 @@
 		$logcmd.' && echo "'.
 		'Configuration source file does not exist '.
 		''.$sourceroot.'/'.$source.'"'.
-		"$logcmd); } && perl verifymodown.pl ${targetroot}/${target} \"$categoryhash{$categoryname}\"$logcmd;\n\n";
+	      "$logcmd); } && perl verifymodown.pl ${targetroot}/${target} \"".
+		"$categoryhash{$categoryname}\"$logcmd;\n\n";
 	}
 	elsif ($mode eq 'build' && $build) {
 	    push @buildall,$sourceroot.'/'.$source;
@@ -1337,7 +1339,7 @@
 	$parser->get_tag('/fileglob');
 	if ($mode eq 'html') {
 	    return $fileglob="\n<tr>".
-		"<td><!-- POSTEVAL [$categoryname] verify.pl fileglob '$sourcerootarg' ".
+      "<td><!-- POSTEVAL [$categoryname] verify.pl fileglob '$sourcerootarg' ".
 		"'$targetrootarg' ".
 		"'$glob' '$sourcedir' '$filenames2' '$targetdir' ".
 		"$categoryhash{$categoryname} -->&nbsp;</td>".
@@ -1453,6 +1455,7 @@
     if ($text) {
 	$parser->get_tag('/build');
 	$build=$sourceroot.'/'.$text.';'.$tokeninfo[2]{'trigger'};
+	$build=~s/[^\\]\\\s+//g; # allow for having lines split onto new lines
     }
     return '';
 }