--- loncom/build/lpml_parse.pl 2002/02/05 01:28:57 1.40
+++ loncom/build/lpml_parse.pl 2002/03/22 01:55:04 1.41
@@ -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 @@ sub format_directory {
my ($chmod,$chown)=split(/\s/,$categoryhash{$categoryname});
return $directory="\n
".
"$categoryname | ".
- " | ".
+ "".
+ " | ".
"$chmod $chown | ".
"$thtml |
".
"".
@@ -1128,7 +1129,7 @@ sub format_file {
if ($mode eq 'html') {
return ($file="\n".
" |
".
- " | ".
@@ -1228,7 +1229,8 @@ END
$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 @@ sub format_fileglob {
$parser->get_tag('/fileglob');
if ($mode eq 'html') {
return $fileglob="\n |
".
- " | ".
@@ -1453,6 +1455,7 @@ sub format_build {
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 '';
}