dub (dlang) prefer dub run to dub build

12 files changed, 106 insertions, 121 deletions

diff --git a/COPYRIGHT b/COPYRIGHT
index 37ec057..88b66fb 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -150,17 +150,3 @@
     [https://github.com/adamdruppe/arsd]
 
   - sundry/spine_search_cgi/src/ext_depends_cgi/arsd
-
-- Name: dub2nix
-  - Description:
-
-  - Author:
-    [Lionello Lunesu]
-
-  - Copyright: (C) 2019 Lionello Lunesu
-
-  - code: mkDub.nix (modified as needed)
-    - License: MIT License
-
-  - Homepages:
-    [https://github.com/lionello/dub2nix]
diff --git a/README b/README
index d1a6c1f..bd7a152 100644
--- a/README
+++ b/README
@@ -61,9 +61,7 @@ D projects tend to use dub as project manager
 
 The default build tools used are dub with ldc2 (dub is also tested)
 
-** make a directory and clone the sisudoc-spine project-heading
-
-# make a directory and clone the sisudoc-spine project
+** make a directory and clone the sisudoc-spine project
 
   mkdir ~/git.sisudoc
   cd ~/git.sisudoc
@@ -74,19 +72,32 @@ The default build tools used are dub with ldc2 (dub is also tested)
 
 such a relative directory layout will be assumed in the examples that provided
 
+all work in this installation of and use of sisudoc-spine will take place in the
+directory: sisudoc-spine
+
 ** build sisudoc-spine
 
+NOTE all actions to build sisudoc-spine are taken within the directory
+sisudoc-spine
+
+cd sisudoc-spine
+
 ## directly with dub
 ### ldc2
+  # on nix (get dependencies by setting your development environment):
+  nix develop ".#dsh-nixpkgs-ldc-dub" --print-build-logs -c zsh
 
+  dub run --compiler=ldmd2 --config=ldmd2 --combined --skip-registry=all
   dub --compiler=ldmd2 --config=ldmd2
-  dub --verbose --compiler=ldmd2 -color --config=ldmd2
 
+  dub run --compiler=ldc2 --config=ldc2 --combined --skip-registry=all
   dub --compiler=ldc2 --config=ldc2
-  dub --verbose --compiler=ldc2 -color --config=ldc2
 
 ### dmd
+  # on nix (get dependencies by setting your development environment):
+  nix develop ".#dsh-nixpkgs-dmd-dub" --print-build-logs -c zsh
 
+  dub run --compiler=dmd --config=dmd --combined --skip-registry=all
   dub --compiler=dmd --config=dmd
 
 ## with make
@@ -103,12 +114,10 @@ such a relative directory layout will be assumed in the examples that provided
 
 ### ldc2
 
-  nix develop ".#dsh-nixpkgs-ldc-dub" --print-build-logs -c zsh
   nix build ".#spine-nixpkgs-ldc" --print-build-logs
 
 ### dmd
 
-  nix develop ".#dsh-nixpkgs-dmd-dub" --print-build-logs -c zsh
   nix build ".#spine-nixpkgs-dmd" --print-build-logs
 
 ## the Meson build system was used briefly
diff --git a/README.md b/README.md
index 9d4afc4..6b4ecd3 100644
--- a/README.md
+++ b/README.md
@@ -44,9 +44,7 @@ D projects tend to use dub as project manager
 
 The default build tools used are dub with ldc2 (dub is also tested)
 
-## make a directory and clone the sisudoc-spine project-heading
-
-# make a directory and clone the sisudoc-spine project
+## make a directory and clone the sisudoc-spine project
 
   mkdir ~/git.sisudoc
   cd ~/git.sisudoc
@@ -57,19 +55,32 @@ The default build tools used are dub with ldc2 (dub is also tested)
 
 such a relative directory layout will be assumed in the examples that provided
 
+all work in this installation of and use of sisudoc-spine will take place in the
+directory: sisudoc-spine
+
 ## build sisudoc-spine
 
+NOTE all actions to build sisudoc-spine are taken within the directory
+sisudoc-spine
+
+cd sisudoc-spine
+
 ## directly with dub
 ### ldc2
+  # on nix (get dependencies by setting your development environment):
+  nix develop ".#dsh-nixpkgs-ldc-dub" --print-build-logs -c zsh
 
+  dub run --compiler=ldmd2 --config=ldmd2 --combined --skip-registry=all
   dub --compiler=ldmd2 --config=ldmd2
-  dub --verbose --compiler=ldmd2 -color --config=ldmd2
 
+  dub run --compiler=ldc2 --config=ldc2 --combined --skip-registry=all
   dub --compiler=ldc2 --config=ldc2
-  dub --verbose --compiler=ldc2 -color --config=ldc2
 
 ### dmd
+  # on nix (get dependencies by setting your development environment):
+  nix develop ".#dsh-nixpkgs-dmd-dub" --print-build-logs -c zsh
 
+  dub run --compiler=dmd --config=dmd --combined --skip-registry=all
   dub --compiler=dmd --config=dmd
 
 ## with make
@@ -86,12 +97,10 @@ such a relative directory layout will be assumed in the examples that provided
 
 ### ldc2
 
-  nix develop ".#dsh-nixpkgs-ldc-dub" --print-build-logs -c zsh
   nix build ".#spine-nixpkgs-ldc" --print-build-logs
 
 ### dmd
 
-  nix develop ".#dsh-nixpkgs-dmd-dub" --print-build-logs -c zsh
   nix build ".#spine-nixpkgs-dmd" --print-build-logs
 
 ## the Meson build system was used briefly
diff --git a/derivation.nix b/derivation.nix
index 2ed8b4e..1db0c88 100644
--- a/derivation.nix
+++ b/derivation.nix
@@ -59,7 +59,7 @@ with (
                 exit "Error: could not find D compiler"
               fi
               echo "$DC_ used as D compiler to build $pname"
-              dub build --compiler=$DC --build=release --combined --skip-registry=all
+              dub run --compiler=$DC --build=release --combined --skip-registry=all
               runHook postBuild
             '';
             checkPhase = ''
diff --git a/flake.lock b/flake.lock
index 10002d2..c26d95c 100644
--- a/flake.lock
+++ b/flake.lock
@@ -20,11 +20,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1714912032,
-        "narHash": "sha256-clkcOIkg8G4xuJh+1onLG4HPMpbtzdLv4rHxFzgsH9c=",
+        "lastModified": 1715037484,
+        "narHash": "sha256-OUt8xQFmBU96Hmm4T9tOWTu4oCswCzoVl+pxSq/kiFc=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "ee4a6e0f566fe5ec79968c57a9c2c3c25f2cf41d",
+        "rev": "ad7efee13e0d216bf29992311536fce1d3eefbef",
         "type": "github"
       },
       "original": {
diff --git a/flake.nix b/flake.nix
index 495e86c..93752a5 100644
--- a/flake.nix
+++ b/flake.nix
@@ -69,7 +69,7 @@
             done
             if [ "$DC" == "" ]; then exit "Error: could not find D compiler"; fi
             echo "$DC_ used as D compiler to build $pname"
-            buildCMD="dub build --cache=local --compiler=$DC --build=$DC_ --combined --skip-registry=all"
+            buildCMD="dub run --cache=local --compiler=$DC --build=$DC_ --combined --skip-registry=all"
             echo $buildCMD
             $buildCMD
             echo $buildCMD
@@ -92,7 +92,7 @@
           nativeBuildInputs = with pkgs-ovl; [dub dmd gnumake];
           buildPhase = ''
             runHook preBuild
-            buildCMD="dub build --cache=local --compiler=$(type -P dmd) --build=dmd --combined --skip-registry=all"
+            buildCMD="dub run --cache=local --compiler=$(type -P dmd) --build=dmd --combined --skip-registry=all"
             echo $buildCMD
             $buildCMD
             echo $buildCMD
@@ -115,7 +115,7 @@
           nativeBuildInputs = with pkgs-ovl; [dub ldc gnumake];
           buildPhase = ''
             runHook preBuild
-            buildCMD="dub build --cache=local --compiler=$(type -P ldmd2) --build=ldmd2 --combined --skip-registry=all"
+            buildCMD="dub run --cache=local --compiler=$(type -P ldmd2) --build=ldmd2 --combined --skip-registry=all"
             echo $buildCMD
             $buildCMD
             echo $buildCMD
@@ -138,7 +138,7 @@
           nativeBuildInputs = with pkgs-ovl; [dub dmd gnumake];
           buildPhase = ''
             runHook preBuild
-            buildCMD="dub build --cache=local --compiler=$(type -P dmd) --build=dmd --combined --skip-registry=all"
+            buildCMD="dub run --cache=local --compiler=$(type -P dmd) --build=dmd --combined --skip-registry=all"
             echo $buildCMD
             $buildCMD
             echo $buildCMD
@@ -161,7 +161,7 @@
           nativeBuildInputs = with pkgs-ovl; [dub ldc gnumake];
           buildPhase = ''
             runHook preBuild
-            buildCMD="dub build --cache=local --compiler=$(type -P ldmd2) --build=ldmd2 --combined --skip-registry=all"
+            buildCMD="dub run --cache=local --compiler=$(type -P ldmd2) --build=ldmd2 --combined --skip-registry=all"
             echo $buildCMD
             $buildCMD
             echo $buildCMD
@@ -184,7 +184,7 @@
         #  nativeBuildInputs = with pkgs-ovl; [ dub gdc gnumake ];
         #  buildPhase = ''
         #    runHook preBuild
-        #    dub build --cache=local --compiler=$(type -P gdc) --build=gdc --combined --skip-registry=all
+        #    dub run --cache=local --compiler=$(type -P gdc) --build=gdc --combined --skip-registry=all
         #    runHook postBuild
         #  '';
         #  inherit preBuild;
diff --git a/makefile b/makefile
index 59651de..6fa71bd 100644
--- a/makefile
+++ b/makefile
@@ -113,7 +113,7 @@ buildPhase:
 	  exit 1; \
 	fi; \
 	echo "$${DC_} used as D compiler to build $${pname}"; \
-	dub build --compiler=$${DC} --build=$${DC_} --combined --skip-registry=all;
+	dub run --compiler=$${DC} --build=$${DC_} --combined --skip-registry=all;
 
 checkPhase:
 	runHook preCheck; \
diff --git a/org/config_make.org b/org/config_make.org
index abae71c..3806db0 100644
--- a/org/config_make.org
+++ b/org/config_make.org
@@ -164,7 +164,7 @@ buildPhase:
 	  exit 1; \
 	fi; \
 	echo "$${DC_} used as D compiler to build $${pname}"; \
-	dub build --compiler=$${DC} --build=$${DC_} --combined --skip-registry=all;
+	dub run --compiler=$${DC} --build=$${DC_} --combined --skip-registry=all;
 
 checkPhase:
 	runHook preCheck; \
diff --git a/org/config_nix.org b/org/config_nix.org
index 4495aea..bb33493 100644
--- a/org/config_nix.org
+++ b/org/config_nix.org
@@ -92,7 +92,7 @@
             done
             if [ "$DC" == "" ]; then exit "Error: could not find D compiler"; fi
             echo "$DC_ used as D compiler to build $pname"
-            buildCMD="dub build --cache=local --compiler=$DC --build=$DC_ --combined --skip-registry=all"
+            buildCMD="dub run --cache=local --compiler=$DC --build=$DC_ --combined --skip-registry=all"
             echo $buildCMD
             $buildCMD
             echo $buildCMD
@@ -115,7 +115,7 @@
           nativeBuildInputs = with pkgs-ovl; [dub dmd gnumake];
           buildPhase = ''
             runHook preBuild
-            buildCMD="dub build --cache=local --compiler=$(type -P dmd) --build=dmd --combined --skip-registry=all"
+            buildCMD="dub run --cache=local --compiler=$(type -P dmd) --build=dmd --combined --skip-registry=all"
             echo $buildCMD
             $buildCMD
             echo $buildCMD
@@ -138,7 +138,7 @@
           nativeBuildInputs = with pkgs-ovl; [dub ldc gnumake];
           buildPhase = ''
             runHook preBuild
-            buildCMD="dub build --cache=local --compiler=$(type -P ldmd2) --build=ldmd2 --combined --skip-registry=all"
+            buildCMD="dub run --cache=local --compiler=$(type -P ldmd2) --build=ldmd2 --combined --skip-registry=all"
             echo $buildCMD
             $buildCMD
             echo $buildCMD
@@ -161,7 +161,7 @@
           nativeBuildInputs = with pkgs-ovl; [dub dmd gnumake];
           buildPhase = ''
             runHook preBuild
-            buildCMD="dub build --cache=local --compiler=$(type -P dmd) --build=dmd --combined --skip-registry=all"
+            buildCMD="dub run --cache=local --compiler=$(type -P dmd) --build=dmd --combined --skip-registry=all"
             echo $buildCMD
             $buildCMD
             echo $buildCMD
@@ -184,7 +184,7 @@
           nativeBuildInputs = with pkgs-ovl; [dub ldc gnumake];
           buildPhase = ''
             runHook preBuild
-            buildCMD="dub build --cache=local --compiler=$(type -P ldmd2) --build=ldmd2 --combined --skip-registry=all"
+            buildCMD="dub run --cache=local --compiler=$(type -P ldmd2) --build=ldmd2 --combined --skip-registry=all"
             echo $buildCMD
             $buildCMD
             echo $buildCMD
@@ -207,7 +207,7 @@
         #  nativeBuildInputs = with pkgs-ovl; [ dub gdc gnumake ];
         #  buildPhase = ''
         #    runHook preBuild
-        #    dub build --cache=local --compiler=$(type -P gdc) --build=gdc --combined --skip-registry=all
+        #    dub run --cache=local --compiler=$(type -P gdc) --build=gdc --combined --skip-registry=all
         #    runHook postBuild
         #  '';
         #  inherit preBuild;
@@ -576,7 +576,7 @@ with (
                 exit "Error: could not find D compiler"
               fi
               echo "$DC_ used as D compiler to build $pname"
-              dub build --compiler=$DC --build=release --combined --skip-registry=all
+              dub run --compiler=$DC --build=release --combined --skip-registry=all
               runHook postBuild
             '';
             checkPhase = ''
@@ -998,7 +998,7 @@ buildPhase:
 	  exit 1; \
 	fi; \
 	echo "$${DC_} used as D compiler to build $${pname}"; \
-	dub build --compiler=$${DC} --build=release --combined --skip-registry=all;
+	dub run --compiler=$${DC} --build=release --combined --skip-registry=all;
 checkPhase:
 	runHook preCheck; \
 	HOME=$${PWD}; \
diff --git a/org/spine_info.org b/org/spine_info.org
index 7d09b92..b93242e 100644
--- a/org/spine_info.org
+++ b/org/spine_info.org
@@ -178,13 +178,11 @@ The default build tools used are dub with ldc2 (dub is also tested)
 
 #+NAME: sisudoc_spine_readme_install_body_clone_h2
 #+BEGIN_SRC markdown
-make a directory and clone the sisudoc-spine project-heading
+make a directory and clone the sisudoc-spine project
 #+END_SRC
 
 #+NAME: sisudoc_spine_readme_install_body_clone
 #+BEGIN_SRC markdown
-# make a directory and clone the sisudoc-spine project
-
   mkdir ~/git.sisudoc
   cd ~/git.sisudoc
 
@@ -193,6 +191,9 @@ make a directory and clone the sisudoc-spine project-heading
   git clone git://git.sisudoc.org/markup/sisudoc-spine-samples
 
 such a relative directory layout will be assumed in the examples that provided
+
+all work in this installation of and use of sisudoc-spine will take place in the
+directory: sisudoc-spine
 #+END_SRC
 
 #+NAME: sisudoc_spine_readme_install_body_build_h2
@@ -202,17 +203,27 @@ build sisudoc-spine
 
 #+NAME: sisudoc_spine_readme_install_body_build
 #+BEGIN_SRC markdown
+NOTE all actions to build sisudoc-spine are taken within the directory
+sisudoc-spine
+
+cd sisudoc-spine
+
 ## directly with dub
 ### ldc2
+  # on nix (get dependencies by setting your development environment):
+  nix develop ".#dsh-nixpkgs-ldc-dub" --print-build-logs -c zsh
 
+  dub run --compiler=ldmd2 --config=ldmd2 --combined --skip-registry=all
   dub --compiler=ldmd2 --config=ldmd2
-  dub --verbose --compiler=ldmd2 -color --config=ldmd2
 
+  dub run --compiler=ldc2 --config=ldc2 --combined --skip-registry=all
   dub --compiler=ldc2 --config=ldc2
-  dub --verbose --compiler=ldc2 -color --config=ldc2
 
 ### dmd
+  # on nix (get dependencies by setting your development environment):
+  nix develop ".#dsh-nixpkgs-dmd-dub" --print-build-logs -c zsh
 
+  dub run --compiler=dmd --config=dmd --combined --skip-registry=all
   dub --compiler=dmd --config=dmd
 
 ## with make
@@ -229,12 +240,10 @@ build sisudoc-spine
 
 ### ldc2
 
-  nix develop ".#dsh-nixpkgs-ldc-dub" --print-build-logs -c zsh
   nix build ".#spine-nixpkgs-ldc" --print-build-logs
 
 ### dmd
 
-  nix develop ".#dsh-nixpkgs-dmd-dub" --print-build-logs -c zsh
   nix build ".#spine-nixpkgs-dmd" --print-build-logs
 
 ## the Meson build system was used briefly
@@ -531,44 +540,6 @@ at the time of writing this provides the following output:
   <<sisudoc_spine_readme_examples_create_db_and_search_form_text>>
 #+END_SRC
 
-*** env exports
-
-#+NAME: sisudoc_spine_readme_env_exports
-#+BEGIN_SRC markdown
-These examples assume the file layout suggested in cloning the git.sisudoc.org
-repository, i.e. that the directories sisudoc-spine and sisudoc-spine-samples
-are next to each other on a directory tree. Assuming this to be the case, you
-may wish to set the following exports with adjustments accoring to your specific
-needs for these examples.
-
-# ❯❯ set spine binary location:
-export SpineBIN=./result/bin/spine
-# ❯❯ nix builds spine binary:
-#export SpineBIN=./result/bin/spine
-# ❯❯ dub builds spine binary (name depends on build, check):
-#export SpineBIN=./bin/spine
-#export SpineBIN=./bin/spine-ldc
-#export SpineBIN=./bin/spine-dmd
-# ❯❯ location of source files:
-export SpineDOC=../sisudoc-spine-samples
-# ❯❯ location of source files pod:
-export SpinePOD=${SpineDOC}/markup/pod
-# ❯❯ sisudoc-spine output processing path:
-export SpineOUT=./OUTPUT_TEST_sisudocSpine
-# ❯❯ sisudoc-spine output processing path (web server e.g.):
-#export SpineOUT=/srv/www/spine
-export SpineSearchActionLocal='http://localhost/spine_search'
-export SpineSearchActionRemote='https://sisudoc.org/spine_search'
-# ❯❯ path configured for cgi search form:
-export SpineCGIform='spine_search'
-# ❯❯ search form db name:
-export SpineSQLdb='spine.search.db'
-# ❯❯ configuration cgi search form path:
-#export SpineCGIbin=/var/www/cgi/cgi-bin
-# ❯❯ configuration db path:
-#export SpineDBpath=/var/www/sqlite
-#+END_SRC
-
 *** text body md
 
 #+NAME: sisudoc_spine_readme_examples_md
@@ -611,6 +582,44 @@ export SpineSQLdb='spine.search.db'
   <<sisudoc_spine_readme_examples_create_db_and_search_form_text>>
 #+END_SRC
 
+*** env exports
+
+#+NAME: sisudoc_spine_readme_env_exports
+#+BEGIN_SRC markdown
+These examples assume the file layout suggested in cloning the git.sisudoc.org
+repository, i.e. that the directories sisudoc-spine and sisudoc-spine-samples
+are next to each other on a directory tree. Assuming this to be the case, you
+may wish to set the following exports with adjustments accoring to your specific
+needs for these examples.
+
+# ❯❯ set spine binary location:
+export SpineBIN=./result/bin/spine
+# ❯❯ nix builds spine binary:
+#export SpineBIN=./result/bin/spine
+# ❯❯ dub builds spine binary (name depends on build, check):
+#export SpineBIN=./bin/spine
+#export SpineBIN=./bin/spine-ldc
+#export SpineBIN=./bin/spine-dmd
+# ❯❯ location of source files:
+export SpineDOC=../sisudoc-spine-samples
+# ❯❯ location of source files pod:
+export SpinePOD=${SpineDOC}/markup/pod
+# ❯❯ sisudoc-spine output processing path:
+export SpineOUT=./OUTPUT_TEST_sisudocSpine
+# ❯❯ sisudoc-spine output processing path (web server e.g.):
+#export SpineOUT=/srv/www/spine
+export SpineSearchActionLocal='http://localhost/spine_search'
+export SpineSearchActionRemote='https://sisudoc.org/spine_search'
+# ❯❯ path configured for cgi search form:
+export SpineCGIform='spine_search'
+# ❯❯ search form db name:
+export SpineSQLdb='spine.search.db'
+# ❯❯ configuration cgi search form path:
+#export SpineCGIbin=/var/www/cgi/cgi-bin
+# ❯❯ configuration db path:
+#export SpineDBpath=/var/www/sqlite
+#+END_SRC
+
 *** text body content
 
 #+NAME: sisudoc_spine_readme_examples_curate_text
diff --git a/src/COPYRIGHT b/src/COPYRIGHT
index 37ec057..88b66fb 100644
--- a/src/COPYRIGHT
+++ b/src/COPYRIGHT
@@ -150,17 +150,3 @@
     [https://github.com/adamdruppe/arsd]
 
   - sundry/spine_search_cgi/src/ext_depends_cgi/arsd
-
-- Name: dub2nix
-  - Description:
-
-  - Author:
-    [Lionello Lunesu]
-
-  - Copyright: (C) 2019 Lionello Lunesu
-
-  - code: mkDub.nix (modified as needed)
-    - License: MIT License
-
-  - Homepages:
-    [https://github.com/lionello/dub2nix]
diff --git a/src/sisudoc/COPYRIGHT b/src/sisudoc/COPYRIGHT
index 37ec057..88b66fb 100644
--- a/src/sisudoc/COPYRIGHT
+++ b/src/sisudoc/COPYRIGHT
@@ -150,17 +150,3 @@
     [https://github.com/adamdruppe/arsd]
 
   - sundry/spine_search_cgi/src/ext_depends_cgi/arsd
-
-- Name: dub2nix
-  - Description:
-
-  - Author:
-    [Lionello Lunesu]
-
-  - Copyright: (C) 2019 Lionello Lunesu
-
-  - code: mkDub.nix (modified as needed)
-    - License: MIT License
-
-  - Homepages:
-    [https://github.com/lionello/dub2nix]