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.19 and 1.22

version 1.19, 2001/11/17 18:35:21	version 1.22, 2001/11/17 23:23:36
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 799 $buildtest \@if !(test -e "${sourceroot}	Line 799 $buildtest \@if !(test -e "${sourceroot}
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; \\
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"$logcmd && 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 823 END	Line 825 END
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 "** NOTE: CONFIGURATION FILE CHANGE **"'.	' && echo "** NOTE: CONFIGURATION FILE CHANGE **"'.
$logcmd.' && echo "'.	$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"'.
"$logcmd); };\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.19
changed lines
	Added in v.1.22