IDE: replaced some cycle with circular dependency

git-svn-id: trunk@34586 -
This commit is contained in:
mattias 2012-01-04 23:12:31 +00:00
parent 8b271c0245
commit 52602e7db7
3 changed files with 7 additions and 7 deletions

View File

@ -3709,7 +3709,7 @@ begin
if ParsedStamp[Option]<>CompilerParseStamp then begin
if Parsing[Option] then begin
DebugLn('TParsedCompilerOptions.GetParsedValue Circle in Options: ',EnumToStr(Option),' Unparsed="',UnparsedValues[Option],'"');
ParsedError(Option, lisCycleInMacros);
ParsedError(Option, lisEndlessLoopInMacros);
exit('');
end;
Parsing[Option]:=true;

View File

@ -3394,9 +3394,9 @@ resourcestring
lisVersionMismatch = 'Version mismatch';
lisUnableToAddTheDependencyBecauseThePackageHasAlread = 'Unable to add the '
+'dependency %s, because the package %s has already a dependency %s';
lisCycleDetected = 'Cycle detected';
lisUnableToAddTheDependencyBecauseThisWouldCreateACyc = 'Unable to add the '
+'dependency %s, because this would create a cycle. Dependency %s';
lisCircularDependencyDetected = 'Circular dependency detected';
lisUnableToAddTheDependencyBecauseThisWouldCreateA = 'Unable to add the '
+'dependency %s, because this would create a circular dependency. Dependency %s';
lisProjAddTheProjectHasAlreadyADependency = 'The project has already a '
+'dependency for the package %s%s%s.';
lisProjAddPackageNotFound = 'Package not found';
@ -5274,7 +5274,7 @@ resourcestring
lisPEDirectories = 'Directories';
lisSelectAnotherLCLWidgetSetMacroLCLWidgetType = 'Select another LCL widget '
+'set (macro LCLWidgetType)';
lisCycleInMacros = 'Cycle in macros';
lisEndlessLoopInMacros = 'Endless loop in macros';
// Uses Unit dialog
dlgAlreadyUsesAllOtherUnits = '"%s" already uses all the units in this project';

View File

@ -445,8 +445,8 @@ begin
s:=PackagePathToStr(PathList);
DebugLn(['CheckAddingDependency ',LazPackage.Name,' requiring ',RequiredPackage.IDAsString,' creates cycles with ',s]);
if not Quiet then
IDEMessageDialog(lisCycleDetected,
Format(lisUnableToAddTheDependencyBecauseThisWouldCreateACyc, [
IDEMessageDialog(lisCircularDependencyDetected,
Format(lisUnableToAddTheDependencyBecauseThisWouldCreateA, [
RequiredPackage.IDAsString, s]),
mtError,[mbCancel]);
exit(mrCancel);