aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorRalph Amissah <ralph.amissah@gmail.com>2022-11-25 20:50:40 -0500
committerRalph Amissah <ralph.amissah@gmail.com>2022-12-23 18:15:52 -0500
commit4c089543a4ac61ac21dab814c0dc114d48f42c36 (patch)
tree0b1da4c4c7c3d73c40dbef2fdfc604686d72dfe6
parentepub header assertion removed, check (diff)
0.12.0
-rw-r--r--.env/echo-nixNote239
-rw-r--r--.env/local_31
-rw-r--r--.gitattributes1
-rw-r--r--.gitignore26
-rw-r--r--derivation.nix2
-rw-r--r--dub.json2
-rw-r--r--dub_describe.json48
-rw-r--r--flake.nix20
-rw-r--r--makefile8
-rw-r--r--meson.build2
-rw-r--r--org/cgi_spine_search.org2
-rw-r--r--org/config_d_cfte.org2
-rw-r--r--org/config_dub.org2
-rw-r--r--org/config_make.org359
-rw-r--r--org/config_meson.org2
-rw-r--r--org/config_nix.org2
-rwxr-xr-xshell.nix49
-rw-r--r--views/version.txt2
18 files changed, 107 insertions, 692 deletions
diff --git a/.env/echo-nixNote b/.env/echo-nixNote
deleted file mode 100644
index ad8717f..0000000
--- a/.env/echo-nixNote
+++ /dev/null
@@ -1,239 +0,0 @@
-echo '-*- mode: org -*-
-
-* nixpkgs path?
-
- # eval "$(nix print-dev-env)"
-' > nixNote_.org
-
-echo " <nixpkgs> == `nix-instantiate --find-file nixpkgs`" >> nixNote_.org
-
-echo '
-* nix build and show derivation
-
-#+BEGIN_SRC sh
-nix-shell --pure
-
-nix-build
-nix build -f default.nix --print-build-logs
-nix shell -f default.nix --print-build-logs
-nix develop --build -f derivation.nix -I .envrc --print-build-logs
-
-nix-instantiate | nix-build
-
-nix-instantiate -I .envrc | nix-build -I .envrc
-nix build `nix-instantiate`
-nix build `nix-instantiate -I .envrc`
-
-nix develop
-
-nix-instantiate | nix show-derivation | jq
-nix-instantiate -I .envrc | nix show-derivation -f derivation.nix -I .envrc | jq
-
-nix-instantiate | nix show-derivation --recursive | jq
-nix-instantiate -I .envrc | nix show-derivation -f derivation.nix --recursive -I .envrc | jq
-
-nix search --json 2>/dev/null |jq
-#+END_SRC
-
-* version and build info
-
-#+BEGIN_SRC sh' >> nixNote_.org
-
-echo 'spine version (git) == $SpineVER' >> nixNote_.org
-echo "spine version (git) == $SpineVER" >> nixNote_.org
-echo 'nix-instantiate == `nix-instantiate`' >> nixNote_.org
-echo "nix-instantiate == `nix-instantiate`" >> nixNote_.org
-
-echo "#+END_SRC
-
-* initialised shell variables
-
-#+BEGIN_SRC sh
-SpineSRC=$SpineSRC
-SpineDOC=$SpineDOC
-SpinePOD=$SpinePOD
-SpineOUTversioned=$SpineOUTversioned
-SpineOUT=$SpineOUT
-#+END_SRC
-" >> nixNote_.org
-
-echo '* spine run instruction examples
-** parallelized tasks
-*** doc source
-
-#+BEGIN_SRC sh
-$SpineBIN/spine --very-verbose --pod --source --output="$SpineOUTversioned" $SpinePOD/*
-#+END_SRC
-
-*** html & epub output
-
-#+BEGIN_SRC sh
-$SpineBIN/spine --very-verbose --html --epub --output="$SpineOUTversioned" $SpinePOD/*
-#+END_SRC
-
-*** sqlite db for each document - populate each db
-
-#+BEGIN_SRC sh
-$SpineBIN/spine --very-verbose --sqlite-discrete --output="$SpineOUTversioned" $SpinePOD/*
-#+END_SRC
-
-*** doc source; html, epub; sqlite outputs
-
-#+BEGIN_SRC sh
-$SpineBIN/spine --verbose --pod --html --epub --sqlite-discrete --output="$SpineOUTversioned" $SpinePOD/*
-#+END_SRC
-
-*** curate (authors topics)
-
-#+BEGIN_SRC sh
-$SpineBIN/spine --very-verbose --curate --output="$SpineOUTversioned" $SpinePOD/*
-#+END_SRC
-
-*** html, curate
-
-#+BEGIN_SRC sh
-$SpineBIN/spine --verbose --dark --html --html-link-curate --curate --output="$SpineOUTversioned" $SpinePOD/*
-$SpineBIN/spine --very-verbose --html --html-link-curate --curate --output="$SpineOUTversioned" $SpinePOD/*
-#+END_SRC
-
-*** composite command: source pod, html, epub, curate, sqlite
-
-#+BEGIN_SRC sh
-$SpineBIN/spine --verbose --dark --pod --epub --html --html-link-curate --curate --sqlite-discrete --output="$SpineOUTversioned" $SpinePOD/*
-#+END_SRC
-
-** sequential tasks
-*** sqlite db (shared) - create db
-
-#+BEGIN_SRC sh
-$SpineBIN/spine --very-verbose --sqlite-db-create --output="$SpineOUTversioned"
-#+END_SRC
-
-*** sqlite db (shared) - populate db
-
-#+BEGIN_SRC sh
-$SpineBIN/spine --very-verbose --sqlite-update --output="$SpineOUTversioned" $SpineDOC/spine-markup-samples/markup/pod/*
-#+END_SRC
-
-*** sqlite db (shared) - drop db
-
-#+BEGIN_SRC sh
-$SpineBIN/spine --very-verbose --sqlite-db-drop --output="$SpineOUTversioned"
-#+END_SRC
-
-*** sqlite db (shared) - create & populate db (single step)
-
-#+BEGIN_SRC sh
-$SpineBIN/spine --very-verbose --sqlite-db-create --sqlite-update --output="$SpineOUTversioned" $SpinePOD/*
-#+END_SRC
-
-*** composite command: source pod, html, epub, curate, sqlite
-
-#+BEGIN_SRC sh
-$SpineBIN/spine --verbose --no-parallel --dark --pod --epub --html --html-link-curate --curate --sqlite-discrete --output="$SpineOUTversioned" $SpinePOD/*
-#+END_SRC
-
-** config [./pod/].dr/config_local_site
-
-#+BEGIN_SRC sh
-cat $SpinePOD/.dr/config_local_site
-$SpineBIN/spine --show-config $SpinePOD
-$SpineBIN/spine --show-config --output="$SpineOUTversioned" $SpinePOD
-#+END_SRC
-
-** cgi operations (output to $SpineOUT /var/www)
-
-#+BEGIN_SRC sh
-$SpineBIN/spine --very-verbose --sqlite-db-create --output="$SpineOUT" $SpinePOD/*
-
-$SpineBIN/spine -v --cgi-search-form-codegen --output=$SpineOUT $SpinePOD/*
-
-$SpineBIN/spine -v --show-config --config=$SpinePOD/.dr
-
-$SpineBIN/spine --html $SpinePOD/*
-
-
-$SpineBIN/spine -v --cgi-search-form-codegen --config=$SpinePOD/.dr/config_local_site
-#+END_SRC
-
-*** generate html linked to search form
-
-#+BEGIN_SRC sh
-$SpineBIN/spine -v --html --html-link-search --html-link-curate --curate --output=$SpineOUT $SpinePOD/*
-#+END_SRC
-
-*** create or re-create sql db (--sqlite-db-create or --sqlite-db-recreate)
-
-#+BEGIN_SRC sh
-$SpineBIN/spine -v --sqlite-db-create --sqlite-db-filename="spine.search.db" --sqlite-db-path="$SpineDBpath"
-$SpineBIN/spine -v --sqlite-db-recreate --sqlite-db-filename="spine.search.db" --sqlite-db-path="$SpineDBpath"
-#+END_SRC
-
-*** populate sqlite db
-
-#+BEGIN_SRC sh
-$SpineBIN/spine -v --sqlite-update --sqlite-db-filename="spine.search.db" --output=$SpineOUT $SpinePOD/*
-#+END_SRC
-
-*** generate html (linked to search form), sql output, curate COMPOSITE
-
-#+BEGIN_SRC sh
-$SpineBIN/spine -v --html --html-link-search --html-link-curate --curate --sqlite-update --sqlite-db-filename="spine.search.db" --cgi-sqlite-search-filename="spine_search" --sqlite-db-path="$SpineDBpath" --output="$SpineOUT" $SpinePOD/*
-$SpineBIN/spine --epub --html --html-link-search --html-link-curate --curate --sqlite-update --sqlite-db-filename="spine.search.db" --cgi-sqlite-search-filename="spine_search" --cgi-url-action="https://sisudoc.org/spine_search" --ouput="$SpineOUT" $SpinePOD/*
-#+END_SRC
-
-*** generate html (linked to search form), sql output, curate COMPOSITE with resource configuration
-
-if names and paths are configured in resource configuration file, e.g. $SpinePOD/.rc/config_local_site
-
-#+BEGIN_SRC sh
-$SpineBIN/spine -v --html --html-link-search --html-link-curate --curate --sqlite-update $SpinePOD/*
-#+END_SRC
-
-#+BEGIN_SRC yaml
-# sample resource configuration file ( $SpinePOD/.rc/config_local_site )
-output:
- path: "/srv/www/spine"
-default:
- language: "en"
- papersize: "a4"
- text_wrap: "80"
- digest: "sha256"
-webserv:
- http: "http"
- domain: "localhost"
- data_http: "http"
- data_domain: "localhost"
- data_root_url: "https://sisudoc.org"
- data_root_path: "/srv/www/spine"
- images_root_part: "image"
- cgi_search_form_title: "≅ SiSU Spine search"
- cgi_http: "https"
- cgi_domain: "sisudoc.org"
- cgi_bin_url: "http://sisudoc.org/cgi-bin"
- cgi_bin_part: "cgi-bin"
- cgi_bin_path: "/var/www/cgi/cgi-bin"
- cgi_search_script: "spine_search"
- cgi_action: "https://sisudoc.org/spine_search"
- db_sqlite_filename: "spine.search.db"
- db_sqlite_path: "/var/www/sqlite"
-#+END_SRC
-
-*** make search form
-
-#+BEGIN_SRC sh
-$SpineBIN/spine -v --cgi-search-form-codegen --config=$SpinePOD/.dr/config_local_site
-#+END_SRC
-
-*** latex
-
-#+BEGIN_SRC sh
-$SpineBIN/spine --latex --serial --output="$SpineOUT" $SpinePOD/*
-ls $SpineOutstatic/latex/*.tex
-#+END_SRC
-' >> nixNote_.org
-
-#cat nixNote_.org
-
-#echo "emacs nixNote_.org"
-#echo "cat nixNote_.org"
diff --git a/.env/local_ b/.env/local_
deleted file mode 100644
index 10216c8..0000000
--- a/.env/local_
+++ /dev/null
@@ -1,31 +0,0 @@
-echo ".envrc called .env/local"
-export NIX_PATH=/nix/var/nix/profiles/per-user/root/channels/nixos
-#export NIX_PATH=/nixpkgs-ra/nixpkgs
-export DFLAGS="-O2 -inline"
-# reload when these files change
-# watch_file flake.nix
-# watch_file flake.lock
-## load the flake devShell
-# eval "$(nix print-dev-env)"
-# echo $NIX_BUILD_TOP
-export Date=`date "+%Y%m%d"`
-export SpineVER=$(git describe --long --tags | sed 's/^[ a-z_-]\+\([0-9.]\+\)/\1/;s/\([^-]*-g\)/r\1/;s/-/./g')
-export SpinePROJ=/grotto-ra/repo/git.repo/projects/project-spine/doc-reform
-export SpineSRC=/grotto-ra/repo/git.repo/projects/project-spine/doc-reform/src
-export SpineBIN=/grotto-ra/repo/git.repo/projects/project-spine/doc-reform/result/bin
-export SpineDOC=/grotto-ra/repo/git.repo/projects/project-spine/doc-reform-markup/spine-markup-samples
-export SpinePOD=$SpineDOC/markup/pod
-export SpineOUTversioned=/srv/www/spine/$SpineVER
-export SpineOUT=/srv/www/spine
-export SpineDBpath=/var/www/sqlite
-export SpineSearchActionLocal='http://localhost/spine_search'
-export SpineSearchActionRemote='https://sisudoc.org/spine_search'
-export SpineCGIform='spine_search'
-export SpineSQLdb='spine.search.db'
-export PROG_VER_GIT="`git describe --long --tags | sed -e 's/^[ a-z_-]\+\([0-9.]\+\)/\1/;s/\([^-]*-g\)/r\1/;s/-/./g'`"
-export PROG_VER_DECLARED="`cat ./views/version.txt | grep --color=never "enum" | sed 's/.\+(\([0-9]\+\),[ \t]\+\([0-9]\+\),[ \t]\+\([0-9]\+\)[ \t]*).\+/\1.\2.\3/g'`"
-direnv allow
-
-if [ -e .env/echo-nixNote ]; then
- source .env/echo-nixNote
-fi
diff --git a/.gitattributes b/.gitattributes
index cdecd11..db88acf 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,5 +1,6 @@
/org export-ignore
/subprojects export-ignore
+/build export-ignore
.gitattributes export-ignore
tangle export-ignore
flake.lock export-ignore
diff --git a/.gitignore b/.gitignore
index 60abc99..2e5e62e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,8 +1,17 @@
# git ls-files --others --exclude-from=.git/info/exclude
+# git check-ignore -v flake.lock
# git clean -ix
+# find . -name "*_" | xargs rm -rf
+# find . -name "*.o" | xargs rm -rf
*
!.gitignore
!.gitattributes
+!*.nix
+!nix
+!nix/**
+!*.nix
+!flake.lock
+!.envrc
!README.md
!README
!COPYRIGHT
@@ -15,6 +24,8 @@
!meson.build
!tangle
!*.org
+!org
+!org/*.org
!*.d
!*.rb
!*.txt
@@ -23,15 +34,6 @@
!doc/**
!man
!man/**
-!org
-!sundry
-!sundry/**
-!*.nix
-!nix
-!nix/**
-!flake.lock
-!.envrc
-!.envrc-local_
!.dr
!.dr/*
!src
@@ -48,6 +50,7 @@
!**/*.ssm
!subprojects
!subprojects/*.wrap
+!**/*.lib
#!subprojects/*.meson.build
#!subprojects/**
!pod.manifest
@@ -58,7 +61,6 @@
!docs/*.html
!notes
notes/**
-!notes/*.org
!notes/sisu-description.sst
!notes/reminders
!notes/reminders/**
@@ -75,9 +77,7 @@ tmp/**
*~
\#*
*.\#*
-!.env
-!.env/local_
-!.env/echo-nixNote
+!.envrc-local_
#!*/
#\#*
#*.\#*
diff --git a/derivation.nix b/derivation.nix
index 04a3305..4f1c1c4 100644
--- a/derivation.nix
+++ b/derivation.nix
@@ -78,7 +78,7 @@ with (
);
mkDubDerivation rec {
pname = "spine";
- version = "0.11.3";
+ version = "0.12.0";
src = ./.;
nativeBuildInputs = with pkgs; [ dub ldc ];
buildInputs = with pkgs; [ nixVersions.unstable sqlite ];
diff --git a/dub.json b/dub.json
index ff14326..ffe3e0d 100644
--- a/dub.json
+++ b/dub.json
@@ -4,7 +4,7 @@
],
"copyright": "Copyright © 2015 - 2022 Ralph Amissah",
"name": "spine",
- "version": "0.11.3",
+ "version": "0.12.0",
"description": "a sisu like document parser",
"homepage": "https://sisudoc.org",
"license": "AGPL-3.0+",
diff --git a/dub_describe.json b/dub_describe.json
index 082e32d..97e9f4a 100644
--- a/dub_describe.json
+++ b/dub_describe.json
@@ -1,7 +1,7 @@
{
"rootPackage": "spine",
"configuration": "default",
- "buildType": "debug",
+ "buildType": "$DFLAGS",
"compiler": "ldc",
"architecture": [
"x86_64"
@@ -14,7 +14,7 @@
{
"path": "./",
"name": "spine",
- "version": "0.11.3",
+ "version": "0.12.0",
"description": "a sisu like document parser",
"homepage": "https://sisudoc.org",
"authors": [
@@ -325,6 +325,10 @@
},
{
"role": "import_",
+ "path": "src/ext_depends/D-YAML/source/dyaml/stdsumtype.d"
+ },
+ {
+ "role": "import_",
"path": "src/ext_depends/D-YAML/source/dyaml/style.d"
},
{
@@ -452,7 +456,7 @@
{
"path": "./",
"name": "spine:d2sqlite3",
- "version": "0.11.3",
+ "version": "0.12.0",
"description": "A thin wrapper around SQLite 3",
"homepage": "https://github.com/dlang-community/d2sqlite3",
"authors": [
@@ -543,7 +547,7 @@
{
"path": "./",
"name": "spine:dyaml",
- "version": "0.11.3",
+ "version": "0.12.0",
"description": "YAML parser and emitter",
"homepage": "https://github.com/dlang-community/D-YAML",
"authors": [
@@ -665,6 +669,10 @@
},
{
"role": "source",
+ "path": "src/ext_depends/D-YAML/source/dyaml/stdsumtype.d"
+ },
+ {
+ "role": "source",
"path": "src/ext_depends/D-YAML/source/dyaml/style.d"
},
{
@@ -732,7 +740,7 @@
{
"path": "./",
"name": "spine:imageformats",
- "version": "0.11.3",
+ "version": "0.12.0",
"description": "Decoders for PNG, TGA, BMP, JPEG and encoders for PNG, TGA, BMP.",
"homepage": "",
"authors": [
@@ -815,7 +823,12 @@
"targetName": "spine",
"workingDirectory": "",
"mainSourceFile": "",
- "dflags": [],
+ "dflags": [
+ "-O2",
+ "-inline",
+ "-boundscheck=on",
+ "-color=on"
+ ],
"lflags": [],
"libs": [
"sqlite3"
@@ -907,6 +920,7 @@
"./src/ext_depends/D-YAML/source/dyaml/resolver.d",
"./src/ext_depends/D-YAML/source/dyaml/scanner.d",
"./src/ext_depends/D-YAML/source/dyaml/serializer.d",
+ "./src/ext_depends/D-YAML/source/dyaml/stdsumtype.d",
"./src/ext_depends/D-YAML/source/dyaml/style.d",
"./src/ext_depends/D-YAML/source/dyaml/tagdirective.d",
"./src/ext_depends/D-YAML/source/dyaml/test/common.d",
@@ -972,7 +986,12 @@
"targetName": "spine_d2sqlite3",
"workingDirectory": "",
"mainSourceFile": "",
- "dflags": [],
+ "dflags": [
+ "-O2",
+ "-inline",
+ "-boundscheck=on",
+ "-color=on"
+ ],
"lflags": [],
"libs": [
"sqlite3"
@@ -1032,7 +1051,12 @@
"targetName": "spine_dyaml",
"workingDirectory": "",
"mainSourceFile": "",
- "dflags": [],
+ "dflags": [
+ "-O2",
+ "-inline",
+ "-boundscheck=on",
+ "-color=on"
+ ],
"lflags": [],
"libs": [],
"linkerFiles": [],
@@ -1056,6 +1080,7 @@
"./src/ext_depends/D-YAML/source/dyaml/resolver.d",
"./src/ext_depends/D-YAML/source/dyaml/scanner.d",
"./src/ext_depends/D-YAML/source/dyaml/serializer.d",
+ "./src/ext_depends/D-YAML/source/dyaml/stdsumtype.d",
"./src/ext_depends/D-YAML/source/dyaml/style.d",
"./src/ext_depends/D-YAML/source/dyaml/tagdirective.d",
"./src/ext_depends/D-YAML/source/dyaml/test/common.d",
@@ -1118,7 +1143,12 @@
"targetName": "spine_imageformats",
"workingDirectory": "",
"mainSourceFile": "",
- "dflags": [],
+ "dflags": [
+ "-O2",
+ "-inline",
+ "-boundscheck=on",
+ "-color=on"
+ ],
"lflags": [],
"libs": [],
"linkerFiles": [],
diff --git a/flake.nix b/flake.nix
index 5bb4716..c188d21 100644
--- a/flake.nix
+++ b/flake.nix
@@ -1,10 +1,8 @@
{
- description = "A sisu like parser and document generator";
- inputs = {
- flake-utils.url = "github:numtide/flake-utils";
- nixpkgs.url = "github:nixos/nixpkgs";
- #nixpkgs.url = "/nixpkgs-ra/nixpkgs";
- };
+ description = "a sisu like parser and document generator";
+ inputs.flake-utils.url = "github:numtide/flake-utils";
+ inputs.nixpkgs.url = "github:nixos/nixpkgs";
+ #inputs.nixpkgs.url = "/nixpkgs-ra/nixpkgs";
outputs = { self, nixpkgs, flake-utils }: {
packages.x86_64-linux.spine =
let
@@ -14,8 +12,8 @@
#targetOf = package: "${package.targetPath or "."}/${package.targetName or package.name}";
in pkgs.stdenv.mkDerivation {
pname = "spine";
- version = "0.11.3";
- description = "A sisu like parser and document generator";
+ version = "0.12.0";
+ description = "a sisu like parser and document generator";
inherit self;
src = self;
shell = ./shell.nix;
@@ -26,9 +24,7 @@
for DC_ in dmd ldmd2 gdmd; do
echo "- check for D compiler $DC_"
DC=$(type -P $DC_ || echo "")
- if [ ! "$DC" == "" ]; then
- break
- fi
+ if [ ! "$DC" == "" ]; then break; fi
done
if [ "$DC" == "" ]; then
exit "Error: could not find D compiler"
@@ -51,6 +47,8 @@
runHook postInstall
'';
postInstall = ''
+ echo `ls -la $out/bin/spine`
+ echo ""
echo "nix build or nix develop? (suggestions):"
echo '- nix build'
echo ' nix build .#spine --print-build-logs'
diff --git a/makefile b/makefile
index aec02fd..770cc7e 100644
--- a/makefile
+++ b/makefile
@@ -389,8 +389,8 @@ markup-file-samples:
# find data/sisudir/media/text -name *.ss[tm] | sort
# version_tag:
-# echo "DRV=0.11.3; git tag -f doc-reform_v$$\{DRV} -m\"doc-reform $$\{DRV}\" HEAD" && \
-# echo "git tag -f doc-reform_v0.11.3 -m\"doc-reform spine-0.11.3\" HEAD"
+# 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"
# archive spine output (www)
spineWWWarchive:
@@ -454,8 +454,8 @@ depends_set: depends_get
# find data/sisudir/media/text -name *.ss[tm] | sort
#
version_tag:
- echo "DRV=0.11.3; git tag -f doc-reform_v$$\{DRV} -m\"doc-reform $$\{DRV}\" HEAD" && \
- echo "git tag -f doc-reform_v0.11.3 -m\"doc-reform spine-0.11.3\" HEAD"
+ 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_
diff --git a/meson.build b/meson.build
index 67ccfe5..563f636 100644
--- a/meson.build
+++ b/meson.build
@@ -1,6 +1,6 @@
project('spine', 'd',
license: 'AGPL-3',
- version: '0.11.3',
+ version: '0.12.0',
meson_version: '>=0.46'
)
#if meson.get_compiler('d').get_id() == 'gcc'
diff --git a/org/cgi_spine_search.org b/org/cgi_spine_search.org
index 13aea47..d71445c 100644
--- a/org/cgi_spine_search.org
+++ b/org/cgi_spine_search.org
@@ -41,7 +41,7 @@ struct Version {
#+NAME: spine_version_set
#+BEGIN_SRC d
-enum _ver = Version(0, 11, 3);
+enum _ver = Version(0, 12, 0);
#+END_SRC
** compilation restrictions (supported compilers)
diff --git a/org/config_d_cfte.org b/org/config_d_cfte.org
index dbbf6d8..bb8695c 100644
--- a/org/config_d_cfte.org
+++ b/org/config_d_cfte.org
@@ -27,7 +27,7 @@
#+NAME: spine_version_set
#+BEGIN_SRC d
-0, 11, 3
+0, 12, 0
#+END_SRC
*** set program version tangle :version:
diff --git a/org/config_dub.org b/org/config_dub.org
index d5994c0..839adf9 100644
--- a/org/config_dub.org
+++ b/org/config_dub.org
@@ -21,7 +21,7 @@
#+NAME: spine_version_set
#+BEGIN_SRC sh
-0.11.3
+0.12.0
#+END_SRC
** dub
diff --git a/org/config_make.org b/org/config_make.org
index 9f4b00b..8214e4e 100644
--- a/org/config_make.org
+++ b/org/config_make.org
@@ -22,7 +22,7 @@
#+NAME: spine_version_set
#+BEGIN_SRC sh
-0.11.3
+0.12.0
#+END_SRC
*** build tools if specified
@@ -611,8 +611,8 @@ markup-file-samples:
#+NAME: make_cmd_dev_misc
#+BEGIN_SRC makefile
# version_tag:
-# echo "DRV=0.11.3; git tag -f doc-reform_v$$\{DRV} -m\"doc-reform $$\{DRV}\" HEAD" && \
-# echo "git tag -f doc-reform_v0.11.3 -m\"doc-reform spine-0.11.3\" HEAD"
+# 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"
# archive spine output (www)
spineWWWarchive:
@@ -1842,359 +1842,6 @@ export NIX_PATH=/nix/var/nix/profiles/per-user/root/channels/nixos
- /srv/www/spine/latex
-** make
-
-#+HEADER: :tangle /srv/www/spine/latex/makefile
-#+BEGIN_SRC makefile
-# nix build
-#build:
-# nix-build
-
-# clean, deletes latex processing workfiles
-clean:
- for ext in "aux" "log" "toc"; do \
- rm *.$ext; \
- done;
-
-# rm *.aux;
-# rm *.log;
-# rm *.toc;
-
-# clean, deletes latex processing workfiles for landscape documents
-clean-landscape:
- for ext in "aux" "log" "toc"; do \
- rm *.landscape.$ext; \
- done;
-
-# clean, deletes latex processing workfiles for portrait documents
-clean-portrait:
- for ext in "aux" "log" "toc"; do \
- rm *.portrait.$ext; \
- done;
-
-# clean, deletes latex processing workfiles for a4 documents
-clean-size papersize:
- for ext in "aux" "log" "toc"; do \
- rm *.{{papersize}}.portrait.$ext; \
- done; \
- echo "removed latex {{papersize}} workfiles";
-
-# wipe clean, deletes latex processing workfiles & pdfs
-wipe: clean
- rm *.pdf;
-
-# wipe clean, deletes latex processing workfiles & pdfs for landscape documents
-wipe-landscape: clean-landscape
- rm *.landscape.pdf;
-
-# wipe clean, deletes latex processing workfiles & pdfs for portrait documents
-wipe-portrait: clean-portrait
- rm *.portrait.pdf;
-
-# wipe clean, deletes latex processing workfiles & pdfs for a4 documents
-wipe-size papersize: (clean-size papersize)
- rm *.{{papersize}}.*.pdf; \
- echo "removed {{papersize}} pdfs";
-
-# xelatex pdf output
-latex: wipe portrait landscape
-
-# xelatex pdf portrait output
-portrait:
- for file in `ls *.portrait.tex`; do \
- for n in 1 2 3; do \
- xelatex -interaction=nonstopmode $file; \
- done; \
- done; \
- echo "portrait pdfs complete";
-
-# xelatex pdf landscape output
-landscape:
- for file in `ls *.landscape.tex`; do \
- for n in 1 2 3; do \
- xelatex -interaction=nonstopmode $file; \
- done; \
- done; \
- echo "landscape pdfs complete";
-
-# xelatex pdf output
-pdf: wipe
- for file in `ls *.tex`; do \
- for n in 1 2 3; do \
- xelatex -interaction=nonstopmode $file; \
- done; \
- done; \
- echo "pdfs complete";
-
-# xelatex pdf a4 output of papersize given, provide papersize
-pdf-size papersize: (pdf-portrait papersize) (pdf-landscape papersize)
- echo "{{papersize}} pdfs complete";
-
-# xelatex pdf portrait output of papersize given, provide papersize
-pdf-portrait papersize:
- echo "{{papersize}} portrait ->"; \
- for file in `ls *.{{papersize}}.portrait.tex`; do \
- echo $file; \
- for n in 1 2 3; do \
- xelatex -interaction=nonstopmode $file; \
- done; \
- done; \
- echo "{{papersize}} portrait pdfs complete";
-
-# xelatex pdf landscape output of papersize given, provide papersize
-pdf-landscape papersize:
- echo "{{papersize}}landscape ->"; \
- for file in `ls *.{{papersize}}.landscape.tex`; do \
- echo $file; \
- for n in 1 2 3; do \
- xelatex -interaction=nonstopmode $file; \
- done; \
- done; \
- echo "{{papersize}} landscape pdfs complete";
-#+END_SRC
-
-** README
-
-#+HEADER: :tangle /srv/www/spine/latex/README
-#+BEGIN_SRC sh
--*- mode: org -*-
-things nix to be placed in $SpineOUT/latex
-
-cp -vi nix.org $SpineOUT/latex/.
-
-$SpineBIN/spine --verbose --latex --output="$SpineOUT" $SpinePOD/*
-$SpineBIN/spine --verbose --latex --set-papersize="a4,letter.portrait,b4.portrait" --output="$SpineOUT" $SpinePOD/*
-#+END_SRC
-
-** shell.nix
-*** shell hook
-**** shell hook
-
-#+NAME: shell_hook_
-#+HEADER: :noweb yes
-#+BEGIN_SRC sh
-if [[ -e ".envrc" ]]; then
- source .envrc
-fi
-eval "$(starship init bash)"
-for texfile in <<tex_files>>; do
- for run in {1..<<repeat_run>>}; do
- xelatex -interaction=nonstopmode $texfile
- done
-done
-rm *.{aux,log,out,toc}
-ls *.tex; ls *.pdf;
-#+END_SRC
-
-#+NAME: shell_hook
-#+BEGIN_SRC sh
-if [[ -e ".envrc" ]]; then
- source .envrc
-fi
-eval "$(starship init bash)"
-for size in <<paper_sizes>>; do
- for orient in <<paper_orientations>>; do
- for texfile in *.$size.$orient.tex; do
- for run in {1..<<repeat_run>>}; do
- xelatex -interaction=nonstopmode $texfile
- done
- done
- done
-done
-rm *.{aux,log,out,toc}
-ls *.tex; ls *.pdf;
-#+END_SRC
-
-**** shell hook variables
-***** tex files
-
-#+NAME: tex_files
-#+BEGIN_SRC sh
-{sisu_markup,the_wealth_of_networks.yochai_benkler,two_bits.christopher_kelty,viral_spiral.david_bollier}.en.*.tex
-#+END_SRC
-
-***** paper sizes
-
-#+NAME: paper_sizes
-#+BEGIN_SRC sh
-"a4" "b4" "letter"
-#+END_SRC
-
-***** paper orientations
-
-#+NAME: paper_orientations
-#+BEGIN_SRC sh
-"portrait"
-#+END_SRC
-
-***** repeat xeletex run
-
-#+NAME: repeat_run
-#+BEGIN_SRC sh
-3
-#+END_SRC
-
-***** env paths init
-
-#+NAME: spine_proj
-#+BEGIN_SRC sh
-~/grotto/repo/git.repo/projects/project-spine/doc-reform
-#+END_SRC
-
-#+NAME: spine_src
-#+BEGIN_SRC sh
-~/grotto/repo/git.repo/projects/project-spine/doc-reform/src
-#+END_SRC
-
-#+NAME: spine_bin
-#+BEGIN_SRC sh
-~/grotto/repo/git.repo/projects/project-spine/doc-reform/result/bin
-#+END_SRC
-
-#+NAME: spine_doc
-#+BEGIN_SRC sh
-~/grotto/repo/git.repo/projects/project-spine/doc-reform-markup/spine-markup-samples
-#+END_SRC
-
-#+NAME: spine_pod
-#+BEGIN_SRC sh
-$SpineDOC/markup/pod
-#+END_SRC
-
-#+NAME: spine_out
-#+BEGIN_SRC sh
-/srv/www/spine
-#+END_SRC
-
-*** shell.nix
-
-#+HEADER: :tangle /srv/www/spine/latex/shell.nix
-#+HEADER: :noweb yes
-#+BEGIN_SRC nix
-#!/usr/bin/env -S nix-shell --pure
-{ pkgs ? import <nixpkgs> {} }:
-with pkgs;
-mkShell {
- buildInputs = [
- <<package_list_latex>>
- ];
- shellHook = ''
- # <<shell_hook>>
- '';
-}
-#+END_SRC
-
-*** packages.nix
-
-#+NAME: package_list_latex
-#+BEGIN_SRC nix
-### nix_related
-nixFlakes
-nix-prefetch-git
-validatePkgConfig
-jq
-git
-### d_build_related
-## package manager
-dub
-## compiler
-ldc
-rund
-# ### pdf_latex_related
-source-sans-pro
-source-serif-pro
-source-code-pro
-texlive.combined.scheme-full
-# texlive.combined.scheme-tetex
-evince
-zathura
-apvlv
-### candy
-starship
-#+END_SRC
-
-*** packages.nix
-
-#+NAME: package_list_inherit_latex
-#+BEGIN_SRC nix
-(import ./packages.nix { inherit pkgs; })
-#+END_SRC
-
-#+HEADER: :tangle /srv/www/spine/latex/packages.nix
-#+HEADER: :noweb yes
-#+BEGIN_SRC nix
-### nix_related
-{ pkgs ? import <nixpkgs> {} }:
-with pkgs; [
- <<package_list_latex>>
-]
-#+END_SRC
-
-** env
-*** .envrc
-
-#+HEADER: :tangle /srv/www/spine/latex/.envrc
-#+BEGIN_SRC sh
-NIX_ENFORCE_PURITY=0
-if ! has nix_direnv_version || ! nix_direnv_version 1.4.0; then
-# https://github.com/nix-community/nix-direnv
- source_url "https://raw.githubusercontent.com/nix-community/nix-direnv/1.4.0/direnvrc" "sha256-4XfVDjv75eHMWN4G725VW7BoOV4Vl3vAabK4YXIfPyE="
-fi
-if [ -e .env/local ]; then
- source_env_if_exists .env/local || source .env/local
-fi
-#+END_SRC
-
-*** .env/local
-
-#+HEADER: :tangle /srv/www/spine/latex/.env/local
-#+HEADER: :noweb yes
-#+BEGIN_SRC sh
-export NIX_PATH=/nix/var/nix/profiles/per-user/root/channels/nixos
-#export NIX_PATH=nixpkgs=/nixpkgs-ra/nixpkgs
-#export NIX_PATH=/nixpkgs-ra/nixpkgs
-# reload when these files change
-# watch_file flake.nix
-# watch_file flake.lock
-## load the flake devShell
-# eval "$(nix print-dev-env)"
-# echo $NIX_BUILD_TOP
-export PROJ="~/grotto/repo/git.repo/projects/project-spine"
-export SpinePROJ=<<spine_proj>>
-export SpineSRC=<<spine_src>>
-export SpineBIN=<<spine_bin>>
-export SpineDOC=<<spine_doc>>
-export SpinePOD=<<spine_pod>>
-export SpineOUT=<<spine_out>>
-#use nix
-if [ -e .env/echo-nixNote ]; then
- source .env/echo-nixNote
-fi
-#+END_SRC
-
-** git
-*** .gitignore
-
-#+HEADER: :tangle /srv/www/spine/latex/.gitignore
-#+BEGIN_SRC sh
-# git ls-files --others --exclude-from=.git/info/exclude
-,*
-!README
-!nix.org
-!shell.nix
-!packages.nix
-!.gitignore
-!.envrc
-!.env/
-!.env/local
-!sty/
-!sty/*.sty
-!sisu_markup.en.*.tex
-!two_bits.christopher_kelty.en.*.tex
-!the_wealth_of_networks.yochai_benkler.en.*.tex
-!viral_spiral.david_bollier.en.*.tex
-#+END_SRC
-
** notes
- vim {the_wealth_of_networks.yochai_benkler,two_bits.christopher_kelty,viral_spiral.david_bollier}.en.a4.portrait.tex
diff --git a/org/config_meson.org b/org/config_meson.org
index b09d945..373f22a 100644
--- a/org/config_meson.org
+++ b/org/config_meson.org
@@ -23,7 +23,7 @@
#+NAME: spine_version_set
#+BEGIN_SRC sh
-0.11.3
+0.12.0
#+END_SRC
*** subprojects
diff --git a/org/config_nix.org b/org/config_nix.org
index a62990f..8286b05 100644
--- a/org/config_nix.org
+++ b/org/config_nix.org
@@ -1611,7 +1611,7 @@ mkDubDerivation rec {
#+NAME: spine_version_set
#+BEGIN_SRC sh
-0.11.3
+0.12.0
#+END_SRC
*** set names SET
diff --git a/shell.nix b/shell.nix
index 6b84544..d745b40 100755
--- a/shell.nix
+++ b/shell.nix
@@ -61,26 +61,35 @@ mkShell {
echo "nix flake show:"
nix flake show
echo ""
- echo "nix build or nix develop? (suggestions):"
- echo '- nix build'
- echo ' nix build .#spine --print-build-logs'
- echo ' nix build --print-build-logs'
- echo '- nix run'
- echo ' nix run .#spine --print-build-logs'
- echo ' nix run default.nix --print-build-logs'
- echo '- nix shell'
- echo ' nix shell --print-build-logs --command spine -v'
- echo '- nix develop'
- echo ' nix develop --build .#spine --print-build-logs'
- echo ' nix develop --build -f derivation.nix -I .envrc --print-build-logs'
- echo ' nix develop ; eval "$buildPhase"'
- echo ""
- echo 'spine -v'
- echo "examine"
- echo ' nix-instantiate | nix show-derivation | jq'
- echo ' nix-build . --no-out-link | xargs -o nix-tree'
- echo ' nix-tree --derivation .#spine'
- echo ""
+ echo "
+ nix flake update
+ nix flake metadata
+ nix flake check
+ nix flake show
+
+ nix build or nix develop? (suggestions):
+
+ - nix build
+ nix build .#spine --print-build-logs
+ nix build --print-build-logs
+
+ - nix run
+ nix run .#spine --print-build-logs
+ nix run default.nix --print-build-logs
+ - nix shell
+ nix shell --print-build-logs --command spine -v
+ - nix develop
+ nix develop --build .#spine --print-build-logs
+ nix develop --build -f derivation.nix -I .envrc --print-build-logs
+ nix develop ; eval $buildPhase
+
+ spine -v
+
+ nix-instantiate | nix show-derivation | jq
+ nix-build . --no-out-link | xargs -o nix-tree
+ nix-tree --derivation .#spine
+
+ "
#echo "ldc `${pkgs.ldc}/bin/ldc2 -v`"
'';
}
diff --git a/views/version.txt b/views/version.txt
index 728ca0d..bbcb4f9 100644
--- a/views/version.txt
+++ b/views/version.txt
@@ -4,7 +4,7 @@ struct Version {
int minor;
int patch;
}
-enum _ver = Version(0, 11, 3);
+enum _ver = Version(0, 12, 0);
version (Posix) {
version (DigitalMars) {
} else version (LDC) {