mirror of https://gitlab.com/basile.b/dexed.git
add DUB build option to override the target arch, close #221
This commit is contained in:
parent
edd6e7eee2
commit
c8d5a9aebe
|
@ -18,6 +18,8 @@ type
|
||||||
|
|
||||||
TDubVerbosity = (default, quiet, verbose, veryVerbose, onlyWarnAndError, onlyError);
|
TDubVerbosity = (default, quiet, verbose, veryVerbose, onlyWarnAndError, onlyError);
|
||||||
|
|
||||||
|
TDubArchOverride = (auto, x86, x86_64);
|
||||||
|
|
||||||
(**
|
(**
|
||||||
* Stores the build options, always applied when a project is build
|
* Stores the build options, always applied when a project is build
|
||||||
*)
|
*)
|
||||||
|
@ -29,6 +31,7 @@ type
|
||||||
fCombined: boolean;
|
fCombined: boolean;
|
||||||
fDepCheck: TDubDependencyCheck;
|
fDepCheck: TDubDependencyCheck;
|
||||||
fVerbosity: TDubVerbosity;
|
fVerbosity: TDubVerbosity;
|
||||||
|
fArchOverride: TDubArchOverride;
|
||||||
fOther: string;
|
fOther: string;
|
||||||
fCompiler: DCompiler;
|
fCompiler: DCompiler;
|
||||||
fShowConsole: boolean;
|
fShowConsole: boolean;
|
||||||
|
@ -45,6 +48,7 @@ type
|
||||||
property other: string read fOther write fOther;
|
property other: string read fOther write fOther;
|
||||||
property dependenciesCheck: TDubDependencyCheck read fDepCheck write fDepCheck;
|
property dependenciesCheck: TDubDependencyCheck read fDepCheck write fDepCheck;
|
||||||
property verbosity: TDubVerbosity read fVerbosity write fVerbosity default default;
|
property verbosity: TDubVerbosity read fVerbosity write fVerbosity default default;
|
||||||
|
property archOverride: TDubArchOverride read fArchOverride write fArchOverride default auto;
|
||||||
public
|
public
|
||||||
procedure assign(source: TPersistent); override;
|
procedure assign(source: TPersistent); override;
|
||||||
procedure getOpts(options: TStrings);
|
procedure getOpts(options: TStrings);
|
||||||
|
@ -223,6 +227,7 @@ begin
|
||||||
dependenciesCheck:=opts.dependenciesCheck;
|
dependenciesCheck:=opts.dependenciesCheck;
|
||||||
compiler:=opts.compiler;
|
compiler:=opts.compiler;
|
||||||
verbosity:=opts.verbosity;
|
verbosity:=opts.verbosity;
|
||||||
|
archOverride:=opts.archOverride;
|
||||||
end
|
end
|
||||||
else inherited;
|
else inherited;
|
||||||
end;
|
end;
|
||||||
|
@ -230,7 +235,17 @@ end;
|
||||||
procedure TCEDubBuildOptionsBase.getOpts(options: TStrings);
|
procedure TCEDubBuildOptionsBase.getOpts(options: TStrings);
|
||||||
const
|
const
|
||||||
vb: array[TDubVerbosity] of string = (
|
vb: array[TDubVerbosity] of string = (
|
||||||
|
'', //auto,
|
||||||
|
'--vquiet', //quiet,
|
||||||
|
'-v', //verbose,
|
||||||
|
'--vverbose', //veryVerbose,
|
||||||
|
'-q', //onlyWarnAndError,
|
||||||
'--verror'); //vError
|
'--verror'); //vError
|
||||||
|
ao: array [TDubArchOverride] of string = (
|
||||||
|
'',
|
||||||
|
'--arch=x86',
|
||||||
|
'--arch=x86_64'
|
||||||
|
);
|
||||||
begin
|
begin
|
||||||
if parallel then
|
if parallel then
|
||||||
options.Add('--parallel');
|
options.Add('--parallel');
|
||||||
|
@ -248,6 +263,8 @@ begin
|
||||||
end;
|
end;
|
||||||
if fVerbosity <> TDubVerbosity.default then
|
if fVerbosity <> TDubVerbosity.default then
|
||||||
options.Add(vb[fVerbosity]);
|
options.Add(vb[fVerbosity]);
|
||||||
|
if fArchOverride <> TDubArchOverride.auto then
|
||||||
|
options.Add(ao[fArchOverride]);
|
||||||
if other.isNotEmpty then
|
if other.isNotEmpty then
|
||||||
CommandToList(other, options);
|
CommandToList(other, options);
|
||||||
end;
|
end;
|
||||||
|
|
Loading…
Reference in New Issue