paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-08-30 11:20:23 +02:00
Code Issues Packages Projects Releases Wiki Activity

* Made BuildEngine.log public, so it can be used in fpmake.pp files

Browse Source 
* Made BuildEngine.ResolveFileNames public, so it can be used in fpmake.pp
   files
 * Do not try to add compiler-options to executables other then the compiler

git-svn-id: trunk@18094 -
This commit is contained in:
joost 2011-08-04 19:03:05 +00:00
parent 52afb619aa
commit 79473cd0f7
1 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
packages/fpmkunit/src/fpmkunit.pp
View File

@ -817,8 +817,6 @@ Type
Procedure SysArchiveFiles(List : TStrings; Const AFileName : String); virtual; Procedure SysArchiveFiles(List : TStrings; Const AFileName : String); virtual;
procedure LogIndent; procedure LogIndent;
procedure LogUnIndent; procedure LogUnIndent;
Procedure Log(Level : TVerboseLevel; Const Msg : String);
Procedure Log(Level : TVerboseLevel; Const Fmt : String; const Args : Array Of Const);
Procedure EnterDir(ADir : String); Procedure EnterDir(ADir : String);
Function GetCompiler : String; Function GetCompiler : String;
Function InstallPackageFiles(APAckage : TPackage; tt : TTargetType; Const Dest : String):Boolean; Function InstallPackageFiles(APAckage : TPackage; tt : TTargetType; Const Dest : String):Boolean;
@ -830,7 +828,6 @@ Type
procedure GetDirectoriesFromFilelist(const AFileList, ADirectoryList: TStringList); procedure GetDirectoriesFromFilelist(const AFileList, ADirectoryList: TStringList);
//package commands //package commands
Procedure ResolveFileNames(APackage : TPackage; ACPU:TCPU;AOS:TOS;DoChangeDir:boolean=true);
function GetUnitDir(APackage:TPackage):String; function GetUnitDir(APackage:TPackage):String;
procedure AddDependencyIncludePaths(L:TStrings;ATarget: TTarget); procedure AddDependencyIncludePaths(L:TStrings;ATarget: TTarget);
procedure AddDependencyUnitPaths(L:TStrings;APackage: TPackage); procedure AddDependencyUnitPaths(L:TStrings;APackage: TPackage);
@ -839,6 +836,7 @@ Type
destructor Destroy;override; destructor Destroy;override;
property Verbose : boolean read FVerbose write FVerbose; property Verbose : boolean read FVerbose write FVerbose;
Procedure ResolveFileNames(APackage : TPackage; ACPU:TCPU;AOS:TOS;DoChangeDir:boolean=true);
// Public Copy/delete/Move/Archive/Mkdir Commands. // Public Copy/delete/Move/Archive/Mkdir Commands.
Procedure ExecuteCommand(const Cmd,Args : String; IgnoreError : Boolean = False); virtual; Procedure ExecuteCommand(const Cmd,Args : String; IgnoreError : Boolean = False); virtual;
@ -890,6 +888,10 @@ Type
Procedure Archive(Packages : TPackages); Procedure Archive(Packages : TPackages);
procedure Manifest(Packages: TPackages); procedure Manifest(Packages: TPackages);
Procedure Clean(Packages : TPackages; AllTargets: boolean); Procedure Clean(Packages : TPackages; AllTargets: boolean);
Procedure Log(Level : TVerboseLevel; Const Msg : String);
Procedure Log(Level : TVerboseLevel; Const Fmt : String; const Args : Array Of Const);
Property ListMode : Boolean Read FListMode Write FListMode; Property ListMode : Boolean Read FListMode Write FListMode;
Property ForceCompile : Boolean Read FForceCompile Write FForceCompile; Property ForceCompile : Boolean Read FForceCompile Write FForceCompile;
Property ExternalPackages: TPackages Read FExternalPackages; Property ExternalPackages: TPackages Read FExternalPackages;
@ -1288,11 +1290,7 @@ begin
BytesRead := 0; BytesRead := 0;
P := TProcess.Create(nil); P := TProcess.Create(nil);
try try
if Verbose then P.CommandLine := Path + ' ' + ComLine;
P.CommandLine := Path + ' ' + ComLine
else
P.CommandLine := Path + ' -viq ' + ComLine;
P.Options := [poUsePipes]; P.Options := [poUsePipes];
P.Execute; P.Execute;
@ -4340,6 +4338,13 @@ begin
Args.AddStrings(APackage.Options); Args.AddStrings(APackage.Options);
If (ATarget.HaveOptions) then If (ATarget.HaveOptions) then
Args.AddStrings(ATarget.Options); Args.AddStrings(ATarget.Options);
{$ifdef HAS_UNIT_PROCESS}
// Force the compiler-output to be easy parseable
if not Verbose then
args.Add('-viq');
{$endif}
// Add Filename to compile // Add Filename to compile
Args.Add(ATarget.TargetSourceFileName); Args.Add(ATarget.TargetSourceFileName);
// Convert to string // Convert to string