From 99557fed581327ad213a97f9e41c7d5ab0f8af00 Mon Sep 17 00:00:00 2001
From: Basile Burg <basile.b@gmx.com>
Date: Mon, 8 Nov 2021 09:42:04 +0100
Subject: [PATCH] remove dub option dependencyCheck and replace with
 skipRegistry

---
 CHANGELOG.md              |  1 +
 docs/options_dub_build.md |  2 +-
 src/u_dubproject.pas      | 22 +++++++++++++++-------
 3 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8da9d8d7..46fa0d10 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,6 @@
 # v3.9.16-dev
 
+- DUB projects, options, removed _dependencyCheck_ and replaced with a new _skipRegistry_ option that maps 1:1 to the official documentation.
 - editor, option _textCompletionMinLength_ min length off-by-one.
 
 # v3.9.15
diff --git a/docs/options_dub_build.md b/docs/options_dub_build.md
index 1eaef1d5..dae9c4cd 100644
--- a/docs/options_dub_build.md
+++ b/docs/options_dub_build.md
@@ -12,7 +12,7 @@ This category exposes the DUB options that are passed to the build tool each tim
 - **autoSelectTestConfig**: When not checked the configuration used to test with DUB must be selected before executing the action _Test project_.
 - **combined**: If checked, tries to build the whole project in a single compiler run.
 - **compiler**: Selects [which compiler](options_compilers_paths.html) is used by DUB when a project is compiled. Note that the DUB scripts don't use this setting, instead the same preference set for the [runnable modules](features_runnables#options) is used.
-- **dependenciesCheck**: Defines how DUB checks the project dependencies, typically used to avoid too much network operations.
+- **skipRegistry**: Defines the sources that are not checked when a dependency is missing. Use _all_ for full offline.
 - **forceRebuild**: Forces a full recompilation, even if DUB determines that this would not be necessary.
 - **linkMode**: Specifies the way the compiler and linker are invoked.
 - **other**: Displays a list that can be filled with more switches. One item per line.
diff --git a/src/u_dubproject.pas b/src/u_dubproject.pas
index eeb9dcaa..dab93ad8 100644
--- a/src/u_dubproject.pas
+++ b/src/u_dubproject.pas
@@ -16,6 +16,8 @@ type
 
   TDubDependencyCheck = (dcStandard, dcOffline, dcNo);
 
+  TDubSkipRegistry = (none, standard, configured, all);
+
   TDubVerbosity = (default, quiet, verbose, veryVerbose, onlyWarnAndError, onlyError);
 
   TDubArchOverride = (auto, x86, x86_64);
@@ -62,6 +64,7 @@ type
     fLinkMode: TDubLinkMode;
     fCombined: boolean;
     fDepCheck: TDubDependencyCheck;
+    fSkipRegistry: TDubSkipRegistry;
     fVerbosity: TDubVerbosity;
     fArchOverride: TDubArchOverride;
     fOther: string;
@@ -80,11 +83,12 @@ type
     property linkMode: TDubLinkMode read fLinkMode write setLinkMode;
     property combined: boolean read fCombined write fCombined;
     property other: string read fOther write fOther;
-    property dependenciesCheck: TDubDependencyCheck read fDepCheck write fDepCheck;
+    property dependenciesCheck: TDubDependencyCheck write fDepCheck; deprecated;
     property verbosity: TDubVerbosity read fVerbosity write fVerbosity default default;
     property archOverride: TDubArchOverride read fArchOverride write fArchOverride default auto;
     property autoFetch: boolean read fAutoFetch write fAutoFetch default false;
     property autoSelectTestConfig: boolean read fAutoSelectTestConfig write fAutoSelectTestConfig default true;
+    property skipRegistry: TDubSkipRegistry read fSkipRegistry write fSkipRegistry default none;
   public
     procedure assign(source: TPersistent); override;
     procedure getOpts(options: TStrings);
@@ -572,19 +576,19 @@ begin
     combined:=opts.combined;
     linkMode:=opts.linkMode;
     other:=opts.other;
-    dependenciesCheck:=opts.dependenciesCheck;
     compiler:=opts.compiler;
     verbosity:=opts.verbosity;
     archOverride:=opts.archOverride;
     autoFetch:=opts.autoFetch;
     fAutoSelectTestConfig:=opts.fAutoSelectTestConfig;
+    skipRegistry:=opts.skipRegistry;
   end
   else inherited;
 end;
 
 procedure TDubBuildOptionsBase.getOpts(options: TStrings);
 const
-  vb: array[TDubVerbosity] of string = (
+  vb: array [TDubVerbosity] of string = (
   '',           //auto,
   '--vquiet',   //quiet,
   '-v',         //verbose,
@@ -596,6 +600,12 @@ const
   '--arch=x86',
   '--arch=x86_64'
   );
+  sr: array [TDubSkipRegistry] of string = (
+    '--skip-registry=none',
+    '--skip-registry=standard',
+    '--skip-registry=configured',
+    '--skip-registry=all'
+  );
 begin
   if parallel then
     options.Add('--parallel');
@@ -607,10 +617,8 @@ begin
     dlmAllAtOnce: options.Add('--build-mode=allAtOnce');
     dlmSingleFile: options.Add('--build-mode=singleFile');
   end;
-  case dependenciesCheck of
-    dcNo: options.Add('--skip-registry=all');
-    dcOffline: options.Add('--skip-registry=standard');
-  end;
+  if fSkipRegistry <> TDubSkipRegistry.none then
+    options.Add(sr[fSkipRegistry]);
   if fVerbosity <> TDubVerbosity.default then
     options.Add(vb[fVerbosity]);
   if fArchOverride <> TDubArchOverride.auto then