diff options
| -rwxr-xr-x[-rw-r--r--] | .envrc | 1 | ||||
| -rwxr-xr-x[-rw-r--r--] | .envrc-git-init | 1 | ||||
| -rw-r--r-- | .envrc-local | 27 | ||||
| -rwxr-xr-x[-rw-r--r--] | .envrc-local_ | 1 | ||||
| -rwxr-xr-x[-rw-r--r--] | .envrc-nix | 3 | ||||
| -rw-r--r-- | .gitignore | 1 | ||||
| -rw-r--r-- | org/config_env.org | 24 | ||||
| -rw-r--r-- | org/config_git.org | 1 |
8 files changed, 19 insertions, 40 deletions
@@ -1,3 +1,4 @@ +# -*- mode: sh -*- if [ -f .envrc-git-init ]; then source_env_if_exists .envrc-git-init || source .envrc-git-init fi diff --git a/.envrc-git-init b/.envrc-git-init index ca74ec3..d78e46b 100644..100755 --- a/.envrc-git-init +++ b/.envrc-git-init @@ -1,3 +1,4 @@ +# -*- mode: sh -*- if [[ ! -d ./.git ]]; then git init git add . diff --git a/.envrc-local b/.envrc-local deleted file mode 100644 index f0f4c76..0000000 --- a/.envrc-local +++ /dev/null @@ -1,27 +0,0 @@ -export SpineBIN=./result/bin/spine -# ❯❯ nix builds spine binary: -#export SpineBIN=./result/bin/spine -# ❯❯ dub builds spine binary (name depends on build, check, not available here): -#export SpineBIN=./bin/spine -#export SpineBIN=./bin/spine-ldc -#export SpineBIN=./bin/spine-dmd -# ❯❯ location of source files: -export SpineDOC=. -# ❯❯ location of source files pod: -export SpinePOD=${SpineDOC}/markup/pod-samples/pod -# ❯❯ sisudoc-spine output processing path: -export SpineOUT=./OUTPUT_TEST_sisudocSpine -# ❯❯ sisudoc-spine output processing path (web server e.g.): -#export SpineOUT=/srv/www/spine -# ❯❯ path configured for cgi search form: -export SpineSearchActionLocal='http://localhost/spine_search' -export SpineSearchActionRemote='https://sisudoc.org/spine_search' -# ❯❯ cgi search form name: -export SpineCGIform='spine_search' -# ❯❯ search form db name: -export SpineSQLdb='spine.search.db' -# ❯❯ configuration cgi search form path: -export SpineCGIbin=/var/www/cgi/cgi-bin -# ❯❯ configuration db path: -export SpineDBpath=/var/www/sqlite -#export SpineDBpath=/srv/www/spine/sqlite diff --git a/.envrc-local_ b/.envrc-local_ index f0f4c76..87c73d1 100644..100755 --- a/.envrc-local_ +++ b/.envrc-local_ @@ -1,3 +1,4 @@ +# -*- mode: sh -*- export SpineBIN=./result/bin/spine # ❯❯ nix builds spine binary: #export SpineBIN=./result/bin/spine diff --git a/.envrc-nix b/.envrc-nix index c6cb790..dfd44a8 100644..100755 --- a/.envrc-nix +++ b/.envrc-nix @@ -1,3 +1,4 @@ +# -*- mode: nix -*- NIX_ENFORCE_PURITY=1 # - https://github.com/nix-community/nix-direnv NixDirEnvVersion="3.0.7" @@ -66,5 +67,5 @@ echo ' ❯❯ ${SpineBIN} -v --source --pod --latex --latex-init --epub --html --html-link-pdf --html-link-curate --html-link-markup --curate --output=${SpineOUT} ${SpinePOD}/* ❯❯ ${SpineBIN} -v --sqlite-db-create --sqlite-db-filename=${SpineSQLdb} --sqlite-db-path=./_tmp-db - ❯❯ ${SpineBIN} -v --sqlite-update --sqlite-db-filename=${SpineSQLdb} --sqlite-db-path=./_tmp-db ./markup/pod-samples/pod/* + ❯❯ ${SpineBIN} -v --sqlite-update --sqlite-db-filename=${SpineSQLdb} --sqlite-db-path=./_tmp-db ${SpinePOD}/* ' @@ -11,7 +11,6 @@ !flake.lock !nixDevEnv.sh !.envrc -!.envrc-local !.envrc-nix !.envrc-git-init !README.md diff --git a/org/config_env.org b/org/config_env.org index 4cec4a8..4f21142 100644 --- a/org/config_env.org +++ b/org/config_env.org @@ -33,6 +33,7 @@ fi #+NAME: envrc #+HEADER: :tangle ../.envrc +#+HEADER: :shebang "# -*- mode: sh -*-" #+BEGIN_SRC shell if [ -f .envrc-git-init ]; then source_env_if_exists .envrc-git-init || source .envrc-git-init @@ -55,6 +56,7 @@ fi - ${NixDirEnvVersion} #+HEADER: :tangle ../.envrc-nix +#+HEADER: :shebang "# -*- mode: nix -*-" #+BEGIN_SRC shell NIX_ENFORCE_PURITY=1 # - https://github.com/nix-community/nix-direnv @@ -124,7 +126,7 @@ echo ' ❯❯ ${SpineBIN} -v --source --pod --latex --latex-init --epub --html --html-link-pdf --html-link-curate --html-link-markup --curate --output=${SpineOUT} ${SpinePOD}/* ❯❯ ${SpineBIN} -v --sqlite-db-create --sqlite-db-filename=${SpineSQLdb} --sqlite-db-path=./_tmp-db - ❯❯ ${SpineBIN} -v --sqlite-update --sqlite-db-filename=${SpineSQLdb} --sqlite-db-path=./_tmp-db ./markup/pod-samples/pod/* + ❯❯ ${SpineBIN} -v --sqlite-update --sqlite-db-filename=${SpineSQLdb} --sqlite-db-path=./_tmp-db ${SpinePOD}/* ' #+END_SRC @@ -140,6 +142,7 @@ echo "• ** .envrc-git-init #+HEADER: :tangle ../.envrc-git-init +#+HEADER: :shebang "# -*- mode: sh -*-" #+HEADER: :noweb yes #+BEGIN_SRC shell if [[ ! -d ./.git ]]; then @@ -153,6 +156,7 @@ fi - bespoke modify appropriately and generate if needed #+HEADER: :tangle ../.envrc-local_ +#+HEADER: :shebang "# -*- mode: sh -*-" #+HEADER: :noweb yes #+BEGIN_SRC shell export SpineBIN=./result/bin/spine @@ -184,7 +188,7 @@ export SpineDBpath=/var/www/sqlite #export SpineDBpath=/srv/www/spine/sqlite #+END_SRC -* versions GET +* org includes - versions GET ** direnv #+NAME: direnv_version @@ -199,14 +203,6 @@ export SpineDBpath=/var/www/sqlite <<./nix-develop-dlang-shared.org:direnv-hash()>> #+END_SRC -** spine project VERSION :version:set:project: - -#+NAME: spine_version -#+HEADER: :noweb yes -#+BEGIN_SRC emacs-lisp -<<./sisudoc_spine_version_info_and_doc_header_including_copyright_and_license.org:spine_project_version()>> -#+END_SRC - ** dlang overlays - does not make sense to update versions here, unless you carry on careful @@ -246,4 +242,12 @@ export SpineDBpath=/var/www/sqlite <<./nix-develop-dlang-shared.org:dtools-version()>> #+END_SRC +** spine project VERSION :version:set:project: + +#+NAME: spine_version +#+HEADER: :noweb yes +#+BEGIN_SRC emacs-lisp +<<./sisudoc_spine_version_info_and_doc_header_including_copyright_and_license.org:spine_project_version()>> +#+END_SRC + * __END__ diff --git a/org/config_git.org b/org/config_git.org index b6eb3c7..a57f9d3 100644 --- a/org/config_git.org +++ b/org/config_git.org @@ -33,7 +33,6 @@ !flake.lock !nixDevEnv.sh !.envrc -!.envrc-local !.envrc-nix !.envrc-git-init !README.md |