From edd6e7eee2ba0de2e6fc74d2f8ee3d19c9688db5 Mon Sep 17 00:00:00 2001 From: Basile Burg Date: Sun, 14 Jan 2018 16:23:51 +0100 Subject: [PATCH] better names for DUB verbosity + fix custom options no well passed --- src/ce_dubproject.pas | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/src/ce_dubproject.pas b/src/ce_dubproject.pas index a7bc2168..fc2eae97 100644 --- a/src/ce_dubproject.pas +++ b/src/ce_dubproject.pas @@ -16,7 +16,7 @@ type TDubDependencyCheck = (dcStandard, dcOffline, dcNo); - TDubVerbosity = (vDefault, vQuiet, vVerbose, vVeryVerbose, vOnlyWarnAndError, vOnlyError); + TDubVerbosity = (default, quiet, verbose, veryVerbose, onlyWarnAndError, onlyError); (** * Stores the build options, always applied when a project is build @@ -44,7 +44,7 @@ type property combined: boolean read fCombined write fCombined; property other: string read fOther write fOther; property dependenciesCheck: TDubDependencyCheck read fDepCheck write fDepCheck; - property verbosity: TDubVerbosity read fVerbosity write fVerbosity default vDefault; + property verbosity: TDubVerbosity read fVerbosity write fVerbosity default default; public procedure assign(source: TPersistent); override; procedure getOpts(options: TStrings); @@ -230,11 +230,6 @@ end; procedure TCEDubBuildOptionsBase.getOpts(options: TStrings); const vb: array[TDubVerbosity] of string = ( - '', //vDefault, - '--vquiet', //vQuiet, - '-v', //vVerbose, - '--vverbose', //vVeryVerbose, - '-q', //vOnlyWarnAndError, '--verror'); //vError begin if parallel then @@ -251,7 +246,8 @@ begin dcNo: options.Add('--skip-registry=all'); dcOffline: options.Add('--skip-registry=standard'); end; - options.Add(vb[fVerbosity]); + if fVerbosity <> TDubVerbosity.default then + options.Add(vb[fVerbosity]); if other.isNotEmpty then CommandToList(other, options); end;