paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-08-17 03:09:32 +02:00
Code Issues Packages Projects Releases Wiki Activity

lazbuild: fixed converting line endings of message dialogs

Browse Source 
git-svn-id: trunk@16862 -
This commit is contained in:
mattias 2008-10-03 10:12:38 +00:00
parent 1e4f587a88
commit 0e0ed50080
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ide/lazarusidestrconsts.pas
View File

@ -2781,7 +2781,7 @@ resourcestring
lisAmbiguousUnitFound = 'Ambiguous Unit found'; lisAmbiguousUnitFound = 'Ambiguous Unit found';
lisTheFileWasFoundInOneOfTheSourceDirectoriesOfThePac = 'The file %s%s%s%' lisTheFileWasFoundInOneOfTheSourceDirectoriesOfThePac = 'The file %s%s%s%'
+'swas found in one of the source directories of the package %s and looks ' +'swas found in one of the source directories of the package %s and looks '
+'like a compiled unit.Compiled units must be in the output directory of ' +'like a compiled unit. Compiled units must be in the output directory of '
+'the package, otherwise other packages can get problems using this ' +'the package, otherwise other packages can get problems using this '
+'package.%s%sDelete ambiguous file?'; +'package.%s%sDelete ambiguous file?';
lisPkgMangUnableToDeleteFile = 'Unable to delete file %s%s%s.'; lisPkgMangUnableToDeleteFile = 'Unable to delete file %s%s%s.';
@ -2839,6 +2839,8 @@ resourcestring
lisOpenPackage2 = 'Open package %s'; lisOpenPackage2 = 'Open package %s';
lisPkgMangThePackageNameOfTheFileIsInvalid = 'The package name %s%s%s of%' lisPkgMangThePackageNameOfTheFileIsInvalid = 'The package name %s%s%s of%'
+'sthe file %s%s%s is invalid.'; +'sthe file %s%s%s is invalid.';
lisLazbuildIsNonInteractiveAbortingNow = '%s%s%s%slazbuild is non '
+'interactive, aborting now.';
lisPkgMangPackageConflicts = 'Package conflicts'; lisPkgMangPackageConflicts = 'Package conflicts';
lisPkgMangThereIsAlreadyAPackageLoadedFromFile = 'There is already a ' lisPkgMangThereIsAlreadyAPackageLoadedFromFile = 'There is already a '
+'package %s%s%s loaded%sfrom file %s%s%s.%sSee Components -> Package ' +'package %s%s%s loaded%sfrom file %s%s%s.%sSee Components -> Package '

8
ide/lazbuild.lpr
View File

@ -265,7 +265,8 @@ function TLazBuildApplication.OnIDEMessageDialog(const aCaption, aMsg: string;
): Integer; ): Integer;
begin begin
DumpStack; DumpStack;
Error(ErrorBuildFailed,aMsg); Error(ErrorBuildFailed, Format(lisLazbuildIsNonInteractiveAbortingNow, [
aCaption, #13, aMsg, #13]));
Result:=mrCancel; Result:=mrCancel;
end; end;
@ -274,7 +275,8 @@ function TLazBuildApplication.OnIDEQuestionDialog(const aCaption, aMsg: string;
): Integer; ): Integer;
begin begin
DumpStack; DumpStack;
Error(ErrorBuildFailed,aMsg); Error(ErrorBuildFailed, Format(lisLazbuildIsNonInteractiveAbortingNow, [
aCaption, #13, aMsg, #13]));
Result:=mrCancel; Result:=mrCancel;
end; end;
@ -1161,7 +1163,7 @@ end;
procedure TLazBuildApplication.Error(ErrorCode: Byte; const ErrorMsg: string); procedure TLazBuildApplication.Error(ErrorCode: Byte; const ErrorMsg: string);
begin begin
writeln('ERROR: ',ErrorMsg); writeln('ERROR: ',LineBreaksToSystemLineBreaks(ErrorMsg));
Halt(ErrorCode); Halt(ErrorCode);
end; end;