diff options
| -rw-r--r-- | .envrc-nix | 4 | ||||
| -rw-r--r-- | README | 4 | ||||
| -rw-r--r-- | README.md | 4 | ||||
| -rw-r--r-- | doc/man/man1/spine.1 | 11 | ||||
| -rw-r--r-- | flake.lock | 6 | ||||
| -rw-r--r-- | flake.nix | 12 | ||||
| -rw-r--r-- | org/config_env.org | 2 | ||||
| -rw-r--r-- | org/spine_info.org | 4 |
8 files changed, 23 insertions, 24 deletions
@@ -26,7 +26,7 @@ echo ' • nix develop using nixpkgs ❯❯ nix develop ".#dsh-nixpkgs-dmd" --print-build-logs -c zsh ❯❯ nix develop ".#dsh-nixpkgs-ldc" --print-build-logs -c zsh - • nix develop using package overlays: (dmd-2.111.0, ldc-1.41.0, dub-1.39.0, dtools-2.110.0) + • nix develop using package overlays: (dmd-2.111.0, ldc-1.41.0, dub-1.40.0, dtools-2.110.0) ❯❯ nix develop ".#dsh-overlay-dmd" --print-build-logs -c zsh ❯❯ nix develop ".#dsh-overlay-ldc" --print-build-logs -c zsh ❯❯ nix flake show @@ -40,7 +40,7 @@ echo ' • nix build using nixpkgs ❯❯ nix build ".#spine-nixpkgs-dmd" --print-build-logs ❯❯ nix build ".#spine-nixpkgs-ldc" --print-build-logs - • nix build using package overlays: (dmd-2.111.0, ldc-1.41.0, dub-1.39.0, dtools-2.110.0) + • nix build using package overlays: (dmd-2.111.0, ldc-1.41.0, dub-1.40.0, dtools-2.110.0) ❯❯ nix build ".#spine-overlay-dmd" --print-build-logs ❯❯ nix build ".#spine-overlay-ldc" --print-build-logs @@ -260,6 +260,8 @@ for a document collection you can point to the document collection: *** generate a cgi search form +The CGI search form is built separately in the sisudoc-spine-search-cgi/ directory. + Steps: 1. Clone the sisudoc-spine-search-cgi repository 2. Configure views/configuration.txt with your web server settings @@ -304,7 +306,7 @@ spine -v \ --output=/var/www/html \ ~spineMarkupSamples/pod/* -Note: The CGI search form is built separately in sisudoc-spine-search-cgi/ +Note: The CGI search form is built separately in the sisudoc-spine-search-cgi/ directory. *** html with links to search form @@ -243,6 +243,8 @@ for a document collection you can point to the document collection: ### generate a cgi search form in d +The CGI search form is built separately in the sisudoc-spine-search-cgi/ directory. + Steps: 1. Clone the sisudoc-spine-search-cgi repository 2. Configure views/configuration.txt with your web server settings @@ -287,7 +289,7 @@ spine -v \ --output=/var/www/html \ ~spineMarkupSamples/pod/* -Note: The CGI search form is built separately in sisudoc-spine-search-cgi/ +Note: The CGI search form is built separately in the sisudoc-spine-search-cgi/ directory. ### html with links to search form diff --git a/doc/man/man1/spine.1 b/doc/man/man1/spine.1 index 93443ae..7281f30 100644 --- a/doc/man/man1/spine.1 +++ b/doc/man/man1/spine.1 @@ -122,11 +122,6 @@ ascribed to --act0 to --act9 .B --asciidoc [path + filename] asciidoc, smart text (not available) .TP -.B --cgi-search-form-codegen - generate d code search form to search db specfied needs --output=[path] and ---sqlite-db-filename=[cgi search form name] or path to configuration file ---config=[full path to config file] -.TP .B --cgi-sqlite-search-filename=[filename] name to give cgi-search form, (it generates a [filename].d file that requires subsequent compilation) also required is the name of the sqlite db to be @@ -568,11 +563,9 @@ spine -v --show-config --config= ~spineMarkupSamples/pod/.dr/config_local_site_t .TP spine -v --show-config --config=~spineMarkupSamples/pod/.dr .TP -spine -v --cgi-search-form-codegen --config=~spineMarkupSamples/pod/.dr/config_local -.TP -cd ~webDocRoot/cgi +Note: The CGI search form is now built separately in the sisudoc-spine-search-cgi/ directory. .TP -dub --force --compiler=ldc2 && sudo cp -v cgi-bin/spine-search /usr/lib/cgi-bin/. +See sisudoc-spine-search-cgi/README.md for build instructions. .TP .BR @@ -2,11 +2,11 @@ "nodes": { "nixpkgs": { "locked": { - "lastModified": 1759887028, - "narHash": "sha256-gljzEVuaj841XmluE1ng62RHMN5NkMHqdw+4OtQcpi4=", + "lastModified": 1759917807, + "narHash": "sha256-WoSazth5EXIJmveWf0zbTMycrgpbLYOth6KhmltMuv0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "8b5c9dd8856f0c0cf46cc91f2c21c106a9d42e25", + "rev": "fb5cf53218b987f2703a5bbc292a030c0fe33443", "type": "github" }, "original": { @@ -23,7 +23,7 @@ localOverlay = (final: prev: { ldc = prev.callPackage ./nix-overlays/ldc { }; # -> ok 1.41.0 dmd = prev.callPackage ./nix-overlays/dmd { }; # -> ok 2.111.0 - dub = prev.callPackage ./nix-overlays/dub { }; # -> ? 1.39.0 + dub = prev.callPackage ./nix-overlays/dub { }; # -> ? 1.40.0 dtools = prev.callPackage ./nix-overlays/dtools { }; # -> ok 2.110.0 #gdc = prev.callPackage ./nix-overlays/gdc { }; }); @@ -131,7 +131,7 @@ spine-overlay-dmd = stdenv.mkDerivation { inherit pname; inherit version; - #name = "spine-0.18.0 dmd-2.111.0 dub-1.39.0"; + #name = "spine-0.18.0 dmd-2.111.0 dub-1.40.0"; meta.mainProgram = "spine-dmd"; executable = true; src = self; @@ -155,7 +155,7 @@ spine-overlay-ldc = stdenv.mkDerivation { inherit pname; inherit version; - #name = "spine-0.18.0 ldc-1.41.0 dub-1.39.0"; + #name = "spine-0.18.0 ldc-1.41.0 dub-1.40.0"; meta.mainProgram = "spine-ldc"; executable = true; src = self; @@ -215,7 +215,7 @@ in with pkgs-nix; { dsh-overlay = mkShell { - name = "spine-0.18.0 base dev shell, ldc-1.41.0, dub-1.39.0 - dtools-2.110.0"; + name = "spine-0.18.0 base dev shell, ldc-1.41.0, dub-1.40.0 - dtools-2.110.0"; inherit shell; inherit devEnv; packages = with pkgs-ovl; [ @@ -255,7 +255,7 @@ inherit shellHook; }; dsh-overlay-dmd = mkShell { - name = "spine-0.18.0 base dev shell, dmd-2.111.0, dub-1.39.0 - dtools-2.110.0"; + name = "spine-0.18.0 base dev shell, dmd-2.111.0, dub-1.40.0 - dtools-2.110.0"; inherit shell; inherit devEnv; packages = with pkgs-ovl; [ @@ -268,7 +268,7 @@ inherit shellHook; }; dsh-overlay-ldc = mkShell { - name = "spine-0.18.0 base dev shell, ldc-1.41.0, dub-1.39.0 - dtools-2.110.0"; + name = "spine-0.18.0 base dev shell, ldc-1.41.0, dub-1.40.0 - dtools-2.110.0"; inherit shell; inherit devEnv; packages = with pkgs-ovl; [ diff --git a/org/config_env.org b/org/config_env.org index 2a2dac1..73a478a 100644 --- a/org/config_env.org +++ b/org/config_env.org @@ -178,7 +178,7 @@ export SpineDBpath=/var/www/sqlite #export SpineDBpath=/srv/www/spine/sqlite #+END_SRC -* versions GET +* org includes - versions GET ** direnv #+NAME: direnv_version diff --git a/org/spine_info.org b/org/spine_info.org index 4a2b128..7459672 100644 --- a/org/spine_info.org +++ b/org/spine_info.org @@ -624,6 +624,8 @@ for a document collection you can point to the document collection: #+NAME: sisudoc_spine_README_command_examples_search_db_cgi_text #+BEGIN_SRC text +The CGI search form is built separately in the sisudoc-spine-search-cgi/ directory. + Steps: 1. Clone the sisudoc-spine-search-cgi repository 2. Configure views/configuration.txt with your web server settings @@ -670,7 +672,7 @@ spine -v \ --output=/var/www/html \ ~spineMarkupSamples/pod/* -Note: The CGI search form is built separately in sisudoc-spine-search-cgi/ +Note: The CGI search form is built separately in the sisudoc-spine-search-cgi/ directory. #+END_SRC #+NAME: sisudoc_spine_README_command_examples_html_with_links_to_search_form_text |