arsd/cgi.d updated now includes arsd/core.d ldc2 1.32.2

4 files changed, 20 insertions, 15 deletions

diff --git a/org/config_dub.org b/org/config_dub.org
index 0994d45..d8e39f3 100644
--- a/org/config_dub.org
+++ b/org/config_dub.org
@@ -51,7 +51,6 @@
   "stringImportPaths":         [ "./views" ],
   "buildRequirements":         [ "allowWarnings" ],
   "targetType":                "executable",
-  "platforms":                 [ "posix" ],
   "buildTypes": {
     "dmd": {
       "dflags":                [ "-J=views", "-I=src" ],
@@ -80,7 +79,7 @@
     }
   },
   "dependencies": {
-    "spine_search:arsd.cgi":         "*",
+    "spine_search:arsd.cgi":     "*",
     "spine_search:d2sqlite3":    "*"
   },
   "subPackages": [
@@ -96,7 +95,6 @@
       "configurations": [
         {
           "name":                "d2sqlite3",
-          "d2sqlite3":           "with-lib",
           "targetType":          "library",
           "systemDependencies":  "SQLite version >= 3.8.7",
           "libs":                [ "sqlite3" ],
@@ -116,7 +114,6 @@
       "configurations": [
         {
           "name":                "cgi",
-          "cgi":                 "with-lib",
           "targetType":          "library",
           "systemDependencies":  "Arsd version >= 0.8.7"
         }
diff --git a/org/config_env.org b/org/config_env.org
index fa26a72..15d600b 100644
--- a/org/config_env.org
+++ b/org/config_env.org
@@ -83,7 +83,7 @@ direnv fetchurl https://raw.githubusercontent.com/nix-community/nix-direnv/${Nix
 
 - bespoke modify appropriately and generate if needed
 
-#+HEADER: :tangle ../.envrc-local_
+#+HEADER: :tangle ../.envrc-local
 #+HEADER: :noweb yes
 #+BEGIN_SRC sh
 export DFLAGS="-O2 -inline -boundscheck=on -color=on"
diff --git a/org/config_make.org b/org/config_make.org
index d439806..25fae16 100644
--- a/org/config_make.org
+++ b/org/config_make.org
@@ -88,33 +88,40 @@ nix-build-ldc:
 nix-build-gdc:
 	nix build ".#spine-search-gdc" --print-build-logs
 
+# get project external dependencies
 get_depends:
 	hwd=$$(echo `pwd`) && \
 	gwd="$${hwd}/src/ext_depends" && \
-	dirs=$$(echo `ls -gx $${gwd}`) && \
 	license_bsl="Boost Software License 1.0 (BSL-1.0)" && \
 	echo $${hwd} && \
 	echo $${gwd} && \
-	echo $${deps} && \
 	dub upgrade; \
+	deps=`echo "d2sqlite3 arsd"` && \
+	for dir in $${deps}; do \
+	  if [ ! -d $${gwd}/$${dir} ]; then \
+	    mkdir -p $${gwd}/$${dir}; \
+	  fi; \
+	done; \
 	cd $${gwd} && \
 	for dir in $${deps}; do \
 	  if [ -d $${dir} ]; then \
 	    echo $${dir} && \
-	    if [[ "arsd" == $${dir} ]]; then \
+	    if [ "arsd" == $${dir} ]; then \
 	      echo $${dir} && \
 	      rm -rf $${dir} && \
-          mkdir $${dir} && \
-          aria2c -o "$${dir}/cgi.d" "https://raw.githubusercontent.com/adamdruppe/arsd/master/cgi.d" && \
+        mkdir $${dir} && \
+	      cd $${dir} && \
+	        wget "$${dir}/cgi.d" "https://raw.githubusercontent.com/adamdruppe/arsd/master/core.d"; \
+	        wget "$${dir}/cgi.d" "https://raw.githubusercontent.com/adamdruppe/arsd/master/cgi.d" && \
 	      cd $${gwd}; \
 	    elif [[ "d2sqlite3" == $${dir} ]]; then \
 	      echo $${dir} && \
 	      rm -rf $${dir} && \
 	      git clone --depth=1 https://github.com/dlang-community/$${dir} && \
 	      cd $${dir} && \
-	      echo "$${dir} `git rev-parse HEAD | cut -c 1-8`"   > ../$${dir}.meta && \
-	      echo "https://github.com/dlang-community/$${dir}" >> ../$${dir}.meta && \
-	      echo "$${license_bsl}"                            >> ../$${dir}.meta && \
+	        echo "$${dir} `git rev-parse HEAD | cut -c 1-8`"   > ../$${dir}.meta && \
+	        echo "https://github.com/dlang-community/$${dir}" >> ../$${dir}.meta && \
+	        echo "$${license_bsl}"                            >> ../$${dir}.meta && \
 	      cd $${gwd} && \
 	      rm -rf $${dir}/.git; \
 	    fi; \
@@ -122,6 +129,7 @@ get_depends:
 	done; \
 	cd $${hwd}
 
+# get and set project external dependencies
 set_depends: get_depends
 	dub describe | sed 's~$(shell echo `pwd | sed 's_/_\\/_g'`)~.~g'  > dub_describe.json
 
diff --git a/org/nixpkgs_overlays_d_related.org b/org/nixpkgs_overlays_d_related.org
index 0ea9ca6..9ca42d2 100644
--- a/org/nixpkgs_overlays_d_related.org
+++ b/org/nixpkgs_overlays_d_related.org
@@ -764,12 +764,12 @@ sha256 = "<<ldc_hash>>";
 
 #+NAME: ldc_version
 #+BEGIN_SRC nix
-<<ldc_version_1_30_0>>
+<<ldc_version_1_32_2>>
 #+END_SRC
 
 #+NAME: ldc_hash
 #+BEGIN_SRC nix
-<<ldc_hash_1_30_0>>
+<<ldc_hash_1_32_2>>
 #+END_SRC
 
 **** 1.33.0-beta1