paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-04-16 10:19:30 +02:00
Code Issues Packages Projects Releases Wiki Activity

instantfpc: compiler output: replace cache file name with source file name

Browse Source 
git-svn-id: trunk@19264 -
This commit is contained in:
Mattias Gaertner 2011-09-28 14:32:34 +00:00
parent 0db7b03ec0
commit eb15e42e80
3 changed files with 51 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
utils/instantfpc/instantfpc.lpi
View File

@ -54,6 +54,12 @@
<IncludeFiles Value="$(ProjOutDir)"/>
<UnitOutputDirectory Value="lib/$(TargetCPU)-$(TargetOS)"/>
</SearchPaths>
<Linking>
<Debugging>
<GenerateDebugInfo Value="True"/>
<DebugInfoType Value="dsAuto"/>
</Debugging>
</Linking>
<Other>
<CompilerMessages>
<UseMsgFile Value="True"/>

4
utils/instantfpc/instantfpc.pas
View File

@ -25,7 +25,7 @@ uses
Classes, SysUtils, InstantFPTools;
const
Version = '1.1';
Version = '1.2';
Procedure Usage;
@ -189,7 +189,7 @@ begin
if not IsCacheValid(Src,CacheFilename,OutputFilename) then begin
// save source in cache to find out next time if something changed
Src.SaveToFile(CacheFilename);
Compile(CacheFilename,OutputFilename);
Compile(Filename,CacheFilename,OutputFilename);
end;
// run
if RunIt then

46
utils/instantfpc/instantfptools.pas
View File

@ -17,6 +17,10 @@ unit InstantFPTools;
{$DEFINE UseExeSearch}
{$ENDIF}
{$if defined(Windows) or defined(darwin)}
{$define CaseInsensitiveFilenames}
{$endif}
interface
uses
@ -31,7 +35,8 @@ function GetCacheDir: string;
procedure SetCacheDir(AValue : string);
function IsCacheValid(Src: TStringList;
const CachedSrcFile, CachedExeFile: string): boolean;
procedure Compile(const CacheFilename, OutputFilename: string);
procedure Compile(const SrcFilename, CacheFilename, OutputFilename: string);
procedure WriteCompilerOutput(SrcFilename, CacheFilename, CompilerOutput: string);
function GetCompiler: string;
procedure SetCompiler(AValue : string);
function GetCompilerParameters(const SrcFilename, OutputFilename: string): string;
@ -141,6 +146,41 @@ begin
CmdCompiler:=AValue;
end;
procedure WriteCompilerOutput(SrcFilename, CacheFilename, CompilerOutput: string);
var
Lines: TStringList;
i: Integer;
Line: String;
p: SizeInt;
begin
// replace in compiler output CacheFilename with SrcFilename
Lines:=TStringList.Create;
Lines.Text:=CompilerOutput;
{$IFDEF CaseInsensitiveFilenames}
CacheFilename:=LowerCase(CacheFilename);
{$ENDIF}
for i:=0 to Lines.Count-1 do begin
repeat
Line:=Lines[i];
{$IFDEF CaseInsensitiveFilenames}
Line:=LowerCase(Line);
{$ENDIF}
p:=Pos(CacheFilename,Line);
if p<1 then break;
{$IFDEF CaseInsensitiveFilenames}
Line:=Lines[i];
{$ENDIF}
Lines[i]:=copy(Line,1,p-1)+SrcFilename+copy(Line,p+length(CacheFilename),length(Line));
until false;
end;
// write to stdout
writeln(Lines.Text);
{$IFDEF IFFreeMem}
Lines.Free;
{$ENDIF}
end;
function GetCompiler: string;
var
CompFile: String;
@ -194,7 +234,7 @@ begin
end;
end;
procedure Compile(const CacheFilename, OutputFilename: string);
procedure Compile(const SrcFilename, CacheFilename, OutputFilename: string);
var
Compiler: String;
CompParams: String;
@ -222,7 +262,7 @@ begin
ss.write(buf,count);
until Count=0;
if (not Proc.WaitOnExit) or (Proc.ExitStatus<>0) then begin
write(ss.DataString);
WriteCompilerOutput(SrcFilename,CacheFilename,ss.DataString);
Halt(1);
end;
ss.Free;