From e897eee6d6157314ef3396a4afca3c331eee9fe1 Mon Sep 17 00:00:00 2001 From: Ralph Amissah Date: Wed, 3 Mar 2021 10:51:41 -0500 Subject: make set_depends run dub describe, track json output - traded $PWD for project root as ./, i.e. from dub describe json - dub describe deletes parts of dependencies that are unreferenced by the project build; these are available elsewhere and there is little reason to keep them --- makefile | 27 ++++++++++++++++++++++++++- 1 file changed, 26 insertions(+), 1 deletion(-) (limited to 'makefile') diff --git a/makefile b/makefile index 0c8c7df..92791f7 100644 --- a/makefile +++ b/makefile @@ -104,6 +104,7 @@ get_depends: echo $${hwd} && \ echo $${gwd} && \ echo $${dirs} && \ + dub upgrade; \ cd $${gwd} && \ for dir in $${dirs}; do \ if [ -d $${dir} ]; then \ @@ -154,6 +155,19 @@ get_depends: cd $${hwd} set_depends: get_depends dub describe | sed 's_$(shell echo `pwd | sed 's_/_\\/_g'`)_._g' > dub_describe.json +rm_flakelock: + git reset HEAD flake.lock && \ + touch flake.lock \ + git rm -f flake.lock +flake_update: + git add .; \ + nix flake update && \ + git reset HEAD flake.lock; \ + cp flake.lock flake.lock_ +flake_update_move_lock: flake_update + touch flake.lock \ + git rm -f flake.lock +set_latest: set_depends flake_update rm_flakelock dub_upgrade: $(DUB) upgrade default: ldc @@ -603,7 +617,18 @@ tangle_maker: (setq-local org-src-preserve-indentation t) \ (org-babel-tangle) \ (kill-buffer)) '($$ORGFILES)))" 2>&1 - +lorri_shell: + lorri shell +nix_shell: + nix-shell +nix_build_default: + nix build -f default.nix && ./result/bin/spine -v +nix_build_project: + nix build -f project.nix && ./result/bin/spine -v +nix_build_spine: + nix build -f spine.nix && ./result/bin/spine -v +nix-build_default: + nix-build default.nix gitsnapshot: distclean tangle git commit -a .PHONY : all build rebuild debug release \ -- cgit v1.2.3