--- loncom/build/lpml_parse.pl	2001/12/15 20:20:11	1.32
+++ loncom/build/lpml_parse.pl	2002/01/29 10:40:17	1.36
@@ -3,7 +3,7 @@
 # The LearningOnline Network with CAPA
 # lpml_parse.pl - Linux Packaging Markup Language parser
 #
-# $Id: lpml_parse.pl,v 1.32 2001/12/15 20:20:11 harris41 Exp $
+# $Id: lpml_parse.pl,v 1.36 2002/01/29 10:40:17 harris41 Exp $
 #
 # Written by Scott Harrison, harris41@msu.edu
 #
@@ -35,7 +35,9 @@
 # 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,11/17 - Scott Harrison
-# 12/2,12/3,12/4,12/5,12/6,12/13 - 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
 #
 ###
 
@@ -128,8 +130,8 @@ if ($mode eq 'install' or $mode eq 'conf
 #             1st argument (mode) is: $mode
 #             2nd argument (category type) is: $categorytype
 #             3rd argument (distribution) is: $dist
-#             4th argument (targetroot) is: described below
-#             5th argument (sourceroot) is: described below
+#             4th argument (sourceroot) is: described below
+#             5th argument (targetroot) is: described below
 END
 }
 
@@ -321,6 +323,7 @@ $parser->{textify}={
     rpmAutoReqProv => \&format_rpmAutoReqProv,
     rpmdescription => \&format_rpmdescription,
     rpmpre => \&format_rpmpre,
+    rpmRequires => \&format_rpmRequires,
     directories => \&format_directories,
     directory => \&format_directory,
     categoryname => \&format_categoryname,
@@ -664,6 +667,9 @@ $text
 </table>
 END
     }
+    elsif ($mode eq 'make_rpm') {
+	return $text;
+    }
     elsif ($mode eq 'text') {
 	return $rpm=<<END;
 Software Package Description
@@ -685,6 +691,11 @@ sub format_rpmSummary {
     elsif ($mode eq 'text') {
 	return $rpmSummary="\nSummary     : $text";
     }
+    elsif ($mode eq 'make_rpm') {
+	return <<END;
+<summary>$text</summary>
+END
+    }
     else {
 	return '';
     }
@@ -699,6 +710,11 @@ sub format_rpmName {
     elsif ($mode eq 'text') {
 	return $rpmName="\nName        : $text";
     }
+    elsif ($mode eq 'make_rpm') {
+	return <<END;
+<name>$text</name>
+END
+    }
     else {
 	return '';
     }
@@ -741,6 +757,11 @@ sub format_rpmVendor {
     elsif ($mode eq 'text') {
 	return $rpmVendor="\nVendor      : $text";
     }
+    elsif ($mode eq 'make_rpm') {
+	return <<END;
+<vendor>$text</vendor>
+END
+    }
     else {
 	return '';
     }
@@ -769,6 +790,11 @@ sub format_rpmCopyright {
     elsif ($mode eq 'text') {
 	return $rpmCopyright="\nLicense     : $text";
     }
+    elsif ($mode eq 'make_rpm') {
+	return <<END;
+<copyright>$text</copyright>
+END
+    }
     else {
 	return '';
     }
@@ -783,6 +809,11 @@ sub format_rpmGroup {
     elsif ($mode eq 'text') {
 	return $rpmGroup="\nGroup       : $text";
     }
+    elsif ($mode eq 'make_rpm') {
+	return <<END;
+<group>Utilities/System</group>
+END
+    }
     else {
 	return '';
     }
@@ -808,9 +839,14 @@ sub format_rpmAutoReqProv {
     if ($mode eq 'html') {
 	return $rpmAutoReqProv="\nAutoReqProv : $text";
     }
-    if ($mode eq 'text') {
+    elsif ($mode eq 'text') {
 	return $rpmAutoReqProv="\nAutoReqProv : $text";
     }
+    elsif ($mode eq 'make_rpm') {
+	return <<END;
+<AutoReqProv>$text</AutoReqProv>
+END
+    }
     else {
 	return '';
     }
@@ -829,6 +865,13 @@ sub format_rpmdescription {
 	$text=~s/\\n/\n/g;
 	return $rpmdescription="\nDescription : $text";
     }
+    elsif ($mode eq 'make_rpm') {
+	$text=~s/\n//g;
+	$text=~s/\\n/\n/g;
+	return <<END;
+<description>$text</description>
+END
+    }
     else {
 	return '';
     }
@@ -841,10 +884,42 @@ sub format_rpmpre {
 #	return $rpmpre="\n<br />RPMPRE $text";
 	return '';
     }
+    elsif ($mode eq 'make_rpm') {
+	return <<END;
+<pre>$text</pre>
+END
+    }
     else {
 	return '';
     }
 }
+# -------------------------------------------------- Format requires section
+sub format_rpmRequires {
+    my @tokeninfo=@_;
+    my $aref;
+    my $text;
+    if ($mode eq 'make_rpm') {
+	while ($aref=$parser->get_token()) {
+	    if ($aref->[0] eq 'E' && $aref->[1] eq 'rpmRequires') {
+		last;
+	    }
+	    elsif ($aref->[0] eq 'S') {
+		$text.=$aref->[4];
+	    }
+	    elsif ($aref->[0] eq 'E') {
+		$text.=$aref->[2];
+	    }
+	    else {
+		$text.=$aref->[1];
+	    }
+	}
+    }
+    else {
+	$parser->get_tag('/rpmRequires');
+	return '';
+    }
+    return '<rpmRequires>'.$text.'</rpmRequires>';
+}
 # -------------------------------------------------- Format directories section
 sub format_directories {
     my $text=$parser->get_text('/directories');
@@ -869,7 +944,10 @@ sub format_directories {
     }
     elsif ($mode eq 'install') {
 	return "\n".'directories:'."\n".$text;
-   }
+    }
+    elsif ($mode eq 'rpm_file_list') {
+	return $text;
+    }
     else {
 	return '';
     }
@@ -906,6 +984,9 @@ sub format_directory {
 	return "\t".'install '.$categoryhash{$categoryname}.' -d '.
 	    $targetroot.'/'.$targetdir."\n";
     }
+    elsif ($mode eq 'rpm_file_list') {
+	return $targetroot.'/'.$targetdir."\n";
+    }
     else {
 	return '';
     }
@@ -985,8 +1066,14 @@ sub format_files {
 	foreach my $bi (@buildinfo) {
 	    my ($target,$source,$command,$trigger,@deps)=split(/\;/,$bi);
 	    $tword=''; $tword=' alwaysrun' if $trigger eq 'always run'; 
-	    $command=~s/\/([^\/]*)$//;
-	    $command2="cd $command; sh ./$1;\\";
+	    if ($command!~/\s/) {
+		$command=~s/\/([^\/]*)$//;
+		$command2="cd $command; sh ./$1;\\";
+	    }
+	    else {
+		$command=~s/(.*?\/)([^\/]+\s+.*)$/$1/;
+		$command2="cd $command; sh ./$2;\\";
+	    }
 	    my $depstring;
 	    my $depstring2="\t\t\@echo '';\\\n";
 	    my $olddep;
@@ -1022,6 +1109,9 @@ sub format_files {
 		$binfo."\n".
 		"alwaysrun:\n\n";
     }
+    elsif ($mode eq 'rpm_file_list') {
+	return $text;
+    }
     else {
 	return '';
     }
@@ -1095,10 +1185,10 @@ 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)'$logcmd); DEP="1"; \\
-		[ -n DEP ] && { perl filecompare.pl -b2 $command/$dep ${targetroot}/${target} || ECODE=\$\$?; } || DEP="1"; \\
+		test -e $dep || (echo '**** WARNING **** cannot evaluate status of dependency $dep (for building ${sourceroot}/${source} with)'$logcmd); DEP="1"; \\
+		[ -n DEP ] && { perl filecompare.pl -b2 $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"$logcmd;; \\
+			2) echo "**** WARNING **** dependency $dep is newer than target file ${targetroot}/${target}; you may want to run make build"$logcmd;; \\
 		esac; \\
 END
 		}
@@ -1175,6 +1265,17 @@ END
 		$dependencies;
 #	    return '# need to build '.$source.";
 	}
+        elsif ($mode eq 'rpm_file_list') {
+	    if ($categoryname eq 'doc') {
+		return $targetroot.'/'.$target.' # doc'."\n";
+	    }
+	    elsif ($categoryname eq 'conf') {
+		return $targetroot.'/'.$target.' # config'."\n";
+	    }
+	    else {
+		return $targetroot.'/'.$target."\n";
+	    }
+	}
 	else {
 	    return '';
 	}
@@ -1187,7 +1288,6 @@ sub format_link {
     $link=''; $linkto=''; $source=''; $target=''; $categoryname=''; 
     $description=''; $note=''; $build=''; $status=''; $dependencies='';
     my $text=&trim($parser->get_text('/link'));
-    my @links;
     if ($linkto) {
 	$parser->get_tag('/link');
 	if ($mode eq 'html') {
@@ -1228,11 +1328,20 @@ sub format_link {
 	elsif ($mode eq 'install') {
 	    my @targets=map {s/^\s*//;s/\s$//;$_} split(/\;/,$target);
 	    foreach my $tgt (@targets) {
-		push @links,"\t".'ln -fs /'.$linkto.' /'.$targetroot.$tgt.
+		push @links,"\t".'ln -fs /'.$linkto.' '.$targetroot.'/'.$tgt.
 		    "\n";
 	    }
+#	    return join('',@links);
 	    return '';
 	}
+	elsif ($mode eq 'rpm_file_list') {
+	    my @linklocs;
+	    my @targets=map {s/^\s*//;s/\s$//;$_} split(/\;/,$target);
+	    foreach my $tgt (@targets) {
+		push @linklocs,''.$targetroot.'/'.$tgt."\n";
+	    }
+	    return join('',@linklocs);
+	}
 	else {
 	    return '';
 	}
@@ -1299,6 +1408,16 @@ sub format_fileglob {
 		$sourceroot.'/'.$sourcedir.$eglob.' '.
 		$targetroot.'/'.$targetdir.'.'."\n";
 	}
+	elsif ($mode eq 'rpm_file_list') {
+	    my $eglob=$glob;
+	    if ($glob eq '*') {
+		$eglob='[^C][^V][^S]'.$glob;
+	    }
+	    my $targetdir2=$targetdir;$targetdir2=~s/\/$//;
+	    my @gfiles=map {s/^.*\///;"$targetroot/$targetdir2/$_\n"}
+	               glob("$sourceroot/$sourcedir/$eglob");
+	    return join('',@gfiles);
+	}
 	else {
 	    return '';
 	}