summaryrefslogtreecommitdiffhomepage
path: root/org/config_make.org
diff options
context:
space:
mode:
Diffstat (limited to 'org/config_make.org')
-rw-r--r--org/config_make.org41
1 files changed, 30 insertions, 11 deletions
diff --git a/org/config_make.org b/org/config_make.org
index 92e5155..4f91db4 100644
--- a/org/config_make.org
+++ b/org/config_make.org
@@ -54,15 +54,6 @@ SpineSearchAction := 'https://sisudoc.org/spine_search'
SpineCGIform := 'spine_search'
SpineSQLdb := 'spine.search.db'
-# nix build
-build:
- nix-build
-
-# cp cgi search form
-cp-cgi:
- sudo cp -vi /var/www/cgi/cgi-bin/spine_search /var/www/cgi/cgi-bin/spine_search_old && \
- sudo cp -vi result/share/cgi-bin/spine_search /var/www/cgi/cgi-bin/spine_search
-
get_depends:
hwd=$$(echo `pwd`) && \
gwd="$${hwd}/src/ext_depends" && \
@@ -657,7 +648,9 @@ gitsnapshot: distclean tangle
#+HEADER: :noweb yes
#+BEGIN_SRC makefile
<<make_cgi_search_makefile>>
+<<make_set_nix>>
<<make_get_project_cgi_search_dependencies_github>>
+<<make_copy_cgi_search>>
#+END_SRC
*** make
@@ -671,10 +664,38 @@ SpineSearchAction := 'https://sisudoc.org/spine_search'
SpineCGIform := 'spine_search'
SpineSQLdb := 'spine.search.db'
+#+END_SRC
+
+**** nix
+
+#+NAME: make_set_nix
+#+BEGIN_SRC makefile
+nix-devshell:
+ echo -ne "\n- nix flake update && nix flake check --show-trace && nix flake show && nix develop .#devShell\n\n- nix build .#default --print-build-logs\n- nix build .#spine-search-dmd --print-build-logs\n- nix build .#spine-search-ldc --print-build-logs\n- nix build .#spine-search-gdc --print-build-logs\n\n"; \
+ nix flake update && nix flake check --show-trace && nix flake show && nix develop .#devShell
+
# nix build
build:
nix-build
+nix-build-default:
+ nix build .#default --print-build-logs
+
+nix-build-dmd:
+ nix build .#spine-dmd --print-build-logs
+
+nix-build-ldc:
+ nix build .#spine-ldc --print-build-logs
+
+nix-build-gdc:
+ nix build .#spine-gdc --print-build-logs
+
+#+END_SRC
+
+**** post build copy
+
+#+NAME: make_copy_cgi_search
+#+BEGIN_SRC makefile
# cp cgi search form
cp-cgi:
sudo cp -vi /var/www/cgi/cgi-bin/spine_search /var/www/cgi/cgi-bin/spine_search_old && \
@@ -736,8 +757,6 @@ export NIX_PATH=/nix/var/nix/profiles/per-user/root/channels/nixos
- /srv/www/spine/latex
-** make
-
** notes
- vim {the_wealth_of_networks.yochai_benkler,two_bits.christopher_kelty,viral_spiral.david_bollier}.en.a4.portrait.tex