* Fix compiler warnings: switch to TStrings for external command options

This commit is contained in:
Michael VAN CANNEYT 2022-12-14 15:17:49 +01:00
parent 7762897d32
commit 4b5c7ab0f5
2 changed files with 371 additions and 187 deletions

File diff suppressed because it is too large Load Diff

View File

@ -14,9 +14,11 @@ procedure BeforeCompile_gdbint(Sender: TObject);
var
L : TStrings;
P : TPackage;
GdbLibDir, GdbLibFile: string;
Cmd,GdbLibDir, GdbLibFile: string;
GdbLibFound: boolean;
GdbintTarget, GdbVerTarget: TTarget;
Opts : TStrings;
begin
P := Sender as TPackage;
// Search for a libgdb file.
@ -90,10 +92,19 @@ begin
Installer.BuildEngine.CreateOutputDir(p);
Installer.BuildEngine.Log(vlCommand,'GDB-lib found, compiling and running gdbver to obtain GDB-version');
Installer.BuildEngine.Compile(P,GdbVerTarget);
Installer.BuildEngine.ExecuteCommand(Installer.BuildEngine.AddPathPrefix(p,p.
GetBinOutputDir(Defaults.CPU, Defaults.OS))+PathDelim+
AddProgramExtension('gdbver',Defaults.BuildOS),'-o ' +
Installer.BuildEngine.AddPathPrefix(p,'src'+PathDelim+'gdbver.inc'));
Cmd:=Installer.BuildEngine.AddPathPrefix(p,
p.GetBinOutputDir(Defaults.CPU, Defaults.OS))+
PathDelim+
AddProgramExtension('gdbver',Defaults.BuildOS);
Opts:=TStringList.Create;
try
Opts.Add('-o');
Opts.Add(Installer.BuildEngine.AddPathPrefix(p,'src'+PathDelim+'gdbver.inc'));
Installer.BuildEngine.ExecuteCommand(Cmd,Opts);
finally
opts.Free;
end;
with GdbintTarget.Dependencies do
AddInclude('gdbver.inc');