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

added Abort to save on modified

Browse Source 
git-svn-id: trunk@4034 -
This commit is contained in:
mattias 2003-04-10 10:17:27 +00:00
parent d770b99a47
commit a34871ef8e
3 changed files with 21 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ide/idecomp.pp
View File

@ -33,7 +33,6 @@ unit IDEComp;
{$mode objfpc}{$H+}
{ $DEFINE DATABASE}
{ $DEFINE INTERBASE}
interface

6
ide/msgview.pp
View File

@ -37,8 +37,8 @@ unit MsgView;
interface
uses
Classes, SysUtils, Controls, StdCtrls, Forms, LResources, IDEOptionDefs,
EnvironmentOpts;
Classes, SysUtils, Controls, StdCtrls, Forms, LResources, IDEProcs,
IDEOptionDefs, EnvironmentOpts;
type
@ -107,7 +107,7 @@ end;
{------------------------------------------------------------------------------
TMessagesView.Add
------------------------------------------------------------------------------}
Procedure TMessagesView.Add(const Msg: String);
Procedure TMessagesView.Add(const Msg: String);
Begin
if FLastLineIsProgress then begin
MessageView.Items[MessageView.Items.Count-1]:=Msg;

34
ide/outputfilter.pas
View File

@ -63,7 +63,7 @@ type
fPrgSourceFilename: string;
FStopExecute: boolean;
procedure DoAddFilteredLine(const s: string);
procedure DoAddLastLinkerMessages;
procedure DoAddLastLinkerMessages(SkipLastLine: boolean);
procedure DoAddLastAssemblerMessages;
function SearchIncludeFile(const ShortIncFilename: string): string;
procedure SetStopExecute(const AValue: boolean);
@ -323,7 +323,7 @@ begin
SkipMessage:=not (Project.CompilerOptions.ShowErrors
or Project.CompilerOptions.ShowAll);
if copy(s,j+2,length(s)-j-1)='Error while linking' then begin
DoAddLastLinkerMessages;
DoAddLastLinkerMessages(true);
end
else if copy(s,j+2,length(AsmError))=AsmError then begin
DoAddLastAssemblerMessages;
@ -349,10 +349,10 @@ begin
// subdirectory
// -> prepend the current subdirectory
Msg:=s;
if (fCompilingHistory<>nil) then begin
Filename:=TrimFilename(copy(Msg,1,FilenameEndPos));
if not FilenameIsAbsolute(Filename) then begin
// filename is relative
Filename:=TrimFilename(copy(Msg,1,FilenameEndPos));
if not FilenameIsAbsolute(Filename) then begin
// filename is relative
if (fCompilingHistory<>nil) then begin
// the compiler writes a line compiling ./subdir/unit.pas
// and then writes the messages without any path
// -> prepend this subdirectory
@ -372,13 +372,13 @@ begin
end;
dec(i);
end;
if i<0 then begin
// this file is not a compiled pascal source
// -> search for include files
Filename:=SearchIncludeFile(Filename);
Msg:=Filename+copy(Msg,FileNameEndPos+1,length(Msg)-FileNameEndPos);
FileNameEndPos:=length(Filename);
end;
end;
if i<0 then begin
// this file is not a compiled pascal source
// -> search for include files
Filename:=SearchIncludeFile(Filename);
Msg:=Filename+copy(Msg,FileNameEndPos+1,length(Msg)-FileNameEndPos);
FileNameEndPos:=length(Filename);
end;
end;
@ -390,7 +390,7 @@ begin
Msg:=Filename+copy(Msg,FilenameEndPos+1,length(Msg)-FilenameEndPos);
end;
end;
// add line
if not SkipMessage then
DoAddFilteredLine(Msg);
@ -497,7 +497,7 @@ begin
OnOutputString(s);
end;
procedure TOutputFilter.DoAddLastLinkerMessages;
procedure TOutputFilter.DoAddLastLinkerMessages(SkipLastLine: boolean);
var i: integer;
begin
// read back to 'Linking' message
@ -505,8 +505,10 @@ begin
while (i>=0) and (LeftStr(fOutput[i],length('Linking '))<>'Linking ') do
dec(i);
inc(i);
// output skipped messages
while (i<fOutput.Count) do begin
if (fOutput[i]<>'') then
if (fOutput[i]<>'')
and ((i<fOutput.Count-1) or (not SkipLastLine)) then
DoAddFilteredLine(fOutput[i]);
inc(i);
end;