aboutsummaryrefslogtreecommitdiffhomepage
path: root/makefile
diff options
context:
space:
mode:
authorRalph Amissah <ralph.amissah@gmail.com>2023-02-21 16:32:11 -0500
committerRalph Amissah <ralph.amissah@gmail.com>2023-02-28 13:19:16 -0500
commit9598bd7275bec260f8f1131ae196d3a5f1e26617 (patch)
tree84885cbd312f4dfe44a1ca6e8a3c1d6eb48abc22 /makefile
parentnix flake & build, devShells etc. (diff)
nix flake & build, temp. remove gdc
Diffstat (limited to 'makefile')
-rw-r--r--makefile606
1 files changed, 327 insertions, 279 deletions
diff --git a/makefile b/makefile
index 87ce153..932b30e 100644
--- a/makefile
+++ b/makefile
@@ -48,41 +48,10 @@ data/pod/through_the_looking_glass.lewis_carroll \
data/pod/two_bits.christopher_kelty \
data/pod/un_contracts_international_sale_of_goods_convention_1980 \
data/pod/viral_spiral.david_bollier
-# SiSU_MARKUP_SAMPLES_DIR_FILES_FOUND = \
-# find data/sisudir/media/text -name *.ss[tm] | sort | xargs
-#
-# SiSU_MARKUP_SAMPLES_DIR = \
-# data/sisudir/media/text/accelerando.charles_stross.sst \
-# data/sisudir/media/text/alices_adventures_in_wonderland.lewis_carroll.sst \
-# data/sisudir/media/text/content.cory_doctorow.sst \
-# data/sisudir/media/text/democratizing_innovation.eric_von_hippel.sst \
-# data/sisudir/media/text/down_and_out_in_the_magic_kingdom.cory_doctorow.sst \
-# data/sisudir/media/text/ffa_tmp.sst \
-# data/sisudir/media/text/for_the_win.cory_doctorow.sst \
-# data/sisudir/media/text/free_as_in_freedom_2.richard_stallman_and_the_free_software_revolution.sam_williams.richard_stallman.sst \
-# data/sisudir/media/text/free_culture.lawrence_lessig.sst \
-# data/sisudir/media/text/free_for_all.peter_wayner.sst \
-# data/sisudir/media/text/gpl2.fsf.sst \
-# data/sisudir/media/text/gpl3.fsf.sst \
-# data/sisudir/media/text/gullivers_travels.jonathan_swift.sst \
-# data/sisudir/media/text/little_brother.cory_doctorow.sst \
-# data/sisudir/media/text/sisu_markup.sst \
-# data/sisudir/media/text/sisu_markup_stress_test.sst \
-# data/sisudir/media/text/sisu_markup_test.sst \
-# data/sisudir/media/text/table_special_markup.sst \
-# data/sisudir/media/text/the_autonomous_contract.ralph_amissah.sst \
-# data/sisudir/media/text/the_cathedral_and_the_bazaar.eric_s_raymond.sst \
-# data/sisudir/media/text/the_public_domain.james_boyle.sst \
-# data/sisudir/media/text/the_wealth_of_networks.yochai_benkler.sst \
-# data/sisudir/media/text/through_the_looking_glass.lewis_carroll.sst \
-# data/sisudir/media/text/two_bits.christopher_kelty.sst \
-# data/sisudir/media/text/un_contracts_international_sale_of_goods_convention_1980.sst \
-# data/sisudir/media/text/viral_spiral.david_bollier.sst
-#
Date := `date "+%Y%m%d"`
-SpineBIN := "${SpineBIN}" # './result/bin'
-SpineOUT := "${SpineOUT}" # '/srv/www/spine'
-SpinePOD := "${SpinePOD}" # '~/grotto/repo/git.repo/projects/project-spine/doc-reform-markup/spine-markup-samples/markup/pod'
+SpineBIN := "$${SpineBIN}" # './result/bin'
+SpineOUT := "$${SpineOUT}" # '/srv/www/spine'
+SpinePOD := "$${SpinePOD}" # '~/grotto/repo/git.repo/projects/doc-reform/data/markup/spine-samples/markup/pod'
SpineSearchActionLocal := 'http://localhost/spine_search'
SpineSearchActionRemote := 'https://sisudoc.org/spine_search'
SpineCGIform := 'spine_search'
@@ -91,23 +60,37 @@ hwd := `pwd`
gwd := `pwd` + "/src/ext_depends"
deps := "`ls -gx './src/ext_depends'`"
dirs_loc := "`ls -gx '.'`"
-#dirs := "`ls -gx {{gwd}}`"
+#dirs := "`ls -gx $${gwd}`"
+
+default: flake-check
+
+flake-check:
+ nix flake update; \
+ nix flake check; \
+ echo -e 'nix flake show ❯❯\n'; \
+ nix flake show; \
+ echo -e '\n❯❯ nix flake update && nix flake check --show-trace && nix flake show && nix develop ".#devShell" -c zsh\n'; \
+ echo -e '❯❯ nix develop\n❯❯ nix develop -c zsh\n'; \
+ echo -e '❯❯ nix build ".#spine-ldc" --print-build-logs |& nom\n❯❯ nix build ".#spine-dmd" --print-build-logs |& nom\n'; \
+ echo -e '❯❯ make -s\n❯❯ make -s nix-build-ldc\n❯❯ make -s nix-build-dmd\n'; \
+ echo -e '❯❯ make -s ldc\n❯❯ make -s dmd\n'; \
+ echo -e '❯❯ $(DUB) --compiler=ldc2 --build=ldc2\n❯❯ $(DUB) --compiler=dmd --build=dmd\n';
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-dmd --print-build-logs\n- nix build .#spine-ldc --print-build-logs\n- nix build .#spine-gdc --print-build-logs\n\n"; \
- nix flake update && nix flake check --show-trace && nix flake show && nix develop .#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-dmd" --print-build-logs\n❯❯ nix build ".#spine-ldc" --print-build-logs\n❯❯ nix build ".#spine-gdc" --print-build-logs\n\n'; \
+ nix flake update && nix flake check --show-trace && nix flake show && nix develop ".#devShell"
nix-build-default:
- nix build .#default --print-build-logs
+ nix build ".#default" --print-build-logs
nix-build-dmd:
- nix build .#spine-dmd --print-build-logs
+ nix build ".#spine-dmd" --print-build-logs
nix-build-ldc:
- nix build .#spine-ldc --print-build-logs
+ nix build ".#spine-ldc" --print-build-logs
nix-build-gdc:
- nix build .#spine-gdc --print-build-logs
+ nix build ".#spine-gdc" --print-build-logs
buildPhase:
HOME=$${PWD}; \
@@ -125,7 +108,7 @@ buildPhase:
fi; \
echo "$${DC_} used as D compiler to build $${pname}"; \
export DFLAGS="-O2 -inline"; \
- dub build --compiler=$${DC} --build=release --combined --skip-registry=all;
+ dub build --compiler=$${DC} --build=$${DC_} --combined --skip-registry=all;
checkPhase:
runHook preCheck; \
@@ -145,10 +128,10 @@ postInstall:
echo `ls -la $${out}/bin/spine`
commands:
- rg --color=always -B1 "^[a-z]\w+:" makefile | less
+ rg --color=always -B1 "^[a-zA-Z_-]+:" makefile | page
-cmd:
- rg --color=always -B1 "^[a-z]\w+:" makefile | bat
+cmds:
+ rg --color=always -B1 "^[a-zA-Z_-]+:" makefile | page
# tangle org files
org-tangle:
@@ -156,74 +139,58 @@ org-tangle:
org-tangle *.org; \
cd -
-# project vim
-proj-v:
- nvim ./org/doc-reform.org
-
-# project emacs, cli (single instance open)
-proj-e:
- emacsclient -F -c -a -f ./org/doc-reform.org
-
-# project emacs, cli (multiple instance, no copy & paste)
-proj:
- emacsclient -nw -a -f ./org/doc-reform.org
-
-# project emacs, gui
-proj-emacs:
- emacs ./org/doc-reform.org &
-
# epub output
out-epub:
- {{SpineBIN}}/spine -v \
- --epub --output={{SpineOUT}} {{SpinePOD}}/*
+ $${SpineBIN}/spine -v \
+ --epub --output=$${SpineOUT} $${SpinePOD}/*
# html output with local search links
out-html:
- {{SpineBIN}}/spine -v --generated-by \
+ $${SpineBIN}/spine -v --generated-by \
--curate \
- --html --html-link-search --html-link-curate --cgi-url-action="{{SpineSearchActionLocal}}" \
- --output={{SpineOUT}} {{SpinePOD}}/*
+ --html --html-link-search --html-link-curate --cgi-url-action="$${SpineSearchActionLocal}" \
+ --output=$${SpineOUT} $${SpinePOD}/*
# latex output
out-latex:
- {{SpineBIN}}/spine -v \
+ $${SpineBIN}/spine -v \
--latex \
- --output={{SpineOUT}} {{SpinePOD}}/*
+ --output=$${SpineOUT} $${SpinePOD}/*
# odf output
out-odf:
- {{SpineBIN}}/spine -v \
+ $${SpineBIN}/spine -v \
--odf \
- --output={{SpineOUT}} {{SpinePOD}}/*
+ --output=$${SpineOUT} $${SpinePOD}/*
# sqlite output
out-sqlite:
- {{SpineBIN}}/spine -v \
- --sqlite-update --sqlite-db-filename="{{SpineSQLdb}}" \
- --output={{SpineOUT}} {{SpinePOD}}/*
+ $${SpineBIN}/spine -v \
+ --sqlite-update --sqlite-db-filename="$${SpineSQLdb}" \
+ --output=$${SpineOUT} $${SpinePOD}/*
# generate markup sample output with local search links
output-samples-local:
- {{SpineBIN}}/spine -v \
+ $${SpineBIN}/spine -v \
--latex --latex-init \
--epub \
--html --html-link-search --html-link-pdf --html-link-curate --html-link-markup \
- --cgi-sqlite-search-filename="{{SpineCGIform}}" --cgi-url-action="{{SpineSearchActionLocal}}" \
+ --cgi-sqlite-search-filename="$${SpineCGIform}" --cgi-url-action="$${SpineSearchActionLocal}" \
--curate \
- --sqlite-update --sqlite-db-filename="{{SpineSQLdb}}" \
- --output={{SpineOUT}} {{SpinePOD}}/*
+ --sqlite-update --sqlite-db-filename="$${SpineSQLdb}" \
+ --output=$${SpineOUT} $${SpinePOD}/*
# generate markup sample output with remote search links
output-samples-remote:
- {{SpineBIN}}/spine -v \
+ $${SpineBIN}/spine -v \
--generated-by \
--latex --latex-init \
--epub \
--html --html-link-search --html-link-pdf --html-link-curate \
- --cgi-sqlite-search-filename="{{SpineCGIform}}" --cgi-url-action="{{SpineSearchActionRemote}}" \
+ --cgi-sqlite-search-filename="$${SpineCGIform}" --cgi-url-action="$${SpineSearchActionRemote}" \
--curate \
- --sqlite-update --sqlite-db-filename="{{SpineSQLdb}}" \
- --output={{SpineOUT}} {{SpinePOD}}/*
+ --sqlite-update --sqlite-db-filename="$${SpineSQLdb}" \
+ --output=$${SpineOUT} $${SpinePOD}/*
# generate markup sample output with local search links
output-samples: output-samples-local
@@ -234,8 +201,90 @@ generate-output-remote: nix-build output-samples-remote
# nix build (local) run
generate-output-local: nix-build output-samples-local
+# project vim
+proj-v:
+ vim ./org/doc-reform.org
+
+# project emacs, cli (single instance open)
+proj-e:
+ emacsclient -F -c -a -f ./org/doc-reform.org
+
+# project emacs, cli (multiple instance, no copy & paste)
+proj:
+ emacsclient -nw -a -f ./org/doc-reform.org
+
+# project emacs, gui
+proj-emacs:
+ emacs ./org/doc-reform.org &
+
+# search project
+fzf:
+ echo -n "what to search project for?: "; \
+ read FIND; \
+ rg --files-with-matches --no-messages "$${FIND}" | \
+ fzf --multi --ansi --print0 \
+ --preview-window=right:66% \
+ --preview="rg --pretty --after-context 3 --before-context 2 -- \"$${FIND}\" {}" \
+ --bind="enter:execute(vim -c \"silent! /$${FIND}\" {1})";
+
+# search org files directory
+fzf-org:
+ echo -n "what to search org directory for?: "; \
+ read FIND; \
+ cd ./org; \
+ rg --files-with-matches --no-messages "$${FIND}" | \
+ fzf --multi --ansi --print0 \
+ --preview-window=right:66% \
+ --preview="rg --pretty --after-context 3 --before-context 2 -- \"$${FIND}\" {}" \
+ --bind="enter:execute(vim -c \"silent! /$${FIND}\" {1})"; \
+ cd -;
+
+# search org files directory, emacs editor
+fzf-org-e:
+ echo -n "what to search org directory for?: "; \
+ read FIND; \
+ cd ./org; \
+ rg --files-with-matches --no-messages "$${FIND}" | \
+ fzf --multi --ansi --print0 \
+ --preview-window=right:66% \
+ --preview="rg --pretty --after-context 3 --before-context 2 -- \"$${FIND}\" {}" \
+ --bind="enter:execute(emacsclient -F -c -a -f {1})"; \
+ cd -;
+
+# search org files directory
+fzf-nix:
+ echo -n "what to search nix files for?: "; \
+ read FIND; \
+ rg --files-with-matches --no-messages "$${FIND}" *.nix makefile .envrc | \
+ fzf --multi --ansi --print0 \
+ --preview-window=right:66% \
+ --preview="rg --pretty --after-context 3 --before-context 2 -- \"$${FIND}\" {}" \
+ --bind="enter:execute(vim -c \"silent! /$${FIND}\" {1})";
+
+# search org files directory
+fzf-nix-e:
+ echo -n "what to search nix files for? (emacs): "; \
+ read FIND; \
+ rg --files-with-matches --no-messages "$${FIND}" *.nix makefile .envrc | \
+ fzf --multi --ansi --print0 \
+ --preview-window=right:66% \
+ --preview="rg --pretty --after-context 3 --before-context 2 -- \"$${FIND}\" {}" \
+ --bind="enter:execute(emacsclient -F -c -a -f {1})";
+
+# search project source files directory
+fzf-src:
+ echo -n "what to search source files for?: "; \
+ read FIND; \
+ cd ./src/doc_reform; \
+ rg --files-with-matches --no-messages "$${FIND}" | \
+ fzf --multi --ansi --print0 \
+ --preview-window=right:66% \
+ --preview="rg --pretty --after-context 3 --before-context 2 -- \"$${FIND}\" {}" \
+ --bind="enter:execute(vim -c \"silent! /$${FIND}\" {1})";
+ cd -;
+
# preview org files vim
-files-vim:
+files-vi:
fd --max-depth 6 --type file -g "*" | sort \
| fzf \
--preview='bat --color "always" {}' \
@@ -243,7 +292,7 @@ files-vim:
--bind="enter:execute(nvim {})"; \
# preview org files emacs
-files-emacs:
+files-e:
fd --max-depth 6 --type file -g "*" | sort \
| fzf \
--preview='bat --color "always" {}' \
@@ -251,7 +300,7 @@ files-emacs:
--bind="enter:execute(emacsclient -nw -a -f {})"; \
# preview org files vim
-org-vim:
+org-v:
cd ./org; \
fd --max-depth 5 --type file -g "*.org" | sort \
| fzf \
@@ -261,7 +310,7 @@ org-vim:
cd -
# preview org files emacs
-org-emacs:
+org-e:
cd ./org; \
fd --max-depth 5 --type file -g "*.org" | sort \
| fzf \
@@ -270,108 +319,48 @@ org-emacs:
--bind="enter:execute(emacsclient -nw -a -f {})"; \
cd -
-## search org files (view in vim)
-#org-v find:
-# cd ./org; \
-# rg --files-with-matches --no-messages "{{find}}" | \
-# fzf --multi --ansi --print0 \
-# --preview-window=right:66% \
-# --preview="rg --pretty --after-context 3 --before-context 2 -- \"{{find}}\" {}" \
-# --bind="enter:execute(nvim -c \"silent! /{{find}}\" {1})"; \
-# cd -
-#
-## search org files (view in emacsclient)
-#org-e find:
-# cd ./org; \
-# rg --files-with-matches --no-messages "{{find}}" | \
-# fzf --multi --ansi --print0 \
-# --preview-window=right:66% \
-# --preview="rg --pretty --after-context 3 --before-context 2 -- \"{{find}}\" {}" \
-# --bind="enter:execute(emacsclient -nw -a -f {})"; \
-# cd -
-#
-## search tips.org files (view in emacs)
-#org-E find:
-# cd ./org; \
-# rg --files-with-matches --no-messages "{{find}}" | \
-# fzf --multi --ansi --print0 \
-# --preview-window=right:66% \
-# --preview="rg --pretty --after-context 3 --before-context 2 -- \"{{find}}\" {}" \
-# --bind="enter:execute(emacs {} &)"; \
-# cd -
-#
-## search for in directory specified (view in vim, uses rg & fzf) ["find" for emacs]
-#sDir-v find dir:
-# cd {{dir}}; \
-# rg --files-with-matches --no-messages "{{find}}" | \
-# fzf --multi --ansi --print0 \
-# --preview-window=right:66% \
-# --preview="rg --pretty --after-context 3 --before-context 2 -- \"{{find}}\" {}" \
-# --bind="enter:execute(nvim -c \"silent! /{{find}}\" {1})"; \
-# cd -
-#
-## search for in directory specified (view in emacs, uses rg & fzf) ["search" for emacs]
-#sDir-e find dir:
-# cd {{dir}}; \
-# rg --files-with-matches --no-messages "{{find}}" | \
-# fzf --multi --ansi --print0 \
-# --preview-window=right:66% \
-# --preview="rg --pretty --after-context 3 --before-context 2 -- \"{{find}}\" {}" \
-# --bind="enter:execute(emacsclient -nw -a -f {})"; \
-# cd -
-#
-## search for in directory specified (view in emacs, uses rg & fzf) ["search" for emacs]
-#sDir-E find dir:
-# cd {{dir}}; \
-# rg --files-with-matches --no-messages "{{find}}" | \
-# fzf --multi --ansi --print0 \
-# --preview-window=right:66% \
-# --preview="rg --pretty --after-context 3 --before-context 2 -- \"{{find}}\" {}" \
-# --bind="enter:execute(emacs {} &)"; \
-# cd -
-
# show markup pod source selections
markup:
- ls -1 --color=always {{SpinePOD}}
- ls -1 -d --color=always {{SpinePOD}}/*/
+ ls -1 --color=always $${SpinePOD}
+ ls -1 -d --color=always $${SpinePOD}/*/
# show markup pod source tree
markup-pod-tree:
- exa -alT --git -I'.git|.dub|*_' --color=always -L5 ${SpinePOD} | less -R
+ exa -alT --git -I'.git|.dub|*_' --color=always -L5 $${SpinePOD} | less -R
# show markup pod source tree
tree-src:
- exa -alT --git -I'*_' --color=always -L5 ${SpineSRC}/doc_reform ${SpinePROJ}/views | less -R
+ exa -alT --git -I'*_' --color=always -L5 $${SpineSRC}/doc_reform $${SpinePROJ}/views | less -R
## show markup pod source tree
#tree-src-omit:
-# exa -alT --git -I'.git|.dub|*_' --color=always -L5 ${SpineSRC} ${SpinePROJ}/views | less -R
+# exa -alT --git -I'.git|.dub|*_' --color=always -L5 $${SpineSRC} $${SpinePROJ}/views | less -R
# show markup pod source tree
tree-src-search-cgi:
- exa -alT --git -I'*_' --color=always -L5 ${SpineSearchCGI}/src ${SpineSearchCGI}/views | less -R
+ exa -alT --git -I'*_' --color=always -L5 $${SpineSearchCGI}/src $${SpineSearchCGI}/views | less -R
# show markup files
markup-files:
- cd {{SpinePOD}}; \
+ cd $${SpinePOD}; \
find . -type f -iname "*sst"; \
cd -; \
- echo {{SpinePOD}}
-# find {{SpinePOD}}/. -type f -iname "*sst"
+ echo $${SpinePOD}
+# find $${SpinePOD}/. -type f -iname "*sst"
# preview markup files vim
-markup-files-vim:
- cd {{SpinePOD}}; \
+markup-files-vi:
+ cd $${SpinePOD}; \
fd --max-depth 5 --type file -g "*.ss?" | sort \
| fzf \
--preview='bat --color "always" {}' \
--preview-window=right:66% \
- --bind="enter:execute(nvim {})"; \
+ --bind="enter:execute(vim {})"; \
cd -
# preview markup files emacs
-markup-files-emacs:
- cd {{SpinePOD}}; \
+markup-files-e:
+ cd $${SpinePOD}; \
fd --max-depth 5 --type file -g "*.ss?" | sort \
| fzf \
--preview='bat --color "always" {}' \
@@ -391,88 +380,67 @@ markup-samples: markup-pod-samples markup-file-samples
# markup samples pod manifests
markup-pod-samples:
- echo "{{SpinePOD}}"; \
- find {{SpinePOD}} -name pod.manifest | sort
+ echo "$${SpinePOD}"; \
+ find $${SpinePOD} -name pod.manifest | sort
-#find {{SpinePOD}} -name pod.manifest | sed -E 's:.+?(([/][^/]+){2})$:\1:'
+#find $${SpinePOD} -name pod.manifest | sed -E 's:.+?(([/][^/]+){2})$:\1:'
# markup samples sst files
markup-file-samples:
- echo "{{SpinePOD}}"; \
- find {{SpinePOD}} -name *.ss[tm] | sort
-
-# markup_dir_samples:
-# find data/sisudir/media/text -name *.ss[tm] | sort
-
-# version_tag:
-# echo "DRV=0.12.0; git tag -f doc-reform_v$$\{DRV} -m\"doc-reform $$\{DRV}\" HEAD" && \
-# echo "git tag -f doc-reform_v0.12.0 -m\"doc-reform spine-0.12.0\" HEAD"
+ echo "$${SpinePOD}"; \
+ find $${SpinePOD} -name *.ss[tm] | sort
# archive spine output (www)
spineWWWarchive:
cd /srv/www ; \
- rm spine_output.{{Date}}.tar.bz2 ; \
- sudo tar --exclude='./spine/latex' --exclude='./spine/pod' --exclude='./spine/*_' -cjf spine_output.{{Date}}.tar.bz2 ./spine ; \
+ rm spine_output.$${Date}.tar.bz2 ; \
+ sudo tar --exclude='./spine/latex' --exclude='./spine/pod' --exclude='./spine/*_' -cjf spine_output.$${Date}.tar.bz2 ./spine ; \
cd -
# rsync archived spine output to Linode
spineWWWrsyncLinode:
- rsync -v /srv/www/spine_output.{{Date}}.tar.bz2 linode:./stage/. ; \
+ rsync -v /srv/www/spine_output.$${Date}.tar.bz2 linode:./stage/. ; \
rsync -v /var/www/sqlite/spine.search.db linode:./stage/. ; \
- echo "tar -xf ../spine_output.{{Date}}.tar.bz2"
+ echo "tar -xf ../spine_output.$${Date}.tar.bz2"
# get project external dependencies
depends_get:
dub upgrade; \
- cd {{gwd}} && \
- echo "{{dirs_loc}}" && \
- for dir in {{dirs_loc}}; do \
- if [[ -d ${dir} ]]; then \
- echo {{gwd}}/${dir} && \
- if [[ "imageformats" == ${dir} ]]; then \
- echo {{gwd}}/${dir} && \
- rm -rvf {{gwd}}/${dir} && \
- git clone --depth=1 https://github.com/tjhann/${dir} && \
- cd ${dir} && \
+ cd $${gwd} && \
+ echo "$${dirs_loc}" && \
+ for dir in $${dirs_loc}; do \
+ if [[ -d $${dir} ]]; then \
+ echo $${gwd}/$${dir} && \
+ if [[ "imageformats" == $${dir} ]]; then \
+ echo $${gwd}/$${dir} && \
+ rm -rvf $${gwd}/$${dir} && \
+ git clone --depth=1 https://github.com/tjhann/$${dir} && \
+ cd $${dir} && \
echo $$PWD && \
- echo "${dir} `git rev-parse HEAD | cut -c 1-8`" > ../${dir}.meta && \
- echo "https://github.com/tjhann/${dir}" >> ../${dir}.meta && \
- echo "Boost Software License 1.0 (BSL-1.0)" >> ../${dir}.meta && \
- cd {{gwd}} && \
- rm -rf {{gwd}}/${dir}/.git; \
- elif [[ "d2sqlite3" == ${dir} || "D-YAML" == ${dir} || "tinyendian" == ${dir} ]]; then \
- echo {{gwd}}/${dir} && \
- rm -rvf {{gwd}}/${dir} && \
- git clone --depth=1 https://github.com/dlang-community/${dir} && \
- cd {{gwd}}/${dir} && \
- echo "${dir} `git rev-parse HEAD | cut -c 1-8`" > ../${dir}.meta && \
- echo "https://github.com/dlang-community/${dir}" >> ../${dir}.meta && \
- echo "Boost Software License 1.0 (BSL-1.0)" >> ../${dir}.meta && \
- cd {{gwd}} && \
- rm -rf {{gwd}}/${dir}/.git; \
+ echo "$${dir} `git rev-parse HEAD | cut -c 1-8`" > ../$${dir}.meta && \
+ echo "https://github.com/tjhann/$${dir}" >> ../$${dir}.meta && \
+ echo "Boost Software License 1.0 (BSL-1.0)" >> ../$${dir}.meta && \
+ cd $${gwd} && \
+ rm -rf $${gwd}/$${dir}/.git; \
+ elif [[ "d2sqlite3" == $${dir} || "D-YAML" == $${dir} || "tinyendian" == $${dir} ]]; then \
+ echo $${gwd}/$${dir} && \
+ rm -rvf $${gwd}/$${dir} && \
+ git clone --depth=1 https://github.com/dlang-community/$${dir} && \
+ cd $${gwd}/$${dir} && \
+ echo "$${dir} `git rev-parse HEAD | cut -c 1-8`" > ../$${dir}.meta && \
+ echo "https://github.com/dlang-community/$${dir}" >> ../$${dir}.meta && \
+ echo "Boost Software License 1.0 (BSL-1.0)" >> ../$${dir}.meta && \
+ cd $${gwd} && \
+ rm -rf $${gwd}/$${dir}/.git; \
fi; \
fi; \
done; \
- cd {{hwd}}
+ cd $${hwd}
# get and set project external dependencies
depends_set: depends_get
dub describe | sed 's~$(shell echo `pwd | sed 's_/_\\/_g'`)~.~g' > dub_describe.json
-# markup_samples:
-# find data/pod -name pod.manifest | cut -f 1-3 -d / | sort; \
-# find data/sisudir/media/text -name *.ss[tm] | sort
-#
-# markup_pod_samples:
-# find data/pod -name pod.manifest | cut -f 1-3 -d / | sort
-#
-# markup_dir_samples:
-# find data/sisudir/media/text -name *.ss[tm] | sort
-#
-version_tag:
- echo "DRV=0.12.0; git tag -f doc-reform_v$$\{DRV} -m\"doc-reform $$\{DRV}\" HEAD" && \
- echo "git tag -f doc-reform_v0.12.0 -m\"doc-reform spine-0.12.0\" HEAD"
-
changelog_:
git log --pretty=format:'---%+s %+as %ae%+h%d%+b' --no-merges | sed "/^\\s*$$/d" | sed "s/^---$$//" | sed "s/^\(\*\)\+/-/" | sed "s/ \+$$//" > CHANGELOG_
@@ -489,11 +457,6 @@ gitArchive:
git archive -v --format=tar --prefix=spine-$(PROG_VER_DECLARED)-tag-$(PROG_VER_GIT)/ HEAD | gzip > ./tarballGitHEAD/spine-$(PROG_VER_DECLARED)-tag-$(PROG_VER_GIT).tar.gz && \
echo "to unzip: tar -xzf spine-$(PROG_VER_DECLARED)-tag-$(PROG_VER_GIT).tar.gz"
-# git archive project, produce current state .tar.gz
-# gitArchive:
-# git archive -v --format=tar --prefix="spine-{{PROG_VER_DECLARED}}-tag-{{PROG_VER_GIT}}/" HEAD | gzip > ./tarballGitHEAD/spine-{{PROG_VER_DECLARED}}-tag-{{PROG_VER_GIT}}.tar.gz && \
-# echo "to unzip: tar -xzf spine-{{PROG_VER_DECLARED}}-tag-{{PROG_VER_GIT}}.tar.gz"
-
# remove test tarball dir
nixGitHEADtarballClean:
if [ -d "./tarballGitHEAD" ]; then \
@@ -505,23 +468,22 @@ nixGitHEADtarballTar:
if [ ! -d "./tarballGitHEAD" ]; then \
mkdir ./tarballGitHEAD; \
fi; \
- git archive -v --format=tar --prefix="spine-${PROG_VER_DECLARED}/" HEAD | \
- gzip > ./tarballGitHEAD/spine-${PROG_VER_DECLARED}-tag-${PROG_VER_GIT}.tar.gz && \
- cp -v ./tarballGitHEAD/spine-${PROG_VER_DECLARED}-tag-${PROG_VER_GIT}.tar.gz ./tarballGitHEAD/spine-${PROG_VER_DECLARED}.tar.gz && \
- echo "to unzip: tar -xzf spine-${PROG_VER_DECLARED}-tag-${PROG_VER_GIT}.tar.gz"; \
- echo "to unzip: tar -xzf spine-${PROG_VER_DECLARED}.tar.gz"
+ git archive -v --format=tar --prefix="spine-$${PROG_VER_DECLARED}/" HEAD | \
+ gzip > ./tarballGitHEAD/spine-$${PROG_VER_DECLARED}-tag-$${PROG_VER_GIT}.tar.gz && \
+ cp -v ./tarballGitHEAD/spine-$${PROG_VER_DECLARED}-tag-$${PROG_VER_GIT}.tar.gz ./tarballGitHEAD/spine-$${PROG_VER_DECLARED}.tar.gz && \
+ echo "to unzip: tar -xzf spine-$${PROG_VER_DECLARED}-tag-$${PROG_VER_GIT}.tar.gz"; \
+ echo "to unzip: tar -xzf spine-$${PROG_VER_DECLARED}.tar.gz"
# check test tarball
nixGitHEADtarballCheck:
- nix flake check file://${hwd}/tarballGitHEAD/spine-${PROG_VER_DECLARED}.tar.gz; \
- nix flake lock file://${hwd}/tarballGitHEAD/spine-${PROG_VER_DECLARED}.tar.gz; \
- nix flake show file://${hwd}/tarballGitHEAD/spine-${PROG_VER_DECLARED}.tar.gz;
+ nix flake check file://$${hwd}/tarballGitHEAD/spine-$${PROG_VER_DECLARED}.tar.gz; \
+ nix flake lock file://$${hwd}/tarballGitHEAD/spine-$${PROG_VER_DECLARED}.tar.gz; \
+ nix flake show file://$${hwd}/tarballGitHEAD/spine-$${PROG_VER_DECLARED}.tar.gz;
# build test tarball
nixGitHEADtarballBuild:
- echo "nix build file://${hwd}/tarballGitHEAD/spine-${PROG_VER_DECLARED}.tar.gz#spine --print-build-logs"
- nix build file://${hwd}/tarballGitHEAD/spine-${PROG_VER_DECLARED}.tar.gz#spine --print-build-logs
- #nix build "./tarballGitHEAD/spine-${PROG_VER_DECLARED}.tar.gz#spine" --print-build-logs
+ echo "nix build file://$${hwd}/tarballGitHEAD/spine-$${PROG_VER_DECLARED}.tar.gz#spine --print-build-logs"; \
+ nix build file://$${hwd}/tarballGitHEAD/spine-$${PROG_VER_DECLARED}.tar.gz#spine --print-build-logs
# clean create check & build test tarball
nixGitHEADtarball: nixGitHEADtarballClean nixGitHEADtarballTar nixGitHEADtarballCheck nixGitHEADtarballBuild
@@ -588,22 +550,17 @@ set_latest: set_depends flake_update rm_flakelock
dub_upgrade:
$(DUB) upgrade
-default: ldc
+dc: ldc
+
+compile: ldc
all: dmd ldc gdc
all_ver: dmd_ver ldc_ver gdc_ver
-all_debug: dmd_debug gdc_debug ldc_debug
-
meson_clean_build_dir:
rm -r build; mkdir build
-meson_build: meson_clean_build_dir
- meson --buildtype=debugoptimized build
- ninja -C build
- notify-send -t 0 'D meson build ldc compiled test release executable ready' 'spine'
-
meson_redo: meson_clean_build_dir meson_build
meson_project_build_clean: clean skel tangle dub_upgrade meson_build
@@ -614,46 +571,33 @@ all_clean: clean tangle dmd ldc gdc
all_ver_clean: clean tangle dmd_ver ldc_ver gdc_ver
-all_debug_ver: dmd_debug_ver gdc_debug_ver ldc_debug_ver
-
-all_debug_clean_ver: clean tangle dmd_debug_ver gdc_debug_ver ldc_debug_ver
-
dmd: dub_upgrade
- $(DUB) --compiler=dmd --config=dmd --build=release-nobounds
+ $(DUB) --compiler=dmd --build=dmd --build=release-nobounds
notify-send -t 0 'D dmd compiled test release executable ready' 'spine-dmd'
-dmd_debug:
- $(DUB) --compiler=dmd --config=dmd --build=debug
-
# assumes git tags with program version
dmd_ver: dub_upgrade
- $(DUB) --compiler=dmd --config=dmd-version
+ $(DUB) --compiler=dmd --build=dmd-version
mv bin/spine-dmd-ver bin-archive/spine-$(PROG_VER_DECLARED)-tag-$(PROG_VER_GIT)-dmd
notify-send -t 0 'D dmd compiled test release executable ready' 'spine-$(PROG_VER_DECLARED)-tag-$(PROG_VER_GIT)-dmd'
dmd_clean_ver: clean tangle dmd_ver
dmd_rel: expunge skel tangle
- $(DUB) --compiler=dmd --config=spine-release
+ $(DUB) --compiler=dmd --build=spine-release
dmd_rel_tangle: tangle
- $(DUB) --compiler=dmd --config=spine-dmd
+ $(DUB) --compiler=dmd --build=spine-dmd
dmd_rel_expunge_tangle: expunge skel tangle dmd_rel_tangle
-dmd_debug_tangle: tangle
- $(DUB) --compiler=dmd --config=spine-dmd-debug
-
gdc: dub_upgrade
- $(DUB) --compiler=gdc --config=gdc
+ $(DUB) --compiler=gdc --build=gdc
notify-send -t 0 'D gdc compiled test release executable ready' 'spine-gdc'
-gdc_debug:
- $(DUB) --compiler=gdc --config=gdc --build=debug
-
# assumes git tags with program version
gdc_ver: dub_upgrade
- $(DUB) --compiler=gdc --config=gdc-version
+ $(DUB) --compiler=gdc --build=gdc-version
mv bin/spine-gdc-ver bin-archive/spine-$(PROG_VER_DECLARED)-tag-$(PROG_VER_GIT)-gdc
notify-send -t 0 'D gdc compiled test release executable ready' 'spine-$(PROG_VER_DECLARED)-tag-$(PROG_VER_GIT)-gdc'
@@ -667,16 +611,10 @@ gdc_rel_tangle: tangle
gdc_rel_expunge_tangle: expunge skel tangle gdc_rel_tangle
-gdc_debug_tangle: tangle
- $(DUB) --compiler=gdc --config=spine-gdc-debug
-
ldc: dub_upgrade
- $(DUB) --compiler=ldc2 --config=ldc --build=release
+ $(DUB) --compiler=ldc2 --build=ldc2 --build=release
notify-send -t 0 'D ldc compiled test release executable ready' 'spine-ldc'
-ldc_debug:
- $(DUB) --compiler=ldc2 --config=ldc --build=debug
-
# assumes git tags with program version
ldc_ver: dub_upgrade
$(DUB) --compiler=ldc2 --config=ldc-version
@@ -693,9 +631,6 @@ ldc_rel_tangle: tangle
ldc_rel_expunge_tangle: expunge skel tangle ldc_rel_tangle
-ldc_debug_tangle: tangle
- $(DUB) --compiler=ldc2 --config=spine-ldc-debug
-
reinit: clean skel tangle
skel:
@@ -780,6 +715,122 @@ restart: clean tangle
find_pods:
$(SiSU_MARKUP_SAMPLES_FIND_PODS)
+testrun_find:
+ spine -v --source --html --epub --sqlite-discrete \
+ --sqlite-create --sqlite-update \
+ --output-dir=tmp/program_output_pod \
+ data/pod/sisu-manual
+
+testrun_find_pod_source:
+ $(SiSU_MARKUP_SAMPLES_PODS_FOUND) \
+ spine -v --source \
+ --output-dir=tmp/program_output_pod
+
+testrun_find_pod_pod:
+ $(SiSU_MARKUP_SAMPLES_PODS_FOUND) \
+ spine -v --pod \
+ --output-dir=tmp/program_output_pod
+
+testrun_find_pod_html:
+ $(SiSU_MARKUP_SAMPLES_PODS_FOUND) \
+ spine -v --html \
+ --output-dir=tmp/program_output_pod
+
+testrun_find_pod_epub:
+ $(SiSU_MARKUP_SAMPLES_PODS_FOUND) \
+ spine -v --epub \
+ --output-dir=tmp/program_output_pod
+
+testrun_find_pod_all:
+ $(SiSU_MARKUP_SAMPLES_PODS_FOUND) \
+ spine -v --source --html --epub --sqlite-discrete \
+ --sqlite-create --sqlite-update \
+ --output-dir=tmp/program_output_pod
+
+testrun_paths:
+ spine -v --source --html --epub --sqlite-discrete \
+ --sqlite-create --sqlite-update \
+ --output-dir=tmp/program_output_pod \
+ data/pod/sisu-manual
+
+testrun_paths_pod_source:
+ spine -v --source \
+ --output-dir=tmp/program_output_pod \
+ ./markup/pod/*
+
+testrun_paths_pod_pod:
+ spine -v --pod \
+ --output-dir=tmp/program_output_pod \
+ ./markup/pod/*
+
+testrun_paths_pod_html:
+ spine -v --html \
+ --output-dir=tmp/program_output_pod \
+ ./markup/pod/*
+
+testrun_paths_pod_epub:
+ spine -v --epub \
+ --output-dir=tmp/program_output_pod \
+ ./markup/pod/*
+
+testrun_paths_pod_all:
+ spine -v --source --html --epub --sqlite-discrete \
+ --sqlite-create --sqlite-update \
+ --output-dir=tmp/program_output_pod \
+ ./markup/pod/*
+
+testrun_find_dir_source:
+ $(SiSU_MARKUP_SAMPLES_DIR_FILES_FOUND) \
+ spine -v --source \
+ --output-dir=tmp/program_output_dir
+
+testrun_find_dir_pod:
+ $(SiSU_MARKUP_SAMPLES_DIR_FILES_FOUND) \
+ spine -v --pod \
+ --output-dir=tmp/program_output_dir
+
+testrun_find_dir_html:
+ $(SiSU_MARKUP_SAMPLES_DIR_FILES_FOUND) \
+ spine -v --html \
+ --output-dir=tmp/program_output_dir
+
+testrun_find_dir_epub:
+ $(SiSU_MARKUP_SAMPLES_DIR_FILES_FOUND) \
+ spine -v --epub \
+ --output-dir=tmp/program_output_dir
+
+testrun_find_dir_all:
+ $(SiSU_MARKUP_SAMPLES_DIR_FILES_FOUND) \
+ spine -v --source --html --epub --sqlite-discrete \
+ --sqlite-create --sqlite-update \
+ --output-dir=tmp/program_output_dir
+
+testrun_filelist_dir_source:
+ spine -v --source \
+ --output-dir=tmp/program_output_dir \
+ $(SiSU_MARKUP_SAMPLES_DIR)
+
+testrun_filelist_dir_pod:
+ spine -v --pod \
+ --output-dir=tmp/program_output_dir \
+ $(SiSU_MARKUP_SAMPLES_DIR)
+
+testrun_filelist_dir_html:
+ spine -v --html \
+ --output-dir=tmp/program_output_dir \
+ $(SiSU_MARKUP_SAMPLES_DIR)
+
+testrun_filelist_dir_epub:
+ spine -v --epub \
+ --output-dir=tmp/program_output_dir \
+ $(SiSU_MARKUP_SAMPLES_DIR)
+
+testrun_filelist_dir_all:
+ spine -v --source --html --epub --sqlite-discrete \
+ --sqlite-create --sqlite-update \
+ --output-dir=tmp/program_output_dir \
+ $(SiSU_MARKUP_SAMPLES_DIR)
+
dmd_testrun_find:
./bin/spine-dmd -v --source --html --epub --sqlite-discrete \
--sqlite-create --sqlite-update \
@@ -1160,9 +1211,6 @@ tangle_maker:
(org-babel-tangle) \
(kill-buffer)) '($$ORGFILES)))" 2>&1
-lorri_shell:
- lorri shell
-
# nix-shell
nix-shell:
nix-shell -I .envrc
@@ -1172,7 +1220,7 @@ nix-shell-pure:
# nix-shell (with local tools, presumably latest dlang compiler & build tools (ldc & dub))
nix-shell-updated:
- nix-shell -I nixpkgs=/nix/nixpkgs --pure
+ nix-shell -I nixpkgs=/srv/nix/nixpkgs --pure
# shell.nix (with shebang)
shell:
@@ -1214,7 +1262,7 @@ _flake-show-derivation:
nix show-derivation |jq;
nix-develop:
- nix develop -f default.nix -I nixpkgs=/nix/nixpkgs
+ nix develop -f default.nix -I nixpkgs=/srv/nix/nixpkgs
# nix flake show
flake-show: _flake-show-package _flake-show-name _flake-show-derivation
@@ -1227,13 +1275,9 @@ flake-build: _flake-show-name
flake-reset-build: _flake-lock-reset _flake-show-name
nix build --print-build-logs
-# nix-build flake spine debug
-flake-build-debug:
- nix build --debug
-
# nix-build spine (with local tools, presumably latest dlang compiler & build tools (ldc & dub))
flake-build-use-tools-new:
- nix build --print-build-logs -I nixpkgs=/nix/nixpkgs
+ nix build --print-build-logs -I nixpkgs=/srv/nix/nixpkgs
# tangle-build-flake
flake-tangle-build: org-tangle flake-build
@@ -1253,6 +1297,10 @@ flake-build-search:
gitsnapshot: distclean tangle
git commit -a
-.PHONY : all build rebuild debug release \
+version_tag:
+ echo "DRV=0.12.0; git tag -f doc-reform_v$$\{DRV} -m\"doc-reform spine-$$\{DRV}\" HEAD"; \
+ echo "git tag -f doc-reform_v0.12.0 -m\"doc-reform spine-0.12.0\" HEAD"
+
+.PHONY : all build rebuild release \
distclean init \
tangle gitsnapshot