loncom/build/lpml_parse.pl - diff

Return to lpml_parse.pl CVS log

Up to [LON-CAPA] / loncom / build

Diff for /loncom/build/lpml_parse.pl between versions 1.18 and 1.25

version 1.18, 2001/11/16 21:10:32	version 1.25, 2001/12/01 16:51:07
Line 6	Line 6
# 06/19/2001,06/20,06/24 - Scott Harrison	# 06/19/2001,06/20,06/24 - Scott Harrison
# 9/5/2001,9/6,9/7,9/8 - Scott Harrison	# 9/5/2001,9/6,9/7,9/8 - Scott Harrison
# 9/17,9/18 - Scott Harrison	# 9/17,9/18 - Scott Harrison
# 11/4,11/5,11/6,11/7,11/16 - Scott Harrison	# 11/4,11/5,11/6,11/7,11/16,11/17 - Scott Harrison
#	#
# $Id$	# $Id$
###	###
Line 49 Only the 1st argument is mandatory for t	Line 49 Only the 1st argument is mandatory for t
Example:	Example:

cat ../../doc/loncapafiles.lpml \|\\	cat ../../doc/loncapafiles.lpml \|\\
perl lpml_parse.pl html default /home/sherbert/loncapa /tmp/install	perl lpml_parse.pl html development default /home/sherbert/loncapa /tmp/install
END	END

# ------------------------------------------------- Grab command line arguments	# ------------------------------------------------- Grab command line arguments
Line 86 if (@ARGV) {	Line 86 if (@ARGV) {
$sourceroot=~s/\/$//;	$sourceroot=~s/\/$//;
$targetroot=~s/\/$//;	$targetroot=~s/\/$//;

	my $logcmd='\| tee -a WARNINGS';

my $invocation;	my $invocation;
# --------------------------------------------------- Record program invocation	# --------------------------------------------------- Record program invocation
if ($mode eq 'install' or $mode eq 'configinstall' or $mode eq 'build') {	if ($mode eq 'install' or $mode eq 'configinstall' or $mode eq 'build') {
Line 196 my $category_att_name;	Line 198 my $category_att_name;
my $category_att_type;	my $category_att_type;
my $chown;	my $chown;
my $chmod;	my $chmod;
	my $abbreviation; # space-free abbreviation; esp. for image names
my $rpm;	my $rpm;
my $rpmSummary;	my $rpmSummary;
my $rpmName;	my $rpmName;
Line 253 $parser->{textify}={	Line 256 $parser->{textify}={
sourceroot => \&format_sourceroot,	sourceroot => \&format_sourceroot,
categories => \&format_categories,	categories => \&format_categories,
category => \&format_category,	category => \&format_category,
	abbreviation => \&format_abbreviation,
targetdir => \&format_targetdir,	targetdir => \&format_targetdir,
chown => \&format_chown,	chown => \&format_chown,
chmod => \&format_chmod,	chmod => \&format_chmod,
Line 315 exit;	Line 319 exit;
# ------------------------ Final output at end of markup parsing and formatting	# ------------------------ Final output at end of markup parsing and formatting
sub end {	sub end {
if ($mode eq 'html') {	if ($mode eq 'html') {
return "<br />THE END\n";	return "</body></html>\n";
}	}
if ($mode eq 'install') {	if ($mode eq 'install') {
return '';	return '';
Line 334 sub format_lpml {	Line 338 sub format_lpml {
my (@tokeninfo)=@_;	my (@tokeninfo)=@_;
my $date=`date`; chop $date;	my $date=`date`; chop $date;
if ($mode eq 'html') {	if ($mode eq 'html') {
$lpml = "<br />LPML BEGINNING: $date";	$lpml=<<END;
	<html>
	<head>
	<title>LPML Description Page
	(dist=$dist, categorytype=$categorytype, $date)</title>
	</head>
	<body>
	END
	$lpml .= "<br /><font size='+2'>LPML Description Page (dist=$dist, ".
	"categorytype=$categorytype, $date)".
	"</font>";
	$lpml .=<<END;
	<ul>
	<li><a href='#about'>About this file</a></li>
	<li><a href='#ownperms'>File Type Ownership and Permissions
	Descriptions</a></li>
	<li><a href='#package'>Software Package Description</a></li>
	<li><a href='#directories'>Directory Structure</a></li>
	<li><a href='#files'>File and Directory Structure</a></li>
	</ul>
	END
	$lpml .=<<END;
	<br /> <br /><a name='about' />
	<font size='+2'>About this file</font>
	<p>
	This file is generated dynamically by <tt>lpml_parse.pl</tt> as
	part of a development compilation process. Author: Scott
	Harrison (harris41\@msu.edu).
	</p>
	END
	}
	elsif ($mode eq 'text') {
	$lpml = "LPML Description Page (dist=$dist, $date)";
	$lpml .=<<END;

	* About this file
	* Software Package Description
	* Directory Structure
	* File Type Ownership and Permissions
	* File and Directory Structure
	END
	$lpml .=<<END;

	About this file

	This file is generated dynamically by lpml_parse.pl as
	part of a development compilation process. Author: Scott
	Harrison (harris41\@msu.edu).

	END
}	}
elsif ($mode eq 'install') {	elsif ($mode eq 'install') {
print '# LPML install targets. Linux Packaging Markup Language,';	print '# LPML install targets. Linux Packaging Markup Language,';
Line 399 sub format_categories {	Line 452 sub format_categories {
my $text=&trim($parser->get_text('/categories'));	my $text=&trim($parser->get_text('/categories'));
$parser->get_tag('/categories');	$parser->get_tag('/categories');
if ($mode eq 'html') {	if ($mode eq 'html') {
return $categories="\n<br />BEGIN CATEGORIES\n$text\n".	return $categories="\n<br /> <br />".
"<br />END CATEGORIES\n";	"\n<a name='ownperms'>".
	"\n<font size='+2'>File Type Ownership and Permissions".
	" Descriptions</font>".
	"\n<p>This table shows what permissions and ownership settings ".
	"correspond to each category.</p>".
	"\n<table border='1' cellpadding='5' width='60%'>\n".
	"<tr>".
	"<th align='left' bgcolor='#ffffff'>Icon</th>".
	"<th align='left' bgcolor='#ffffff'>Category Name</th>".
	"<th align='left' bgcolor='#ffffff'>Permissions ".
	"($categorytype)</th>".
	"</tr>".
	"\n$text\n".
	"</table>\n";
	}
	elsif ($mode eq 'text') {
	return $categories="\n".
	"\nFile Type Ownership and Permissions".
	" Descriptions".
	"\n$text".
	"\n";
}	}
else {	else {
return '';	return '';
Line 411 sub format_category {	Line 484 sub format_category {
my (@tokeninfo)=@_;	my (@tokeninfo)=@_;
$category_att_name=$tokeninfo[2]->{'name'};	$category_att_name=$tokeninfo[2]->{'name'};
$category_att_type=$tokeninfo[2]->{'type'};	$category_att_type=$tokeninfo[2]->{'type'};
$chmod='';$chown='';	$abbreviation=''; $chmod='';$chown='';
$parser->get_text('/category');	$parser->get_text('/category');
$parser->get_tag('/category');	$parser->get_tag('/category');
if ($mode eq 'html') {	if ($mode eq 'html') {
return $category="\n<br />CATEGORY $category_att_name ".	if ($category_att_type eq $categorytype) {
"$category_att_type $chmod $chown";	return $category="<tr>".
	"<td><img src='$abbreviation.gif' ".
	"alt='${category_att_name}' /></td>\n".
	"<td>${category_att_name}</td>\n".
	"<td>$chmod $chown</td>\n".
	"</tr>".
	"\n";
	# return $category="\n<br />CATEGORY $category_att_name ".
	# "$category_att_type $chmod $chown";
	}
}	}
else {	else {
if ($category_att_type eq $categorytype) {	if ($category_att_type eq $categorytype) {
Line 427 sub format_category {	Line 509 sub format_category {
return '';	return '';
}	}
}	}
	# --------------------------------------------------- Format categories section
	sub format_abbreviation {
	my @tokeninfo=@_;
	$abbreviation='';
	my $text=&trim($parser->get_text('/abbreviation'));
	if ($text) {
	$parser->get_tag('/abbreviation');
	$abbreviation=$text;
	}
	return '';
	}
# -------------------------------------------------------- Format chown section	# -------------------------------------------------------- Format chown section
sub format_chown {	sub format_chown {
my @tokeninfo=@_;	my @tokeninfo=@_;
Line 454 sub format_rpm {	Line 547 sub format_rpm {
my $text=&trim($parser->get_text('/rpm'));	my $text=&trim($parser->get_text('/rpm'));
$parser->get_tag('/rpm');	$parser->get_tag('/rpm');
if ($mode eq 'html') {	if ($mode eq 'html') {
return $rpm="\n<br />BEGIN RPM\n$text\n<br />END RPM";	return $rpm=<<END;
	<br /> <br />
	<a name='package' />
	<font size='+2'>Software Package Description</font>
	<p>
	<table bgcolor='#ffffff' border='0' cellpadding='10' cellspacing='0'>
	<tr><td><pre>
	$text
	</pre></td></tr>
	</table>
	END
	}
	elsif ($mode eq 'text') {
	return $rpm=<<END;
	Software Package Description

	$text
	END
}	}
else {	else {
return '';	return '';
Line 465 sub format_rpmSummary {	Line 575 sub format_rpmSummary {
my $text=&trim($parser->get_text('/rpmSummary'));	my $text=&trim($parser->get_text('/rpmSummary'));
$parser->get_tag('/rpmSummary');	$parser->get_tag('/rpmSummary');
if ($mode eq 'html') {	if ($mode eq 'html') {
return $rpmSummary="\n<br />RPMSUMMARY $text";	return $rpmSummary="\nSummary : $text";
	}
	elsif ($mode eq 'text') {
	return $rpmSummary="\nSummary : $text";
}	}
else {	else {
return '';	return '';
Line 476 sub format_rpmName {	Line 589 sub format_rpmName {
my $text=&trim($parser->get_text('/rpmName'));	my $text=&trim($parser->get_text('/rpmName'));
$parser->get_tag('/rpmName');	$parser->get_tag('/rpmName');
if ($mode eq 'html') {	if ($mode eq 'html') {
return $rpmName="\n<br />RPMNAME $text";	return $rpmName="\nName : $text";
	}
	elsif ($mode eq 'text') {
	return $rpmName="\nName : $text";
}	}
else {	else {
return '';	return '';
Line 487 sub format_rpmVersion {	Line 603 sub format_rpmVersion {
my $text=$parser->get_text('/rpmVersion');	my $text=$parser->get_text('/rpmVersion');
$parser->get_tag('/rpmVersion');	$parser->get_tag('/rpmVersion');
if ($mode eq 'html') {	if ($mode eq 'html') {
return $rpmVersion="\n<br />RPMVERSION $text";	return $rpmVersion="\nVersion : $text";
	}
	elsif ($mode eq 'text') {
	return $rpmVersion="\nVersion : $text";
}	}
else {	else {
return '';	return '';
Line 498 sub format_rpmRelease {	Line 617 sub format_rpmRelease {
my $text=$parser->get_text('/rpmRelease');	my $text=$parser->get_text('/rpmRelease');
$parser->get_tag('/rpmRelease');	$parser->get_tag('/rpmRelease');
if ($mode eq 'html') {	if ($mode eq 'html') {
return $rpmRelease="\n<br />RPMRELEASE $text";	return $rpmRelease="\nRelease : $text";
	}
	elsif ($mode eq 'text') {
	return $rpmRelease="\nRelease : $text";
}	}
else {	else {
return '';	return '';
Line 509 sub format_rpmVendor {	Line 631 sub format_rpmVendor {
my $text=$parser->get_text('/rpmVendor');	my $text=$parser->get_text('/rpmVendor');
$parser->get_tag('/rpmVendor');	$parser->get_tag('/rpmVendor');
if ($mode eq 'html') {	if ($mode eq 'html') {
return $rpmVendor="\n<br />RPMVENDOR $text";	return $rpmVendor="\nVendor : $text";
	}
	elsif ($mode eq 'text') {
	return $rpmVendor="\nVendor : $text";
}	}
else {	else {
return '';	return '';
Line 520 sub format_rpmBuildRoot {	Line 645 sub format_rpmBuildRoot {
my $text=$parser->get_text('/rpmBuildRoot');	my $text=$parser->get_text('/rpmBuildRoot');
$parser->get_tag('/rpmBuildRoot');	$parser->get_tag('/rpmBuildRoot');
if ($mode eq 'html') {	if ($mode eq 'html') {
return $rpmBuildRoot="\n<br />RPMBUILDROOT $text";	return $rpmBuildRoot="\nBuild Root : $text";
	}
	elsif ($mode eq 'text') {
	return $rpmBuildRoot="\nBuild Root : $text";
}	}
else {	else {
return '';	return '';
Line 531 sub format_rpmCopyright {	Line 659 sub format_rpmCopyright {
my $text=$parser->get_text('/rpmCopyright');	my $text=$parser->get_text('/rpmCopyright');
$parser->get_tag('/rpmCopyright');	$parser->get_tag('/rpmCopyright');
if ($mode eq 'html') {	if ($mode eq 'html') {
return $rpmCopyright="\n<br />RPMCOPYRIGHT $text";	return $rpmCopyright="\nLicense : $text";
	}
	elsif ($mode eq 'text') {
	return $rpmCopyright="\nLicense : $text";
}	}
else {	else {
return '';	return '';
Line 542 sub format_rpmGroup {	Line 673 sub format_rpmGroup {
my $text=$parser->get_text('/rpmGroup');	my $text=$parser->get_text('/rpmGroup');
$parser->get_tag('/rpmGroup');	$parser->get_tag('/rpmGroup');
if ($mode eq 'html') {	if ($mode eq 'html') {
return $rpmGroup="\n<br />RPMGROUP $text";	return $rpmGroup="\nGroup : $text";
	}
	elsif ($mode eq 'text') {
	return $rpmGroup="\nGroup : $text";
}	}
else {	else {
return '';	return '';
Line 553 sub format_rpmSource {	Line 687 sub format_rpmSource {
my $text=$parser->get_text('/rpmSource');	my $text=$parser->get_text('/rpmSource');
$parser->get_tag('/rpmSource');	$parser->get_tag('/rpmSource');
if ($mode eq 'html') {	if ($mode eq 'html') {
return $rpmSource="\n<br />RPMSOURCE $text";	return $rpmSource="\nSource : $text";
	}
	elsif ($mode eq 'text') {
	return $rpmSource="\nSource : $text";
}	}
else {	else {
return '';	return '';
Line 564 sub format_rpmAutoReqProv {	Line 701 sub format_rpmAutoReqProv {
my $text=$parser->get_text('/rpmAutoReqProv');	my $text=$parser->get_text('/rpmAutoReqProv');
$parser->get_tag('/rpmAutoReqProv');	$parser->get_tag('/rpmAutoReqProv');
if ($mode eq 'html') {	if ($mode eq 'html') {
return $rpmAutoReqProv="\n<br />RPMAUTOREQPROV $text";	return $rpmAutoReqProv="\nAutoReqProv : $text";
	}
	if ($mode eq 'text') {
	return $rpmAutoReqProv="\nAutoReqProv : $text";
}	}
else {	else {
return '';	return '';
Line 575 sub format_rpmdescription {	Line 715 sub format_rpmdescription {
my $text=$parser->get_text('/rpmdescription');	my $text=$parser->get_text('/rpmdescription');
$parser->get_tag('/rpmdescription');	$parser->get_tag('/rpmdescription');
if ($mode eq 'html') {	if ($mode eq 'html') {
return $rpmdescription="\n<br />RPMDESCRIPTION $text";	$text=~s/\n//g;
	$text=~s/\\n/\n/g;
	return $rpmdescription="\nDescription : $text";
	}
	elsif ($mode eq 'text') {
	$text=~s/\n//g;
	$text=~s/\\n/\n/g;
	return $rpmdescription="\nDescription : $text";
}	}
else {	else {
return '';	return '';
Line 586 sub format_rpmpre {	Line 733 sub format_rpmpre {
my $text=$parser->get_text('/rpmpre');	my $text=$parser->get_text('/rpmpre');
$parser->get_tag('/rpmpre');	$parser->get_tag('/rpmpre');
if ($mode eq 'html') {	if ($mode eq 'html') {
return $rpmpre="\n<br />RPMPRE $text";	# return $rpmpre="\n<br />RPMPRE $text";
	return '';
}	}
else {	else {
return '';	return '';
Line 597 sub format_directories {	Line 745 sub format_directories {
my $text=$parser->get_text('/directories');	my $text=$parser->get_text('/directories');
$parser->get_tag('/directories');	$parser->get_tag('/directories');
if ($mode eq 'html') {	if ($mode eq 'html') {
return $directories="\n<br />BEGIN DIRECTORIES\n$text\n<br />".	return $directories="\n<br /> <br />".
"END DIRECTORIES\n";	"<a name='directories' />".
	"<font size='+2'>Directory Structure</font>".
	"\n$text\n<br />".
	"\n";
	}
	elsif ($mode eq 'text') {
	return $directories="\nDirectory Structure\n$text\n".
	"\n";
}	}
elsif ($mode eq 'install') {	elsif ($mode eq 'install') {
return "\n".'directories:'."\n".$text;	return "\n".'directories:'."\n".$text;
Line 663 sub format_files {	Line 818 sub format_files {
my $text=$parser->get_text('/files');	my $text=$parser->get_text('/files');
$parser->get_tag('/files');	$parser->get_tag('/files');
if ($mode eq 'html') {	if ($mode eq 'html') {
return $directories="\n<br />BEGIN FILES\n$text\n<br />END FILES\n";	return $directories="\n<br /> <br />".
	"<a name='files' />".
	"<font size='+2'>File and Directory Structure</font>".
	"\n$text\n<br />".
	"\n";
	}
	elsif ($mode eq 'text') {
	return $directories="\n".
	"File and Directory Structure".
	"\n$text\n".
	"\n";
}	}
elsif ($mode eq 'install') {	elsif ($mode eq 'install') {
return "\n".'files:'."\n".$text.	return "\n".'files:'."\n".$text.
Line 695 sub format_files {	Line 860 sub format_files {
$depstring.="\telif !(test -r $command/$dep);\\\n";	$depstring.="\telif !(test -r $command/$dep);\\\n";
$depstring.="\t\tthen echo ".	$depstring.="\t\tthen echo ".
"\"** WARNING ** missing the file: ".	"\"** WARNING ** missing the file: ".
"$command/$dep\";\\\n";	"$command/$dep\"$logcmd;\\\n";
$depstring.="\t\ttest -e $source \|\| test -e $target \|\| echo ".	$depstring.="\t\ttest -e $source \|\| test -e $target \|\| echo ".
"'** ERROR ** neither source=$source nor target=".	"'** ERROR ** neither source=$source nor target=".
"$target exist and they cannot be built';\\\n";	"$target exist and they cannot be built'$logcmd;\\\n";
$depstring.="\t\tmake -f Makefile.build ${source}___DEPS;\\\n";	$depstring.="\t\tmake -f Makefile.build ${source}___DEPS;\\\n";
if ($olddep) {	if ($olddep) {
$depstring2.="\t\tECODE=0;\\\n";	$depstring2.="\t\tECODE=0;\\\n";
$depstring2.="\t\t! test -e $source && test -r $command/$olddep &&".	$depstring2.="\t\t! test -e $source && test -r $command/$olddep &&".
" { 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";	" { 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\"$logcmd; };\\\n";
}	}
$olddep=$dep;	$olddep=$dep;
}	}
$binfo.="$source: $tword\n".	$binfo.="$source: $tword\n".
"\t\@if !(echo \"\");\\\n\t\tthen echo ".	"\t\@if !(echo \"\");\\\n\t\tthen echo ".
"\"** WARNING ** Strange shell. ".	"\"** WARNING ** Strange shell. ".
"Check your path settings.\";\\\n".	"Check your path settings.\"$logcmd;\\\n".
$depstring.	$depstring.
"\telse \\\n\t\t$command2\n\tfi\n\n";	"\telse \\\n\t\t$command2\n\tfi\n\n";
$binfo.="${source}___DEPS:\n".$depstring2."\t\tECODE=0;\n\n";	$binfo.="${source}___DEPS:\n".$depstring2."\t\tECODE=0;\n\n";
Line 770 sub format_file {	Line 935 sub format_file {
foreach my $dep (@deps) {	foreach my $dep (@deps) {
$depstring.=<<END;	$depstring.=<<END;
ECODE=0; DEP=''; \\	ECODE=0; DEP=''; \\
test -e $command/$dep \|\| (echo '** WARNING ** cannot evaluate status of dependency $command/$dep (for building ${sourceroot}/${source} with)'); DEP="1"; \\	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"; \\	[ -n DEP ] && { perl filecompare.pl -b2 $command/$dep ${targetroot}/${target} \|\| ECODE=\$\$?; } \|\| DEP="1"; \\
case "\$\$ECODE" in \\	case "\$\$ECODE" in \\
2) echo "** WARNING ** dependency $command/$dep is newer than target file ${targetroot}/${target}; you may want to run make build";; \\	2) echo "** WARNING ** dependency $command/$dep is newer than target file ${targetroot}/${target}; you may want to run make build"$logcmd;; \\
esac; \\	esac; \\
END	END
}	}
chomp $depstring;	chomp $depstring;
$buildtest=<<END;	$buildtest=<<END;
\@if !(test -e "${sourceroot}/${source}") && !(test -e "${targetroot}/${target}"); then \\	\@if !(test -e "${sourceroot}/${source}") && !(test -e "${targetroot}/${target}"); then \\
echo "** ERROR ** ${sourceroot}/${source} is missing and is also not present at target location ${targetroot}/${target}; you must run make build"; exit; \\	echo "** ERROR ** ${sourceroot}/${source} is missing and is also not present at target location ${targetroot}/${target}; you must run make build"$logcmd; exit; \\
END	END
$buildtest.=<<END if $depstring;	$buildtest.=<<END if $depstring;
elif !(test -e "${sourceroot}/${source}"); then \\	elif !(test -e "${sourceroot}/${source}"); then \\
Line 793 END	Line 958 END
my $bflag='-b1';	my $bflag='-b1';
$bflag='-b3' if $dependencies or $buildlink;	$bflag='-b3' if $dependencies or $buildlink;
return <<END;	return <<END;
$buildtest \@if !(test -e "${sourceroot}/${source}"); then \\	$buildtest \@if !(test -e "${sourceroot}/${source}") && !(test -e "${targetroot}/${target}"); then \\
echo "** WARNING ** CVS source file does not exist: ${sourceroot}/${source}"; \\	echo "** ERROR ** CVS source file does not exist: ${sourceroot}/${source} and neither does target: ${targetroot}/${target}"$logcmd; \\
	elif !(test -e "${sourceroot}/${source}"); then \\
	echo "** WARNING ** CVS source file does not exist: ${sourceroot}/${source}"$logcmd; \\
	perl verifymodown.pl ${targetroot}/${target} "$categoryhash{$categoryname}"$logcmd; \\
else \\	else \\
ECODE=0; \\	ECODE=0; \\
perl filecompare.pl $bflag ${sourceroot}/${source} ${targetroot}/${target} \|\| ECODE=\$\$?; \\	perl filecompare.pl $bflag ${sourceroot}/${source} ${targetroot}/${target} \|\| ECODE=\$\$?; \\
case "\$\$ECODE" in \\	case "\$\$ECODE" in \\
1) echo "${targetroot}/${target} is unchanged";; \\	1) echo "${targetroot}/${target} is unchanged";; \\
2) echo "** WARNING ** target file ${targetroot}/${target} is newer than CVS source; creating ${targetroot}/${target}.lpmlnewfile instead" && install -o www -g www -m 0500 ${sourceroot}/${source} ${targetroot}/${target}.lpmlnewfile;; \\	2) echo "** WARNING ** target file ${targetroot}/${target} is newer than CVS source; saving current (old) target file to ${targetroot}/${target}.lpmlsave and then overwriting"$logcmd && install -o www -g www -m 0600 ${targetroot}/${target} ${targetroot}/${target}.lpmlsave && install $categoryhash{$categoryname} ${sourceroot}/${source} ${targetroot}/${target};; \\
0) echo "install -o www -g www -m 0500 ${sourceroot}/${source} ${targetroot}/${target}" && install -o www -g www -m 0500 ${sourceroot}/${source} ${targetroot}/${target};; \\	0) echo "install $categoryhash{$categorname} ${sourceroot}/${source} ${targetroot}/${target}" && install $categoryhash{$categoryname} ${sourceroot}/${source} ${targetroot}/${target};; \\
esac; \\	esac; \\
	perl verifymodown.pl ${targetroot}/${target} "$categoryhash{$categoryname}"$logcmd; \\
fi	fi
END	END
# return "\t".'@test -e '.$sourceroot.'/'.$source.	# return "\t".'@test -e '.$sourceroot.'/'.$source.
Line 812 END	Line 981 END
# $categoryhash{$categoryname}.' '.	# $categoryhash{$categoryname}.' '.
# $sourceroot.'/'.$source.' '.	# $sourceroot.'/'.$source.' '.
# $targetroot.'/'.$target.	# $targetroot.'/'.$target.
# ' \|\| echo "**** LON-CAPA WARNING '.	# ' \|\| echo "**** WARNING '.
# '**** CVS source file does not exist: '.$sourceroot.'/'.	# '**** CVS source file does not exist: '.$sourceroot.'/'.
# $source.'"'."\n";	# $source.'"'."\n";
}	}
elsif ($mode eq 'configinstall' && $categoryname eq 'conf') {	elsif ($mode eq 'configinstall' && $categoryname eq 'conf') {
push @configall,$targetroot.'/'.$target;	push @configall,$targetroot.'/'.$target;
return $targetroot.'/'.$target.': alwaysrun'."\n".	return $targetroot.'/'.$target.': alwaysrun'."\n".
"\t".'@echo -n ""; ECODE=0 && { perl filecompare.pl -b4 '.$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.' '.	$sourceroot.'/'.$source.' '.
$targetroot.'/'.$target.'.lpmlnewconf'.	$targetroot.'/'.$target.'.lpmlnew'.
' && echo "* CONFIGURATION FILE CHANGE *" && echo "'.	' && echo "** NOTE: CONFIGURATION FILE CHANGE **"'.
	$logcmd.' && echo "'.
'You likely need to compare contents of '.	'You likely need to compare contents of '.
''.$targetroot.'/'.$target.' with the new '.	''.$targetroot.'/'.$target.' with the new '.
''.$targetroot.'/'.$target.'.lpmlnewconf"'.	''.$targetroot.'/'.$target.'.lpmlnew"'.
"); };\n\n";	"$logcmd); } && ".
	'{ [ $$ECODE != "3" ] \|\| (install '.
	$categoryhash{$categoryname}.' '.
	$sourceroot.'/'.$source.' '.
	$targetroot.'/'.$target.''.
	' && 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";
}	}
elsif ($mode eq 'build' && $build) {	elsif ($mode eq 'build' && $build) {
push @buildall,$sourceroot.'/'.$source;	push @buildall,$sourceroot.'/'.$source;

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>

Removed from v.1.18
changed lines
	Added in v.1.25