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.57 and 1.60

version 1.57, 2011/03/25 22:55:06	version 1.60, 2012/01/27 23:50:57
Line 1324 END	Line 1324 END
return $result;	return $result;
}	}
my $bflag='-b1';	my $bflag='-b1';
$bflag='-b3' if $dependencies or $buildlink;	$bflag='-b3' if (($dependencies or $buildlink) or
return <<END;	($categoryname eq 'pdf manual'));
	if ($tokeninfo[2]{type} eq 'private') {
	return <<END;
	$buildtest \@if (test -e "${sourceroot}/${source}") && (test -e "${targetroot}/${target}"); then \\
	ECODE=0; \\
	perl filecompare.pl $bflag ${sourceroot}/${source} ${targetroot}/${target} \|\| ECODE=\$\$?; \\
	case "\$\$ECODE" in \\
	1) echo "${targetroot}/${target} is unchanged";; \\
	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 -p $categoryhash{$categoryname} ${sourceroot}/${source} ${targetroot}/${target};; \\
	0) echo "install -p $categoryhash{$categoryname} ${sourceroot}/${source} ${targetroot}/${target}" && install -p $categoryhash{$categoryname} ${sourceroot}/${source} ${targetroot}/${target};; \\
	esac; \\
	elif (test -e "${sourceroot}/${source}") && !(test -e "${targetroot}/${target}"); then\\
	echo "install -p $categoryhash{$categoryname} ${sourceroot}/${source} ${targetroot}/${target}" && install -p $categoryhash{$categoryname} ${sourceroot}/${source} ${targetroot}/${target}; \\
	fi
	\@if (test -e "${targetroot}/${target}"); then \\
	perl verifymodown.pl ${targetroot}/${target} "$categoryhash{$categoryname}"$logcmd; \\
	fi
	END
	} else {
	return <<END;
$buildtest \@if !(test -e "${sourceroot}/${source}") && !(test -e "${targetroot}/${target}"); then \\	$buildtest \@if !(test -e "${sourceroot}/${source}") && !(test -e "${targetroot}/${target}"); then \\
echo "** ERROR ** CVS source file does not exist: ${sourceroot}/${source} and neither does target: ${targetroot}/${target}"$logcmd; \\	echo "** ERROR ** CVS source file does not exist: ${sourceroot}/${source} and neither does target: ${targetroot}/${target}"$logcmd; \\
elif !(test -e "${sourceroot}/${source}"); then \\	elif !(test -e "${sourceroot}/${source}"); then \\
echo "** WARNING ** CVS source file does not exist: ${sourceroot}/${source}"$logcmd; \\	echo "** WARNING ** CVS source file does not exist: ${sourceroot}/${source}"$logcmd; \\
perl verifymodown.pl ${targetroot}/${target} "$categoryhash{$categoryname}"$logcmd; \\	perl verifymodown.pl ${targetroot}/${target} "$categoryhash{$categoryname}"$logcmd; \\
	elif !(test -e "${targetroot}/${target}"); then \\
	echo "install -p $categoryhash{$categoryname} ${sourceroot}/${source} ${targetroot}/${target}" && install -p $categoryhash{$categoryname} ${sourceroot}/${source} ${targetroot}/${target}; \\
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; 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};; \\	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 -p $categoryhash{$categoryname} ${sourceroot}/${source} ${targetroot}/${target};; \\
0) echo "install $categoryhash{$categoryname} ${sourceroot}/${source} ${targetroot}/${target}" && install $categoryhash{$categoryname} ${sourceroot}/${source} ${targetroot}/${target};; \\	0) echo "install -p $categoryhash{$categoryname} ${sourceroot}/${source} ${targetroot}/${target}" && install -p $categoryhash{$categoryname} ${sourceroot}/${source} ${targetroot}/${target};; \\
esac; \\	esac; \\
perl verifymodown.pl ${targetroot}/${target} "$categoryhash{$categoryname}"$logcmd; \\	perl verifymodown.pl ${targetroot}/${target} "$categoryhash{$categoryname}"$logcmd; \\
fi	fi
END	END
	}
}	}
elsif ($mode eq 'configinstall' && (($categoryname eq 'conf') \|\|	elsif ($mode eq 'configinstall' && (($categoryname eq 'conf') \|\|
($categoryname eq 'www conf'))) {	($categoryname eq 'www conf'))) {
Line 1533 sub format_fileglob {	Line 1555 sub format_fileglob {
if ($glob eq '*') {	if ($glob eq '*') {
$eglob='[^C][^V][^S]'.$glob;	$eglob='[^C][^V][^S]'.$glob;
}	}
return "\t".'install '.	return "\t".'install -p '.
$categoryhash{$categoryname}.' '.	$categoryhash{$categoryname}.' '.
$sourceroot.'/'.$sourcedir.$eglob.' '.	$sourceroot.'/'.$sourcedir.$eglob.' '.
$targetroot.'/'.$targetdir.'.'."\n";	$targetroot.'/'.$targetdir.'.'."\n";

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

Removed from v.1.57
changed lines
	Added in v.1.60