aboutsummaryrefslogtreecommitdiffhomepage
path: root/org
diff options
context:
space:
mode:
Diffstat (limited to 'org')
-rw-r--r--org/compile_time_info.org2
-rw-r--r--org/metaverse.org198
-rw-r--r--org/out_cgi_search_sqlite.org5
-rw-r--r--org/out_latex.org13
-rw-r--r--org/spine.org434
-rw-r--r--org/spine_build_scaffold.org307
-rw-r--r--org/util_cgi_d_sqlite_search.org5
7 files changed, 510 insertions, 454 deletions
diff --git a/org/compile_time_info.org b/org/compile_time_info.org
index 59ea6a4..ad8d649 100644
--- a/org/compile_time_info.org
+++ b/org/compile_time_info.org
@@ -17,7 +17,7 @@
[[./spine.org][spine]] [[./][org/]]
* compilation info
-[[../maker.org][maker.org makefile]]
+[[./spine_build_scaffold.org][make/build]]
[[./spine.org][spine hub]] [[./][org/]]
e.g. do on linux bsd osx not windows:
diff --git a/org/metaverse.org b/org/metaverse.org
index cec377e..586e25f 100644
--- a/org/metaverse.org
+++ b/org/metaverse.org
@@ -20,7 +20,7 @@
* 1. Document Abstraction
Process markup document, create document abstraction.
-** _module template_ :module:metadoc_from_src:
+** _module template_ :module:metadoc_from_src:
#+BEGIN_SRC d :tangle "../src/doc_reform/meta/metadoc_from_src.d"
/++
@@ -267,8 +267,8 @@ template docAbstraction() {
<<template_doc_sect_keys_seq>>
#+END_SRC
-** 1. _pre loop process ing_ :pre:
-*** imports :imports:
+** 1. _pre loop process ing_ :pre:
+*** imports :imports:
[[./meta_defaults.org][meta_defaults]]
#+NAME: abs_top_imports
@@ -286,7 +286,7 @@ import
doc_reform.meta.rgx;
#+END_SRC
-*** mixins :mixins:
+*** mixins :mixins:
#+NAME: abs_top_mixins
#+BEGIN_SRC d
@@ -295,7 +295,7 @@ mixin InternalMarkup;
mixin spineRgxIn;
#+END_SRC
-*** initialize :initialize:
+*** initialize :initialize:
**** declare enum
#+NAME: abs_top_init_struct_0
@@ -872,8 +872,8 @@ debug (substitutions) {
}
#+END_SRC
-** 2. ↻ *LOOP* _loop: process document body_ [+6] :loop:
-*** Loop scope :scope:
+** 2. ↻ *LOOP* _loop: process document body_ :loop:document:
+*** Loop scope :scope:
#+NAME: abs_in_loop_body_00_0
#+BEGIN_SRC d
@@ -901,7 +901,7 @@ debug(srclines) {
}
#+END_SRC
-*** check whether object number is on or turned off :ocn:
+*** check whether object number is on or turned off :ocn:
#+NAME: abs_in_loop_body_00_1
#+BEGIN_SRC d
@@ -911,7 +911,7 @@ if (!line.empty) {
#+END_SRC
*** separate _code blocks_ from _other markup text_ [+5] [#A]
-**** _code blocks_ :block:code:
+**** _code blocks_ :block:code:
#+NAME: abs_in_loop_body_00_code_block
#+BEGIN_SRC d
@@ -928,8 +928,8 @@ continue;
line = line.inline_markup_faces; // by text line (rather than by text object), linebreaks in para problematic
#+END_SRC
-***** in section (biblio, glossary, blurb) +(block group)+ [+1] :block:active:
-****** in section: biblio :biblio:
+***** in section (biblio, glossary, blurb) +(block group)+ [+1] :block:
+****** in section: biblio :biblio:
#+NAME: abs_in_loop_body_non_code_obj_in_biblio
#+BEGIN_SRC d
@@ -951,7 +951,7 @@ if (line.matchFirst(rgx.heading_biblio)
continue;
#+END_SRC
-****** in section: glossary :glossary:
+****** in section: glossary :glossary:
if there is a glossary section you need to:
- extract it
@@ -1059,7 +1059,7 @@ if there is a glossary section you need to:
continue;
#+END_SRC
-****** in section: blurb :blurb:
+****** in section: blurb :blurb:
if there is a blurb section you need to:
- extract it
@@ -1219,14 +1219,14 @@ if there is a blurb section you need to:
continue;
#+END_SRC
-***** in blocks [+1] :block:active:
+***** in blocks [+1] :block:
#+NAME: abs_in_loop_body_non_code_obj_in_block
#+BEGIN_SRC d
} else if (pith["block_state"] == eN.blk_state.on) {
#+END_SRC
-****** in block: quote :quote:
+****** in block: quote :quote:
#+NAME: abs_in_loop_body_non_code_obj_in_block_quote
#+BEGIN_SRC d
@@ -1238,7 +1238,7 @@ if (pith["block_is"] == eN.blk_is.quote) {
continue;
#+END_SRC
-****** in block: group :group:
+****** in block: group :group:
#+NAME: abs_in_loop_body_non_code_obj_in_block_group
#+BEGIN_SRC d
@@ -1251,7 +1251,7 @@ if (pith["block_is"] == eN.blk_is.quote) {
continue;
#+END_SRC
-****** in block: block :block:
+****** in block: block :block:
#+NAME: abs_in_loop_body_non_code_obj_in_block_block
#+BEGIN_SRC d
@@ -1267,7 +1267,7 @@ if (pith["block_is"] == eN.blk_is.quote) {
continue;
#+END_SRC
-****** in block: poem :poem:
+****** in block: poem :poem:
#+NAME: abs_in_loop_body_non_code_obj_in_block_poem
#+BEGIN_SRC d
@@ -1276,7 +1276,7 @@ if (pith["block_is"] == eN.blk_is.quote) {
continue;
#+END_SRC
-****** in block: table :table:
+****** in block: table :table:
#+NAME: abs_in_loop_body_non_code_obj_in_block_table
#+BEGIN_SRC d
@@ -1312,7 +1312,7 @@ continue;
#+END_SRC
****** line not empty [+2]
-******* asserts :assert:
+******* asserts :assert:
#+NAME: abs_in_loop_body_not_block_obj_assert
#+BEGIN_SRC d
@@ -1340,7 +1340,7 @@ if (pith["block_state"] == eN.blk_state.closing) {
}
#+END_SRC
-******* book index :bookindex:
+******* book index :bookindex:
#+NAME: abs_in_loop_body_not_block_obj_bookindex
#+BEGIN_SRC d
@@ -1357,7 +1357,7 @@ if (line.matchFirst(rgx.book_index_item)
} else { /+ not book_index +/
#+END_SRC
-******** matched: comment :comment:match:
+******** matched: comment :comment:match:
#+NAME: abs_in_loop_body_not_block_obj_not_bookindex_a_comment
#+BEGIN_SRC d
@@ -1379,7 +1379,7 @@ if (auto m = line.matchFirst(rgx.comment)) { /+
++cntr;
#+END_SRC
-******** flag !set & line !exist: heading or para :heading:paragraph:
+******** flag !set & line !exist: heading or para :heading:paragraph:
#+NAME: abs_in_loop_body_not_block_obj_not_bookindex_a_para_type
#+BEGIN_SRC d
@@ -1424,7 +1424,7 @@ if (auto m = line.matchFirst(rgx.comment)) { /+
}
#+END_SRC
-******** line exist: heading :heading:
+******** line exist: heading :heading:
#+NAME: abs_in_loop_body_not_block_obj_not_bookindex_a_heading
#+BEGIN_SRC d
@@ -1436,7 +1436,7 @@ if (auto m = line.matchFirst(rgx.comment)) { /+
++line_occur["heading"];
#+END_SRC
-******** line exist: para :para:
+******** line exist: para :para:
#+NAME: abs_in_loop_body_not_block_obj_not_bookindex_a_para
#+BEGIN_SRC d
@@ -1479,7 +1479,7 @@ an_object = line.flow_block_flag_line_empty_(
#+END_SRC
****** line empty [+1]
-******* assert line empty :assert:
+******* assert line empty :assert:
#+NAME: abs_in_loop_body_not_block_obj_line_empty_assert
#+BEGIN_SRC d
@@ -1494,7 +1494,7 @@ assert(
);
#+END_SRC
-******* heading object :heading:object:
+******* heading object :heading:object:
#+NAME: abs_in_loop_body_not_block_obj_line_empty_heading_obj
#+BEGIN_SRC d
@@ -1628,7 +1628,7 @@ if (pith["txt_is"] == eN.txt_is.heading
++cntr;
#+END_SRC
-******* paragraph object :paragraph:object:
+******* paragraph object :paragraph:object:
#+NAME: abs_in_loop_body_not_block_obj_line_empty_para_obj
#+BEGIN_SRC d
@@ -1697,7 +1697,7 @@ if (pith["txt_is"] == eN.txt_is.heading
}
#+END_SRC
-*** regular _text objects_ identified :text:paragraph:
+*** regular _text objects_ identified :text:paragraph:
#+NAME: abs_in_loop_body_reloop_get_prior_state
#+BEGIN_SRC d
@@ -1746,7 +1746,7 @@ if (the_document_body_section.length > 0) {
}
#+END_SRC
-** 3. _post main-loop processing_ :post:
+** 3. _post main-loop processing_ :post:
*** misc
/+
@@ -1759,7 +1759,7 @@ if (the_document_body_section.length > 0) {
+/
*** tie up preparation of document sections
-**** endnotes section (scroll & seg) :endnotes:
+**** endnotes section (scroll & seg) :endnotes:
#+NAME: abs_post_endnote_tuple
#+BEGIN_SRC d
@@ -1779,7 +1779,7 @@ debug(endnotes) {
}
#+END_SRC
-**** no glossary section? :glossary:
+**** no glossary section? :glossary:
#+NAME: abs_post_glossary_nugget
#+BEGIN_SRC d
@@ -1808,7 +1808,7 @@ debug(glossary) {
}
#+END_SRC
-**** bibliography section (objects) :bibliography:
+**** bibliography section (objects) :bibliography:
#+NAME: abs_post_biblio_init
#+BEGIN_SRC d
@@ -1969,7 +1969,7 @@ JSONValue biblio_entry_tags_jsonstr = `{
}`; // is: book, article, magazine, newspaper, blog, other
#+END_SRC
-**** bookindex section (scroll & seg) :book:index:
+**** bookindex section (scroll & seg) :book:index:
#+NAME: abs_post_bookindex
#+BEGIN_SRC d
@@ -1990,7 +1990,7 @@ debug(bookindex) {
}
#+END_SRC
-**** no blurb section? :blurb:
+**** no blurb section? :blurb:
#+NAME: abs_post_no_blurb
#+BEGIN_SRC d
@@ -2021,7 +2021,7 @@ debug(blurb) {
}
#+END_SRC
-**** toc backmatter, table of contents backmatter (scroll & seg) :contents:
+**** toc backmatter, table of contents backmatter (scroll & seg) :contents:
#+NAME: abs_post_contents
#+BEGIN_SRC d
@@ -2130,7 +2130,7 @@ the_document_head_section ~= the_document_body_section[0];
the_document_body_section = the_document_body_section[1..$];
#+END_SRC
-*** ↻ *LOOPs* _post main-loop loops_ :loop:post:
+*** ↻ *LOOPs* _post main-loop loops_ :loop:post:
**** 1. ↻ _Loop as required_ (e.g. backmatter): loop up to lev4, extract html segnames, set pointers
this extra loop is used/needed to determine pre and (in particular) next segment
@@ -2329,7 +2329,7 @@ NOTE there are issues attempting to do this on first pass as:
}
#+END_SRC
-***** ↻ Loop section: document body [bd]
+***** ↻ Loop section: document body [bd] :loop:body:
- substantive object numbers already exist
- number un-numbered non-substantive text
@@ -2360,7 +2360,7 @@ if (the_document_body_section.length > 1) {
}
#+END_SRC
-***** ↻ Loop section: endnotes [en]
+***** ↻ Loop section: endnotes [en] :loop:endnotes:
#+NAME: abs_post_loop_section_endnotes
#+BEGIN_SRC d
@@ -2381,7 +2381,7 @@ if (the_endnotes_section.length > 1) {
}
#+END_SRC
-***** ↻ Loop section: glossary [gl]
+***** ↻ Loop section: glossary [gl] :loop:glossary:
#+NAME: abs_post_loop_section_glossary
#+BEGIN_SRC d
@@ -2402,7 +2402,7 @@ if (the_glossary_section.length > 1) {
}
#+END_SRC
-***** ↻ Loop section: bibliography [bb]
+***** ↻ Loop section: bibliography [bb] :loop:bibliography:
#+NAME: abs_post_loop_section_biblio
#+BEGIN_SRC d
@@ -2423,7 +2423,7 @@ if (the_bibliography_section.length > 1) {
}
#+END_SRC
-***** ↻ Loop section: book index [bi]
+***** ↻ Loop section: book index [bi] :loop:bookindex:
#+NAME: abs_post_loop_section_bookindex
#+BEGIN_SRC d
@@ -2444,7 +2444,7 @@ if (the_bookindex_section.length > 1) {
}
#+END_SRC
-***** ↻ Loop section: blurb [bl]
+***** ↻ Loop section: blurb [bl] :loop:blurb:
#+NAME: abs_post_loop_section_blurb
#+BEGIN_SRC d
@@ -2650,7 +2650,7 @@ string[] segnames_0_to_4;
}
#+END_SRC
-***** ↻ Loop section: head
+***** ↻ Loop section: head :loop:head:
#+NAME: abs_post_loop_section_head
#+BEGIN_SRC d
@@ -2682,7 +2682,7 @@ foreach (ref obj; the_document_head_section) {
}
#+END_SRC
-***** ↻ Loop section: toc [to]
+***** ↻ Loop section: toc :loop:table_of_contents:
#+NAME: abs_post_loop_section_toc
#+BEGIN_SRC d
@@ -2712,7 +2712,7 @@ if (the_table_of_contents_section.length > 1) {
}
#+END_SRC
-***** ↻ Loop section: document body [bd]
+***** ↻ Loop section: document body [bd] :loop:body:
#+NAME: abs_post_reloop_section_body
#+BEGIN_SRC d
@@ -2761,7 +2761,7 @@ if (the_document_body_section.length > 1) {
auto image_list = (_images.sort()).uniq;
#+END_SRC
-***** ↻ Loop section: endnotes [en]
+***** ↻ Loop section: endnotes [en] :loop:endnotes:
- endnotes have their own number, (also use in node) and they belong to calling object
@@ -2806,7 +2806,7 @@ if (the_endnotes_section.length > 1) {
}
#+END_SRC
-***** ↻ reLoop section: glossary [gl]
+***** ↻ reLoop section: glossary [gl] :loop:glossary:
- add glossary numbering, (also use in node) no need to show in text
@@ -2851,7 +2851,7 @@ if (the_glossary_section.length > 1) {
}
#+END_SRC
-***** ↻ reLoop section: bibliography [bb]
+***** ↻ reLoop section: bibliography [bb] :loop:bibliography:
- add bibliography numbering, (also use in node) no need to show in text
@@ -2896,7 +2896,7 @@ if (the_bibliography_section.length > 1) {
}
#+END_SRC
-***** ↻ Loop section: book index (scroll, seg) [bi]
+***** ↻ Loop section: book index (scroll, seg) [bi] :loop:bookindex:
- add book index numbering?, (also use in node) no need to show in text
@@ -2953,7 +2953,7 @@ if (the_bookindex_section.length > 1) { /
}
#+END_SRC
-***** ↻ Loop section: blurb [bl]
+***** ↻ Loop section: blurb [bl] :loop:blurb:
#+NAME: abs_post_reloop_section_blurb_get_numbering
#+BEGIN_SRC d
@@ -2996,7 +2996,7 @@ if (the_blurb_section.length > 1) {
}
#+END_SRC
-***** ↻ reLoop sections: get decendants
+***** ↻ reLoop sections: get decendants :loop:document:
#+NAME: abs_post_reloop_section_all_get_decendants
#+BEGIN_SRC d
@@ -3094,7 +3094,7 @@ if (the_document_body_section.length > 1) {
}
#+END_SRC
-**** TODO update BUG?
+**** update TODO BUG?
#+NAME: abs_post_heading_obj_reinitialize
#+BEGIN_SRC d
@@ -3131,8 +3131,8 @@ comp_obj_heading_ = comp_obj_heading_.obj_heading_ancestors(lv_ancestors_txt);
// the_dom_tail_section ~= comp_obj_heading_; // remove tail for now, decide on later
#+END_SRC
-** 4. _return document tuple_ :post:
-*** _the document_ :document:
+** 4. _return document tuple_ :post:
+*** _the document_ :document:
#+NAME: abs_post_the_document
#+BEGIN_SRC d
@@ -3295,7 +3295,7 @@ dom_structure_collapsed_tags_status_buffer = [ 0, 0, 0, 0, 0, 0, 0, 0, 0,];
}
#+END_SRC
-*** _return the document tuple_ [#A] :return:tuple:
+*** _return the document tuple_ [#A] :return:tuple:
#+NAME: abs_return_tuple
#+BEGIN_SRC d
@@ -3306,12 +3306,12 @@ auto t = tuple(
return t;
#+END_SRC
-** 5. Functions :abstract:function:
+** 5. Functions :abstract:function:
functions used in document abstraction
-*** set & resets :reset:
-**** object reset: remove (clean) :object:remove:
+*** set & resets :reset:
+**** object reset: remove (clean) :object:remove:
#+NAME: abs_functions_object_reset
#+BEGIN_SRC d
@@ -3325,7 +3325,7 @@ functions used in document abstraction
}
#+END_SRC
-**** set, initialize or re-initialize :set:
+**** set, initialize or re-initialize :set:
#+NAME: abs_functions_header_set_common
#+BEGIN_SRC d
@@ -3341,7 +3341,7 @@ functions used in document abstraction
}
#+END_SRC
-*** check object_number status in document :ocn:
+*** check object_number status in document :ocn:
#+NAME: abs_functions_ocn_status
#+BEGIN_SRC d
@@ -3454,8 +3454,8 @@ functions used in document abstraction
}
#+END_SRC
-*** block :block:
-**** block start (open) block :start:
+*** block :block:
+**** block start (open) block :start:
***** { block starts function
#+NAME: abs_functions_block_open
@@ -3468,7 +3468,7 @@ functions used in document abstraction
) {
#+END_SRC
-****** block (various) curly open :curly:
+****** block (various) curly open :curly:
#+NAME: abs_functions_block_regex
#+BEGIN_SRC d
@@ -3609,7 +3609,7 @@ if (auto m = line.matchFirst(rgx.block_curly_code_open)) {
pith["block_delim"] = eN.blk_delim.curly_special;
#+END_SRC
-****** block (various) tic open :tic:
+****** block (various) tic open :tic:
******* code
#+NAME: abs_functions_block_tic_open_code
@@ -3739,8 +3739,8 @@ if (auto m = line.matchFirst(rgx.block_curly_code_open)) {
}
#+END_SRC
-**** block continue (an open block) :continue:
-***** _code block_ (special status, deal with first) :code:
+**** block continue (an open block) :continue:
+***** _code block_ (special status, deal with first) :code:
#+NAME: abs_functions_block_code
#+BEGIN_SRC d
@@ -3790,7 +3790,7 @@ if (auto m = line.matchFirst(rgx.block_curly_code_open)) {
}
#+END_SRC
-***** biblio block :biblio:
+***** biblio block :biblio:
****** biblio map tags
#+NAME: abs_functions_block_biblio_map_tags
@@ -3969,7 +3969,7 @@ final string biblio_tag_map_()(string abr) {
}
#+END_SRC
-***** quote block :quote:
+***** quote block :quote:
#+NAME: abs_functions_block_quote
#+BEGIN_SRC d
@@ -4016,7 +4016,7 @@ final string biblio_tag_map_()(string abr) {
}
#+END_SRC
-***** group block :group:
+***** group block :group:
- apply inline markup
- discard leading and newline whitespace
@@ -4066,7 +4066,7 @@ final string biblio_tag_map_()(string abr) {
}
#+END_SRC
-***** block block :block:
+***** block block :block:
- apply inline markup
- keep whitespace indentation
@@ -4117,7 +4117,7 @@ final string biblio_tag_map_()(string abr) {
}
#+END_SRC
-***** poem block, verse objects :poem:verse:
+***** poem block, verse objects :poem:verse:
why extra object stuff only in poem/verse?
@@ -4369,7 +4369,7 @@ why extra object stuff only in poem/verse?
}
#+END_SRC
-***** table block :table:
+***** table block :table:
there are 3 types of table markup that need to be nomalized (given a single representation) here
@@ -4504,7 +4504,7 @@ process and use an_object["table_head"] (then empty it)
}
#+END_SRC
-**** block end (close an open block): line empty, block flag _makes_ :close:
+**** block end (close an open block): line empty, block flag _makes_ :close:
***** { line empty, _make block_
@@ -4871,7 +4871,7 @@ if (pith["block_is"] == eN.blk_is.quote) {
}
#+END_SRC
-*** book index :bookindex:
+*** book index :bookindex:
#+NAME: abs_functions_book_index
#+BEGIN_SRC d
@@ -4927,8 +4927,8 @@ if (pith["block_is"] == eN.blk_is.quote) {
}
#+END_SRC
-*** heading or paragraph :heading:paragraph:
-**** heading found :heading:
+*** heading or paragraph :heading:paragraph:
+**** heading found :heading:
#+NAME: abs_functions_heading_found
#+BEGIN_SRC d
@@ -5015,7 +5015,7 @@ if (pith["block_is"] == eN.blk_is.quote) {
}
#+END_SRC
-**** heading make set :heading:
+**** heading make set :heading:
#+NAME: abs_functions_heading_make_set
#+BEGIN_SRC d
@@ -5077,7 +5077,7 @@ if (pith["block_is"] == eN.blk_is.quote) {
}
#+END_SRC
-**** heading match :heading:
+**** heading match :heading:
#+NAME: abs_functions_heading_matched
#+BEGIN_SRC d
@@ -5233,7 +5233,7 @@ if (pith["block_is"] == eN.blk_is.quote) {
}
#+END_SRC
-**** para match :para:
+**** para match :para:
#+NAME: abs_functions_para_matched
#+BEGIN_SRC d
@@ -5534,9 +5534,9 @@ if (pith["block_is"] == eN.blk_is.quote) {
}
#+END_SRC
-*** function emitters :emitters:
-**** object :object:
-***** ocn :ocn:
+*** function emitters :emitters:
+**** object :object:
+***** ocn :ocn:
#+NAME: meta_emitters_ocn
#+BEGIN_SRC d
@@ -5590,7 +5590,7 @@ if (pith["block_is"] == eN.blk_is.quote) {
}
#+END_SRC
-***** object inline markup munge :markup:inline:
+***** object inline markup munge :markup:inline:
****** { struct, inline markup munge
@@ -5968,7 +5968,7 @@ invariant() {
}
#+END_SRC
-***** toc, tags, object inline markup :markup:inline:
+***** toc, tags, object inline markup :markup:inline:
****** {
#+NAME: meta_emitters_obj_inline_markup_function_open
@@ -5980,7 +5980,7 @@ static struct ObjInlineMarkup {
static string anchor_tag = "";
#+END_SRC
-******* object inline markup and anchor tags :markup:inline:
+******* object inline markup and anchor tags :markup:inline:
#+NAME: meta_emitters_obj_inline_markup_and_anchor_tags_and_misc
#+BEGIN_SRC d
@@ -6079,7 +6079,7 @@ invariant() {
}
#+END_SRC
-******* toc (table of contents), build, gather headings :markup:inline:
+******* toc (table of contents), build, gather headings :markup:inline:
#+NAME: meta_emitters_obj_inline_markup_table_of_contents
#+BEGIN_SRC d
@@ -6386,7 +6386,7 @@ static int heading_num_lev1 = 0;
}
#+END_SRC
-***** object attrib :attributes:
+***** object attrib :attributes:
****** { attributes structure open, public
#+NAME: meta_emitters_obj_attributes
@@ -6660,8 +6660,8 @@ invariant() {
}
#+END_SRC
-**** book index :book:index:
-***** book index nugget hash :hash:nugget:
+**** book index :book:index:
+***** book index nugget hash :hash:nugget:
#+NAME: meta_emitters_bookindex_nugget
#+BEGIN_SRC d
@@ -6741,7 +6741,7 @@ struct BookIndexNuggetHash {
}
#+END_SRC
-***** book index (sort &) report indented :report:indented:
+***** book index (sort &) report indented :report:indented:
#+NAME: meta_emitters_bookindex_report_indented
#+BEGIN_SRC d
@@ -6773,7 +6773,7 @@ struct BookIndexReportIndent {
}
#+END_SRC
-***** book index (sort &) report section :report:section:
+***** book index (sort &) report section :report:section:
****** { book index struct open
#+NAME: meta_emitters_bookindex_report_section_function_open
@@ -6819,7 +6819,7 @@ struct BookIndexReportSection {
}
#+END_SRC
-******* book index (sort &) build section :report:section:
+******* book index (sort &) build section :report:section:
#+NAME: meta_emitters_bookindex_report_section_function_build_abstraction
#+BEGIN_SRC d
@@ -6989,7 +6989,7 @@ struct BookIndexReportSection {
}
#+END_SRC
-**** (end)notes section :endnotes:section:
+**** (end)notes section :endnotes:section:
#+NAME: meta_emitters_endnotes_function_open
#+BEGIN_SRC d
@@ -7226,7 +7226,7 @@ struct NotesSection {
}
#+END_SRC
-**** bibliography :bibliography:
+**** bibliography :bibliography:
***** { biblio struct
#+NAME: meta_emitters_bibliography_function_open
@@ -7342,7 +7342,7 @@ struct Bibliography {
}
#+END_SRC
-**** node structure metadata :structure:metadata:node:
+**** node structure metadata :structure:metadata:node:
***** { metadata node struct
#+NAME: meta_emitters_metadata_function_open
@@ -7623,8 +7623,8 @@ invariant() {
}
#+END_SRC
-*** function assertions :assertions:
-**** assertions on markup document structure :doc_structure:
+*** function assertions :assertions:
+**** assertions on markup document structure :doc_structure:
#+NAME: abs_functions_assertions
#+BEGIN_SRC d
@@ -7858,7 +7858,7 @@ template ObjectSetter() {
}
#+END_SRC
-** 1. initialize structs :struct:
+** 1. initialize structs :struct:
*** heading attribute
#+BEGIN_SRC d
diff --git a/org/out_cgi_search_sqlite.org b/org/out_cgi_search_sqlite.org
index df98ed9..868962d 100644
--- a/org/out_cgi_search_sqlite.org
+++ b/org/out_cgi_search_sqlite.org
@@ -15,7 +15,8 @@
#+PROPERTY: header-args+ :cache no
#+PROPERTY: header-args+ :padline no
-[[../maker.org][maker.org makefile]] [[./][org/]]
+[[./spine.org][spine.org]] [[../org/][org/]]
+[[./spine_build_scaffold.org][make/build]]
* cgi search
@@ -2249,7 +2250,7 @@ mainSourceFile "%s"
configuration "default" {
targetType "executable"
targetName "%s"
- postGenerateCommands "/usr/bin/notify-send -t 0 'D executable ready' 'spine cgi sqlite search d'"
+ postGenerateCommands "notify-send -t 0 'D executable ready' 'spine cgi sqlite search d'"
}
#+END_SRC
diff --git a/org/out_latex.org b/org/out_latex.org
index ff56f47..adf3cf8 100644
--- a/org/out_latex.org
+++ b/org/out_latex.org
@@ -19,7 +19,7 @@
- [[./output_hub.org][output_hub]]
* latex
-** _module template_ :latex:pdf:module:
+** _module template_ :latex:pdf:module:
#+BEGIN_SRC d :tangle "../src/doc_reform/io_out/latex.d" :noweb yes
module doc_reform.io_out.latex;
@@ -110,7 +110,7 @@ template outputLaTeX() {
}
#+END_SRC
-** write latex output :latex:out:
+** write latex output :latex:out:
#+NAME: output_latex_0
#+BEGIN_SRC d
@@ -152,7 +152,7 @@ void writeOutputLaTeX(T,M)(
}
#+END_SRC
-** latex output hub [#A] :latex:pdf:out:
+** latex output hub [#A] :latex:pdf:out:
#+NAME: output_latex_1
#+BEGIN_SRC d
@@ -1064,7 +1064,7 @@ string table(O,M)(
#+END_SRC
** latex parts
-*** latex head :head:
+*** latex head :head:
**** latex head function
#+NAME: output_latex_head_1
@@ -1680,7 +1680,7 @@ string latex_head(M)(
}
#+END_SRC
-*** ↻ latex body :content:body:
+*** ↻ latex body :content:body:
**** latex body function
#+NAME: output_latex_body_0
@@ -1887,7 +1887,7 @@ string latex_body(D,M)(
}
#+END_SRC
-*** latex tail :tail:
+*** latex tail :tail:
**** latex tail function
#+NAME: output_latex_tail_0
@@ -1907,7 +1907,6 @@ string latex_tail(M)(
***** latex tail format inclusions
-
***** latex document end
#+NAME: output_latex_tail_tex
diff --git a/org/spine.org b/org/spine.org
index ebd5e95..30a08f5 100644
--- a/org/spine.org
+++ b/org/spine.org
@@ -15,9 +15,10 @@
#+PROPERTY: header-args+ :cache no
#+PROPERTY: header-args+ :padline no
-[[../maker.org][maker.org makefile]] [[./][org/]]
+[[./spine_info.org][spine_info.org]] [[./][org/]]
+[[./spine_build_scaffold.org][make/build]] VERSION
-* 0. version.txt (set version) :version:
+* 0. version.txt (set version) :version:
** 0. set program tangle
#+BEGIN_SRC txt :tangle "../views/version.txt"
@@ -38,7 +39,7 @@ struct Version {
}
#+END_SRC
-** TODO set program version
+** set program version VERSION :version:set:project:
#+NAME: spine_version_current_set
#+BEGIN_SRC d
@@ -64,7 +65,7 @@ version (Posix) {
}
#+END_SRC
-* 1. spine (sisu document parser) :spine:
+* 1. spine (sisu document parser) :spine:
** notes
- deal with imports
- get options
@@ -75,7 +76,7 @@ version (Posix) {
- process file
- output
-** 0. spine src/spine :template:
+** 0. spine src/spine :template:
- process files (act according to requirements of each type)
- by sourcefilename
@@ -227,10 +228,10 @@ string program_name = "spine";
+/
#+END_SRC
-** 1. pre-loop init :init:
+** 1. pre-loop init :init:
*** init
-**** imports :import:
-***** spine :spine:
+**** imports :import:
+***** spine :spine:
#+NAME: imports_spine
#+BEGIN_SRC d
@@ -260,7 +261,7 @@ import
doc_reform.io_out.hub;
#+END_SRC
-***** spine metadoc :spine:
+***** spine metadoc :spine:
#+NAME: imports_spine_metadoc
#+BEGIN_SRC d
@@ -298,10 +299,11 @@ import
[[./output.org][output]]
[[./spine.org][spine]]
-keep up to date, configuration in ../maker.org
+keep up to date, configuration in
+[[./spine_build_scaffold.org][make/build]]
-**** mixins :mixin:
-***** version.txt :version:
+**** mixins :mixin:
+***** version.txt :version:
#+NAME: mixin_spine_version
#+BEGIN_SRC d
@@ -315,7 +317,7 @@ mixin(import("version.txt"));
mixin CompileTimeInfo;
#+END_SRC
-***** spine "main" mixins :spine:
+***** spine "main" mixins :spine:
#+NAME: spine_mixin
#+BEGIN_SRC d
@@ -324,14 +326,14 @@ mixin spineBiblio;
mixin outputHub;
#+END_SRC
-**** init :init:
+**** init :init:
#+NAME: spine_init_0
#+BEGIN_SRC d
auto hvst = spineHarvest!();
#+END_SRC
-**** args :args:
+**** args :args:
#+NAME: spine_init_1
#+BEGIN_SRC d
@@ -341,7 +343,7 @@ enum dAM { abstraction, matters }
static auto rgx = RgxI();
#+END_SRC
-*** scope (run complete) :scope:
+*** scope (run complete) :scope:
#+NAME: spine_init_2
#+BEGIN_SRC d
@@ -363,7 +365,7 @@ scope(failure) {
}
#+END_SRC
-*** getopt args for loop :args:getopt:
+*** getopt args for loop :args:getopt:
**** set getopt options
- set getopt options
***** initialize
@@ -1113,8 +1115,8 @@ foreach(arg; args[1..$]) {
}
#+END_SRC
-** _2. processing: (loop each file)_ [+2] :loop:files:
-*** scope (loop) :scope:
+** _2. processing: (loop each file)_ [+2] :loop:files:
+*** scope (loop) :scope:
#+NAME: spine_each_file_do_scope
#+BEGIN_SRC d
@@ -1219,7 +1221,7 @@ if (doc_matters.opt.action.show_config) {
}
#+END_SRC
-***** abstraction harvest :abstraction:harvest:
+***** abstraction harvest :abstraction:harvest:
- abstraction harvest
#+NAME: spine_each_file_do_debugs_checkdoc_4
@@ -1241,7 +1243,7 @@ if (doc_matters.opt.action.harvest) {
}
#+END_SRC
-**** 1. _debug_ (document parts, checkdoc) :debug:checkdoc:
+**** 1. _debug_ (document parts, checkdoc) :debug:checkdoc:
- [[./meta_output_debugs.org][meta_output_debugs]]
#+NAME: spine_each_file_do_debugs_checkdoc_5
@@ -1252,7 +1254,7 @@ if (doc_matters.opt.action.debug_do) {
}
#+END_SRC
-**** 2. _process outputs_ :outputs:
+**** 2. _process outputs_ :outputs:
- [[./output_hub.org][output_hub]]
#+NAME: spine_each_file_do_selected_output
@@ -1273,7 +1275,7 @@ if (!(doc_matters.opt.action.skip_output)) {
}
#+END_SRC
-*** scope (on loop exit) :scope:exit:
+*** scope (on loop exit) :scope:exit:
#+NAME: spine_each_file_do_scope_exit
#+BEGIN_SRC d
@@ -1298,7 +1300,7 @@ break; // terminate, stop
#+END_SRC
* 2. pre-processing
-** Output _document abstraction functions_ :module:spine:abstraction:
+** Output _document abstraction functions_ :module:spine:abstraction:
*** 0 module template
- abstraction template
@@ -1876,21 +1878,21 @@ dev notes
** spine glossary / terms
-|------------+-------------------------------------|
-| spine | sisu document parser |
-|------------+-------------------------------------|
-| dmso | document markup, structure, objects |
-|------------+-------------------------------------|
-| meta | meta document, document abstraction |
-| mda | meta, meta document abstraction |
-| adr | abstract document representation |
-| dar | document abstract representation |
-| (da) | (document abstraction) |
-| | (code representation of document) |
-|------------+-------------------------------------|
-| ao | abstract objects |
-| | (code representation of objects) |
-|------------+-------------------------------------|
+|-------+-------------------------------------|
+| spine | sisu document parser |
+|-------+-------------------------------------|
+| dmso | document markup, structure, objects |
+|-------+-------------------------------------|
+| meta | meta document, document abstraction |
+| mda | meta, meta document abstraction |
+| adr | abstract document representation |
+| dar | document abstract representation |
+| (da) | (document abstraction) |
+| | (code representation of document) |
+|-------+-------------------------------------|
+| ao | abstract objects |
+| | (code representation of objects) |
+|-------+-------------------------------------|
consider
|-------+----------------------------------------------|
@@ -1944,180 +1946,180 @@ provide the result as a single set of make instructions for each document parsed
*** config & metadata (from instruction sources)
-|---------------------+--------------------------+----------------------------+---------------------+-----------------------------|
-| | 1. document make file | 2. config file | 3. document header | 4. command line instruction |
-|---------------------+--------------------------+----------------------------+---------------------+-----------------------------|
-| comment, fixed: | per dir (pod) | per dir | per document (pod) | per command instruction |
-|---------------------+--------------------------+----------------------------+---------------------+-----------------------------|
-| | config_document | config_local_site | | |
-|---------------------+--------------------------+----------------------------+---------------------+-----------------------------|
-| local site specific | | * | | *? |
-|---------------------+--------------------------+----------------------------+---------------------+-----------------------------|
-| | | webserv | | |
-| | | - url_root | | |
-| | | - path | | |
-| | | - images | | |
-| | | - cgi | | |
-|---------------------+--------------------------+----------------------------+---------------------+-----------------------------|
-| | | webserv_cgi | | |
-| | | - host | | |
-| | | - base_path | | |
-| | | - port | | |
-| | | - user | | |
-| | | - file_links | | |
-|---------------------+--------------------------+----------------------------+---------------------+-----------------------------|
-| | | processing | | |
-| | | - path | | |
-| | | - dir | | |
-| | | - concord_max | | |
-|---------------------+--------------------------+----------------------------+---------------------+-----------------------------|
-| | | flag (configure) | | (call) |
-| | | - act0 | | act0 |
-| | | - act1 | | act1 |
-| | | - act2 | | act2 |
-| | | - act3 | | act3 |
-| | | - act4 | | act4 |
-| | | - act5 | | act5 |
-| | | - act6 | | act6 |
-| | | - act7 | | act7 |
-| | | - act8 | | act8 |
-| | | - act9 | | act9 |
-|---------------------+--------------------------+----------------------------+---------------------+-----------------------------|
-| | | default | | |
-| | | - papersize | | |
-| | | - text_wrap | | |
-| | | - emphasis | | |
-| | | - language | | |
-| | | - digest | | |
-|---------------------+--------------------------+----------------------------+---------------------+-----------------------------|
-| | | permission | | |
-| | | - share_source | | |
-|---------------------+--------------------------+----------------------------+---------------------+-----------------------------|
-| | | program_select | | |
-| | | - editor | | |
-| | | - epub_viewer | | |
-| | | - html_viewer | | |
-| | | - odf_viewer | | |
-| | | - pdf_viewer | | |
-| | | - xml_viewer | | |
-|---------------------+--------------------------+----------------------------+---------------------+-----------------------------|
-| | | search | | |
-| | | - flag | | |
-| | | - action | | |
-| | | - db | | |
-| | | - title | | |
-|---------------------+--------------------------+----------------------------+---------------------+-----------------------------|
-| make instruction | ** | omit or override share? | ** | *? |
-|---------------------+--------------------------+----------------------------+---------------------+-----------------------------|
-| | make | make | make | |
-| | - bold | - bold | - bold | |
-| | - breaks | - breaks | - breaks | |
-| | - cover_image | - cover_image | - cover_image | |
-| | - css | - css | - css | |
-| | - emphasis | - emphasis | - emphasis | |
-| | - footer | - footer | - footer | |
-| | - headings | - headings | - headings | |
-| | - home_button_image | - home_button_image | - home_button_image | |
-| | - home_button_text | - home_button_text | - home_button_text | |
-| | - italics | - italics | - italics | |
-| | - num_top | - num_top | - num_top | |
-| | - auto_num_depth | - auto_num_depth | - auto_num_depth | |
-| | - substitute | - substitute | - substitute | |
-| | - texpdf_font | - texpdf_font | - texpdf_font | |
-|---------------------+--------------------------+----------------------------+---------------------+-----------------------------|
-| actions | | | | * |
-|---------------------+--------------------------+----------------------------+---------------------+-----------------------------|
-| | | | | assertions |
-| | | | | concordance |
-| | | | | debug |
-| | | | | digest |
-| | | | | docbook |
-| | | | | epub |
-| | | | | html |
-| | | | | html-seg |
-| | | | | html-scroll |
-| | | | | manifest |
-| | | | | ocn |
-| | | | | odt |
-| | | | | pdf |
-| | | | | postgresql |
-| | | | | qrcode |
-| | | | | pod |
-| | | | | source |
-| | | | | sqlite |
-| | | | | sqlite-db-create |
-| | | | | sqlite-db-drop |
-| | | | | text |
-| | | | | verbose |
-| | | | | xhtml |
-| | | | | xml-dom |
-| | | | | xml-sax |
-| | | | | section_toc |
-| | | | | section_body |
-| | | | | section_endnotes |
-| | | | | section_glossary |
-| | | | | section_biblio |
-| | | | | section_bookindex |
-| | | | | section_blurb |
-| | | | | backmatter |
-| | | | | skip-output |
-|---------------------+--------------------------+----------------------------+---------------------+-----------------------------|
-| metadata | | | * | |
-|---------------------+--------------------------+----------------------------+---------------------+-----------------------------|
-| | | | classify | |
-| | | | - dewey | |
-| | | | - keywords | |
-| | | | - loc | |
-| | | | - subject | |
-| | | | - topic_register | |
-|---------------------+--------------------------+----------------------------+---------------------+-----------------------------|
-| | | | creator | |
-| | | | - author | |
-| | | | - author_email | |
-| | | | - illustrator | |
-| | | | - translator | |
-|---------------------+--------------------------+----------------------------+---------------------+-----------------------------|
-| | | | date | |
-| | | | - added_to_site | |
-| | | | - available | |
-| | | | - created | |
-| | | | - issued | |
-| | | | - modified | |
-| | | | - published | |
-| | | | - valid | |
-|---------------------+--------------------------+----------------------------+---------------------+-----------------------------|
-| | | | identifier | |
-| | | | - isbn | |
-| | | | - oclc | |
-| | | | - pg | |
-|---------------------+--------------------------+----------------------------+---------------------+-----------------------------|
-| | | | links | |
-| | | | - link | |
-|---------------------+--------------------------+----------------------------+---------------------+-----------------------------|
-| | | | notes | |
-| | | | - abstract | |
-| | | | - description | |
-|---------------------+--------------------------+----------------------------+---------------------+-----------------------------|
-| | | | original | |
-| | | | - language | |
-| | | | - source | |
-| | | | - title | |
-|---------------------+--------------------------+----------------------------+---------------------+-----------------------------|
-| | | | publisher | |
-| | | | - name | |
-|---------------------+--------------------------+----------------------------+---------------------+-----------------------------|
-| | | | rights | |
-| | | | - copyright | |
-| | | | - cover | |
-| | | | - illustrations | |
-| | | | - license | |
-|---------------------+--------------------------+----------------------------+---------------------+-----------------------------|
-| | | | title | |
-| | | | - edition | |
-| | | | - full | |
-| | | | - language | |
-| | | | - main | |
-| | | | - note | |
-| | | | - sub | |
-| | | | - subtitle | |
-|---------------------+--------------------------+----------------------------+---------------------+-----------------------------|
+|---------------------+-----------------------+-------------------------+---------------------+-----------------------------|
+| | 1. document make file | 2. config file | 3. document header | 4. command line instruction |
+|---------------------+-----------------------+-------------------------+---------------------+-----------------------------|
+| comment, fixed: | per dir (pod) | per dir | per document (pod) | per command instruction |
+|---------------------+-----------------------+-------------------------+---------------------+-----------------------------|
+| | config_document | config_local_site | | |
+|---------------------+-----------------------+-------------------------+---------------------+-----------------------------|
+| local site specific | | * | | *? |
+|---------------------+-----------------------+-------------------------+---------------------+-----------------------------|
+| | | webserv | | |
+| | | - url_root | | |
+| | | - path | | |
+| | | - images | | |
+| | | - cgi | | |
+|---------------------+-----------------------+-------------------------+---------------------+-----------------------------|
+| | | webserv_cgi | | |
+| | | - host | | |
+| | | - base_path | | |
+| | | - port | | |
+| | | - user | | |
+| | | - file_links | | |
+|---------------------+-----------------------+-------------------------+---------------------+-----------------------------|
+| | | processing | | |
+| | | - path | | |
+| | | - dir | | |
+| | | - concord_max | | |
+|---------------------+-----------------------+-------------------------+---------------------+-----------------------------|
+| | | flag (configure) | | (call) |
+| | | - act0 | | act0 |
+| | | - act1 | | act1 |
+| | | - act2 | | act2 |
+| | | - act3 | | act3 |
+| | | - act4 | | act4 |
+| | | - act5 | | act5 |
+| | | - act6 | | act6 |
+| | | - act7 | | act7 |
+| | | - act8 | | act8 |
+| | | - act9 | | act9 |
+|---------------------+-----------------------+-------------------------+---------------------+-----------------------------|
+| | | default | | |
+| | | - papersize | | |
+| | | - text_wrap | | |
+| | | - emphasis | | |
+| | | - language | | |
+| | | - digest | | |
+|---------------------+-----------------------+-------------------------+---------------------+-----------------------------|
+| | | permission | | |
+| | | - share_source | | |
+|---------------------+-----------------------+-------------------------+---------------------+-----------------------------|
+| | | program_select | | |
+| | | - editor | | |
+| | | - epub_viewer | | |
+| | | - html_viewer | | |
+| | | - odf_viewer | | |
+| | | - pdf_viewer | | |
+| | | - xml_viewer | | |
+|---------------------+-----------------------+-------------------------+---------------------+-----------------------------|
+| | | search | | |
+| | | - flag | | |
+| | | - action | | |
+| | | - db | | |
+| | | - title | | |
+|---------------------+-----------------------+-------------------------+---------------------+-----------------------------|
+| make instruction | ** | omit or override share? | ** | *? |
+|---------------------+-----------------------+-------------------------+---------------------+-----------------------------|
+| | make | make | make | |
+| | - bold | - bold | - bold | |
+| | - breaks | - breaks | - breaks | |
+| | - cover_image | - cover_image | - cover_image | |
+| | - css | - css | - css | |
+| | - emphasis | - emphasis | - emphasis | |
+| | - footer | - footer | - footer | |
+| | - headings | - headings | - headings | |
+| | - home_button_image | - home_button_image | - home_button_image | |
+| | - home_button_text | - home_button_text | - home_button_text | |
+| | - italics | - italics | - italics | |
+| | - num_top | - num_top | - num_top | |
+| | - auto_num_depth | - auto_num_depth | - auto_num_depth | |
+| | - substitute | - substitute | - substitute | |
+| | - texpdf_font | - texpdf_font | - texpdf_font | |
+|---------------------+-----------------------+-------------------------+---------------------+-----------------------------|
+| actions | | | | * |
+|---------------------+-----------------------+-------------------------+---------------------+-----------------------------|
+| | | | | assertions |
+| | | | | concordance |
+| | | | | debug |
+| | | | | digest |
+| | | | | docbook |
+| | | | | epub |
+| | | | | html |
+| | | | | html-seg |
+| | | | | html-scroll |
+| | | | | manifest |
+| | | | | ocn |
+| | | | | odt |
+| | | | | pdf |
+| | | | | postgresql |
+| | | | | qrcode |
+| | | | | pod |
+| | | | | source |
+| | | | | sqlite |
+| | | | | sqlite-db-create |
+| | | | | sqlite-db-drop |
+| | | | | text |
+| | | | | verbose |
+| | | | | xhtml |
+| | | | | xml-dom |
+| | | | | xml-sax |
+| | | | | section_toc |
+| | | | | section_body |
+| | | | | section_endnotes |
+| | | | | section_glossary |
+| | | | | section_biblio |
+| | | | | section_bookindex |
+| | | | | section_blurb |
+| | | | | backmatter |
+| | | | | skip-output |
+|---------------------+-----------------------+-------------------------+---------------------+-----------------------------|
+| metadata | | | * | |
+|---------------------+-----------------------+-------------------------+---------------------+-----------------------------|
+| | | | classify | |
+| | | | - dewey | |
+| | | | - keywords | |
+| | | | - loc | |
+| | | | - subject | |
+| | | | - topic_register | |
+|---------------------+-----------------------+-------------------------+---------------------+-----------------------------|
+| | | | creator | |
+| | | | - author | |
+| | | | - author_email | |
+| | | | - illustrator | |
+| | | | - translator | |
+|---------------------+-----------------------+-------------------------+---------------------+-----------------------------|
+| | | | date | |
+| | | | - added_to_site | |
+| | | | - available | |
+| | | | - created | |
+| | | | - issued | |
+| | | | - modified | |
+| | | | - published | |
+| | | | - valid | |
+|---------------------+-----------------------+-------------------------+---------------------+-----------------------------|
+| | | | identifier | |
+| | | | - isbn | |
+| | | | - oclc | |
+| | | | - pg | |
+|---------------------+-----------------------+-------------------------+---------------------+-----------------------------|
+| | | | links | |
+| | | | - link | |
+|---------------------+-----------------------+-------------------------+---------------------+-----------------------------|
+| | | | notes | |
+| | | | - abstract | |
+| | | | - description | |
+|---------------------+-----------------------+-------------------------+---------------------+-----------------------------|
+| | | | original | |
+| | | | - language | |
+| | | | - source | |
+| | | | - title | |
+|---------------------+-----------------------+-------------------------+---------------------+-----------------------------|
+| | | | publisher | |
+| | | | - name | |
+|---------------------+-----------------------+-------------------------+---------------------+-----------------------------|
+| | | | rights | |
+| | | | - copyright | |
+| | | | - cover | |
+| | | | - illustrations | |
+| | | | - license | |
+|---------------------+-----------------------+-------------------------+---------------------+-----------------------------|
+| | | | title | |
+| | | | - edition | |
+| | | | - full | |
+| | | | - language | |
+| | | | - main | |
+| | | | - note | |
+| | | | - sub | |
+| | | | - subtitle | |
+|---------------------+-----------------------+-------------------------+---------------------+-----------------------------|
diff --git a/org/spine_build_scaffold.org b/org/spine_build_scaffold.org
index 8f89a4a..39c275f 100644
--- a/org/spine_build_scaffold.org
+++ b/org/spine_build_scaffold.org
@@ -1,7 +1,7 @@
-*- mode: org -*-
#+TITLE: spine (doc_reform) (project) makefile
#+DESCRIPTION: makefile for spine
-#+FILETAGS: :spine:makefile:
+#+FILETAGS: :spine:build:tools:
#+AUTHOR: Ralph Amissah
#+EMAIL: [[mailto:ralph.amissah@gmail.com][ralph.amissah@gmail.com]]
#+COPYRIGHT: Copyright (C) 2015 - 2020 Ralph Amissah
@@ -15,10 +15,63 @@
#+PROPERTY: header-args+ :cache no
#+PROPERTY: header-args+ :padline no
-[[./spine.org][spine.org]] [[../org/][org/]]
-[[./spine_info.org][spine_info.org]]
+[[./spine.org][spine.org]] VERSION
+[[./spine_info.org][spine_info.org]] [[../org/][org/]]
-* makefile :makefile:
+* version info VERSION :version:set:project:
+** project
+
+#+NAME: version_spine
+#+BEGIN_SRC sh
+0.11.1
+#+END_SRC
+
+** subprojects
+
+- d2sqlite3
+
+#+NAME: version_d2sqlite3
+#+BEGIN_SRC sh
+0.19.1
+#+END_SRC
+
+- imageformats
+
+#+NAME: version_imageformats
+#+BEGIN_SRC sh
+7.0.2
+#+END_SRC
+
+- dyaml
+
+#+NAME: version_dyaml
+#+BEGIN_SRC sh
+0.8.0
+#+END_SRC
+
+- tinyendian
+
+#+NAME: version_tinyendian
+#+BEGIN_SRC sh
+0.2.0
+#+END_SRC
+
+** build tools if specified
+
+- meson
+
+#+NAME: version_meson
+#+BEGIN_SRC sh
+0.46
+#+END_SRC
+
+- soversion
+
+#+NAME: version_soversion
+0
+#+END_SRC
+
+* makefile :makefile:
** tangle
#+BEGIN_SRC makefile :tangle ../makefile
@@ -75,8 +128,8 @@
<<make_phony>>
#+END_SRC
-** settings [+2] :settings:
-*** git version stamp :git:version:
+** settings [+2] :settings:
+*** git version stamp :git:version:
#+NAME: make_set_var_0_git_version
#+BEGIN_SRC makefile
@@ -84,7 +137,7 @@ PROG_VER_GIT :=$(shell echo `git describe --long --tags | sed -e "s/^[ a-z_-]\+\
PROG_VER_DECLARED :=$(shell echo `cat ./views/version.txt | grep --color=never "enum" | sed 's/.\+(\([0-9]\+\),[ \t]\+\([0-9]\+\),[ \t]\+\([0-9]\+\)[ \t]*).\+/\1.\2.\3/g'`)
#+END_SRC
-*** dub (build tool) :dub:
+*** dub (build tool) :dub:
#+NAME: make_set_var_1_dub
#+BEGIN_SRC makefile
@@ -92,7 +145,7 @@ DUB=dub
DUB_FLAGS=-v --force --compiler=
#+END_SRC
-*** Project Details :project:spine:
+*** Project Details :project:spine:
#+NAME: make_set_var_2_project_details
#+BEGIN_SRC makefile
@@ -106,7 +159,7 @@ PRG_BINDIR=./bin
PRG_DOCDIR=./docs
#+END_SRC
-*** Emacs Org settings :settings:emacs:org:tangle:
+*** Emacs Org settings :settings:emacs:org:tangle:
#+NAME: make_set_var_3_emacs_org
#+BEGIN_SRC makefile
@@ -214,7 +267,7 @@ markup_dir_samples:
find data/sisudir/media/text -name *.ss[tm] | sort
#+END_SRC
-** _make_ commands [+2] :make:commands:
+** _make_ commands [+2] :make:commands:
- build commands
- build
@@ -231,9 +284,9 @@ markup_dir_samples:
- git snapshot
- gitsnapshot
-*** build commands [+1] :build:compile:
-**** _dub_ build rebuild :dub:
-***** all compiler builds :all:dmd:gdc:ldc:
+*** build commands [+1] :build:compile:
+**** _dub_ build rebuild :dub:
+***** all compiler builds :all:dmd:gdc:ldc:
****** all builds
******* default
@@ -248,29 +301,29 @@ dub_upgrade:
default: ldc
#+END_SRC
-******* quick :quick:
-******** default :default:
+******* quick :quick:
+******** default :default:
#+NAME: make_compile_1_compiler_all
#+BEGIN_SRC makefile
all: dmd ldc gdc
#+END_SRC
-******** version :version:
+******** version :version:
#+NAME: make_compile_2_compiler_all_versioned
#+BEGIN_SRC makefile
all_ver: dmd_ver ldc_ver gdc_ver
#+END_SRC
-******** debug :debug:
+******** debug :debug:
#+NAME: make_compile_3_compiler_all_debug
#+BEGIN_SRC makefile
all_debug: dmd_debug gdc_debug ldc_debug
#+END_SRC
-******** _meson_ build :meson:
+******** _meson_ build :meson:
meson using dub
- works & looks pretty clean
@@ -289,22 +342,22 @@ meson_project_build_clean: clean skel tangle dub_upgrade meson_build
meson: meson_clean_build_dir dub_upgrade meson_build
#+END_SRC
-******* clean & tangle :clean:tangle:
-******** default :default:
+******* clean & tangle :clean:tangle:
+******** default :default:
#+NAME: make_clean_tangle_compile_0_all_clean
#+BEGIN_SRC makefile
all_clean: clean tangle dmd ldc gdc
#+END_SRC
-******** version :version:
+******** version :version:
#+NAME: make_clean_tangle_compile_1_all_clean_versioned
#+BEGIN_SRC makefile
all_ver_clean: clean tangle dmd_ver ldc_ver gdc_ver
#+END_SRC
-******** debug :debug:
+******** debug :debug:
#+NAME: make_clean_tangle_compile_2_all_clean_debug
#+BEGIN_SRC makefile
@@ -312,10 +365,10 @@ 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
#+END_SRC
-***** individual compiler builds :each:
-****** dmd :dmd:
-******* quick :quick:
-******** default :default:
+***** individual compiler builds :each:
+****** dmd :dmd:
+******* quick :quick:
+******** default :default:
#+NAME: make_dub_compile_dmd_0_default
#+BEGIN_SRC makefile
@@ -324,7 +377,7 @@ dmd: dub_upgrade
notify-send -t 0 'D dmd compiled test release executable ready' 'spine-dmd'
#+END_SRC
-******** debug :debug:
+******** debug :debug:
#+NAME: make_dub_compile_dmd_1_debug
#+BEGIN_SRC makefile
@@ -332,7 +385,7 @@ dmd_debug:
$(DUB) --compiler=dmd --config=dmd --build=debug
#+END_SRC
-******** version :version:
+******** version :version:
- assumes git tags with program version
@@ -345,7 +398,7 @@ dmd_ver: dub_upgrade
dmd_clean_ver: clean tangle dmd_ver
#+END_SRC
-******* clean & tangle :clean:tangle:
+******* clean & tangle :clean:tangle:
#+NAME: make_dub_compile_dmd_3_release
#+BEGIN_SRC makefile
@@ -358,9 +411,9 @@ dmd_debug_tangle: tangle
$(DUB) --compiler=dmd --config=spine-dmd-debug
#+END_SRC
-****** gdc :gdc:
-******* quick :quick:
-******** default :default:
+****** gdc :gdc:
+******* quick :quick:
+******** default :default:
#+NAME: make_dub_compile_gdc_0_default
#+BEGIN_SRC makefile
@@ -369,7 +422,7 @@ gdc: dub_upgrade
notify-send -t 0 'D gdc compiled test release executable ready' 'spine-gdc'
#+END_SRC
-******** debug :debug:
+******** debug :debug:
#+NAME: make_dub_compile_gdc_1_debug
#+BEGIN_SRC makefile
@@ -377,7 +430,7 @@ gdc_debug:
$(DUB) --compiler=gdc --config=gdc --build=debug
#+END_SRC
-******** version :version:
+******** version :version:
- assumes git tags with program version
@@ -390,7 +443,7 @@ gdc_ver: dub_upgrade
gdc_clean_ver: clean tangle gdc_ver
#+END_SRC
-******* clean & tangle :clean:tangle:
+******* clean & tangle :clean:tangle:
#+NAME: make_dub_compile_gdc_3_release
#+BEGIN_SRC makefile
@@ -403,9 +456,9 @@ gdc_debug_tangle: tangle
$(DUB) --compiler=gdc --config=spine-gdc-debug
#+END_SRC
-****** ldc :ldc:
-******* quick :quick:
-******** default :default:
+****** ldc :ldc:
+******* quick :quick:
+******** default :default:
#+NAME: make_dub_compile_ldc_0_default
#+BEGIN_SRC makefile
@@ -414,7 +467,7 @@ ldc: dub_upgrade
notify-send -t 0 'D ldc compiled test release executable ready' 'spine-ldc'
#+END_SRC
-******** debug :debug:
+******** debug :debug:
#+NAME: make_dub_compile_ldc_1_debug
#+BEGIN_SRC makefile
@@ -422,7 +475,7 @@ ldc_debug:
$(DUB) --compiler=ldc2 --config=ldc --build=debug
#+END_SRC
-******** version :version:
+******** version :version:
- assumes git tags with program version
@@ -435,7 +488,7 @@ ldc_ver: dub_upgrade
ldc_clean_ver: clean tangle ldc_ver
#+END_SRC
-******* clean & tangle :clean:tangle:
+******* clean & tangle :clean:tangle:
#+NAME: make_dub_compile_ldc_3_release
#+BEGIN_SRC makefile
@@ -449,7 +502,7 @@ ldc_debug_tangle: tangle
#+END_SRC
***** generic
-****** init clean distclean etc. :clean:
+****** init clean distclean etc. :clean:
#+NAME: make_initialization_operations_0_parts
#+BEGIN_SRC makefile
@@ -507,7 +560,7 @@ distclean_and_init: expunge
mkdir -p $(PRG_BINDIR);
#+END_SRC
-****** version :version:
+****** version :version:
#+NAME: make_initialization_operations_1_git_version
#+BEGIN_SRC makefile
@@ -515,7 +568,7 @@ ver:
echo spine-$(PROG_VER_DECLARED)-tag-$(PROG_VER_GIT)
#+END_SRC
-****** tangle build rebuild :clean:tangle:build:
+****** tangle build rebuild :clean:tangle:build:
#+NAME: make_initialization_operations_2_assemble
#+BEGIN_SRC makefile
@@ -531,8 +584,8 @@ makefile_new:
restart: clean tangle
#+END_SRC
-*** testrun (program against document markup)
-**** pods
+*** testrun (program against document markup) :markup:sample:
+**** pods :pod:
****** find files
#+NAME: make_project_testrun_0_find_pods
@@ -731,7 +784,7 @@ ldc_testrun_paths_pod_all:
$(SiSU_MARKUP_SAMPLES_POD)
#+END_SRC
-**** dir
+**** dir :dir:
***** dmd
****** find files
@@ -897,7 +950,7 @@ ldc_testrun_filelist_dir_all:
$(SiSU_MARKUP_SAMPLES_DIR)
#+END_SRC
-*** org babel tangle batch process command :tangle:
+*** org babel tangle batch process command :tangle:
**** tangle: org babel tangle *.org
#+NAME: make_tangle_0
@@ -922,7 +975,7 @@ tangle: skel
(kill-buffer)) '($$ORGFILES)))" 2>&1
#+END_SRC
-**** tangle maker: org babel tangle maker.org, makefile new
+**** tangle maker: org babel tangle makefile new
#+NAME: make_tangle_1
#+BEGIN_SRC makefile
@@ -978,7 +1031,7 @@ gitsnapshot: distclean tangle
git commit -a
#+END_SRC
-** phony :phony:
+** phony :phony:
#+NAME: make_phony
#+BEGIN_SRC makefile
@@ -987,17 +1040,17 @@ gitsnapshot: distclean tangle
tangle gitsnapshot
#+END_SRC
-* dub.json TODO (subproject versions) :dub:json:config:
+* dub.json :dub:config:json:
** dub.json
-#+BEGIN_SRC sh :tangle ../dub.json
+#+BEGIN_SRC json :tangle ../dub.json
{
"authors": [
"Ralph Amissah"
],
"copyright": "Copyright © 2015 - 2020 Ralph Amissah",
"name": "spine",
- "version": "0.11.1",
+ "version": "<<version_spine>>",
"description": "a sisu like document parser",
"homepage": "http://sisudoc.org",
"license": "AGPL-3.0+",
@@ -1020,10 +1073,10 @@ gitsnapshot: distclean tangle
}
},
"dependencies": {
- "d2sqlite3": "~>0.19.1",
- "imageformats": "~>7.0.2",
- "dyaml": "~>0.8.0",
- "tinyendian": "~>0.2.0"
+ "d2sqlite3": "~><<version_d2sqlite3>>",
+ "imageformats": "~><<version_imageformats>>",
+ "dyaml": "~><<version_dyaml>>",
+ "tinyendian": "~><<version_tinyendian>>"
},
"configurations": [
{
@@ -1064,10 +1117,10 @@ gitsnapshot: distclean tangle
"targetType": "executable",
"platforms": [ "posix" ],
"dependencies": {
- "d2sqlite3": "~>0.19.1",
- "imageformats": "~>7.0.2",
- "dyaml": "~>0.8.0",
- "tinyendian": "~>0.2.0"
+ "d2sqlite3": "~><<version_d2sqlite3>>",
+ "imageformats": "~><<version_imageformats>>",
+ "dyaml": "~><<version_dyaml>>",
+ "tinyendian": "~><<version_tinyendian>>"
},
"subConfigurations": {
"d2sqlite3": "all-included"
@@ -1101,12 +1154,12 @@ gitsnapshot: distclean tangle
}
#+END_SRC
-* dub.sdl :dub:sdl:config:
+* dub.sdl :dub:config:sdl:
Every DUB package should contain a [[http://code.dlang.org/package-format?lang=json][dub.json]] (or [[http://code.dlang.org/package-format?lang=sdl][dub.sdl]])
not configured here using dub.json for the moment
-** header (including dependencies) :header:
+** header (including dependencies) :header:
#+BEGIN_SRC sh :NO-tangle ../dub.sdl :tangle-mode (identity #o755) :shebang #!/usr/bin/env dub
name "spine"
@@ -1121,11 +1174,11 @@ stringImportPaths "./views"
buildRequirements "allowWarnings"
targetType "executable"
platforms "posix"
-dependency "d2sqlite3" version="~>0.18.3" # https://code.dlang.org/packages/d2sqlite3 http://biozic.github.io/d2sqlite3/d2sqlite3
+dependency "d2sqlite3" version="~><<version_d2sqlite3>>" # https://code.dlang.org/packages/d2sqlite3 http://biozic.github.io/d2sqlite3/d2sqlite3
subconfiguration "d2sqlite3" "all-included"
-dependency "imageformats" version="~>7.0.2" # https://code.dlang.org/packages/imageformats https://github.com/lgvz/imageformats
-dependency "dyaml" version="~>0.8.0" # https://code.dlang.org/packages/dyaml https://github.com/dlang-community/D-YAML
-dependency "tinyendian" version="~>0.2.0" # http://code.dlang.org/packages/tinyendian https://github.com/dlang-community/tinyendian // dyaml dependency
+dependency "imageformats" version="~><<version_imageformats>>" # https://code.dlang.org/packages/imageformats https://github.com/lgvz/imageformats
+dependency "dyaml" version="~><<version_dyaml>>" # https://code.dlang.org/packages/dyaml https://github.com/dlang-community/D-YAML
+dependency "tinyendian" version="~><<version_tinyendian>>" # http://code.dlang.org/packages/tinyendian https://github.com/dlang-community/tinyendian // dyaml dependency
#+END_SRC
** default
@@ -1141,7 +1194,7 @@ configuration "default" {
}
#+END_SRC
-** dmd
+** dmd :dmd:
time (dub --compiler=dmd -color --config=dmd --build=dmd)
time (dub --compiler=dmd -color --config=dmd --build=dmd-release)
@@ -1172,7 +1225,7 @@ configuration "dmd-version" {
buildOptions "verbose" "optimize" "inline" // ok works takes ages to compile
buildOptions "verbose" "releaseMode" "optimize" "inline" // broken, runtime errors
-** ldc
+** ldc :ldc:
time (dub --compiler=ldc2 -color --config=ldc --build=ldc)
time (dub --compiler=ldc2 -color --config=ldc --build=ldc-release)
@@ -1204,7 +1257,7 @@ configuration "ldc-version" {
}
#+END_SRC
-** gdc
+** gdc :gdc:
time (dub --compiler=gdc --config=gdc --build=gdc)
time (dub --compiler=gdc --config=gdc --build=gdc-release)
@@ -1234,8 +1287,8 @@ configuration "gdc-version" {
}
#+END_SRC
-*** generic :generic:
-**** build (sdp) :release:
+*** generic :generic:
+**** build (sdp) :release:
#+BEGIN_SRC sh
configuration "build" {
@@ -1249,7 +1302,7 @@ configuration "build" {
}
#+END_SRC
-* meson
+* meson :meson:build:
** notes
http://mesonbuild.com/D.html
@@ -1272,7 +1325,7 @@ http://mesonbuild.com/Dependencies.html#Dub
- flags
DFLAGS= DC=ldc2 meson ..
-*** projects
+*** projects :project:
ls -1 ./src/*/**/*.d
tree -fi ./src |rg "\.d$"
@@ -1283,13 +1336,13 @@ for i in spine_sources.txt; do; \
sed -i "s/\(.\+\.d$\)/ '\1',/g" $i; done && \
cat spine_sources.txt
-**** project meson.build
+**** project meson.build :filelist:
#+BEGIN_SRC sh :tangle ../meson.build
project('spine', 'd',
license: 'AGPL-3',
- version: '0.11.1',
- meson_version: '>=0.46'
+ version: '<<version_spine>>',
+ meson_version: '>=<<version_meson>>'
)
#if meson.get_compiler('d').get_id() == 'gcc'
# error('spine cannot be compiled with GDC at time. Sorry.')
@@ -1338,10 +1391,10 @@ spine_src = [
source_root = meson.source_root()
src_dir = include_directories('src/')
# Dependencies
-dep_tinyendian = dependency('tinyendian', version: '>= 0.2.0', fallback: ['tinyendian', 'tinyendian_dep'], method: 'dub')
-dep_dyaml = dependency('dyaml', version: '>= 0.8.0', fallback: ['dyaml', 'dyaml_dep'], method: 'dub')
-dep_d2sqlite3 = dependency('d2sqlite3', version: '>= 0.18.3', fallback: ['d2sqlite3', 'd2sqlite3_dep'], method: 'dub')
-dep_imageformats = dependency('imageformats', version: '>= 7.0.2', fallback: ['imageformats', 'imageformats_dep'], method: 'dub')
+dep_tinyendian = dependency('tinyendian', version: '>= <<version_tinyendian>>', fallback: ['tinyendian', 'tinyendian_dep'], method: 'dub')
+dep_dyaml = dependency('dyaml', version: '>= <<version_dyaml>>', fallback: ['dyaml', 'dyaml_dep'], method: 'dub')
+dep_d2sqlite3 = dependency('d2sqlite3', version: '>= <<version_d2sqlite3>>', fallback: ['d2sqlite3', 'd2sqlite3_dep'], method: 'dub')
+dep_imageformats = dependency('imageformats', version: '>= <<version_imageformats>>', fallback: ['imageformats', 'imageformats_dep'], method: 'dub')
# Executable
spine_exe = executable('spine',
[spine_src],
@@ -1357,7 +1410,7 @@ spine_exe = executable('spine',
)
#+END_SRC
-** meson subprojects [taken care of using dub]
+** meson subprojects [taken care of using dub] :subprojects:
*** README
#+BEGIN_SRC txt :tangle ../subprojects/README
@@ -1385,7 +1438,7 @@ spine_exe = executable('spine',
- https://github.com/dlang-community/tinyendian.git
#+END_SRC
-*** d2sqlite3
+*** d2sqlite3 :d2sqlite3:
**** wrap
#+BEGIN_SRC sh :tangle ../subprojects/d2sqlite3.wrap
@@ -1399,12 +1452,12 @@ revision = head
#+BEGIN_SRC sh :NO-tangle ../subprojects/d2sqlite3.meson.build
project('d2sqlite3', 'd',
- meson_version: '>=0.46',
+ meson_version: '>=<<version_meson>>',
license: 'BSL-1.0',
- version: '0.18.3'
+ version: '<<version_d2sqlite3>>'
)
-project_soversion = '0'
+project_soversion = '<<version_soversion>>'
src_dir = include_directories('source/')
pkgc = import('pkgconfig')
@@ -1448,7 +1501,7 @@ d2sqlite3_dep = declare_dependency(
)
#+END_SRC
-*** dyaml
+*** dyaml :dyaml:
**** wrap
#+BEGIN_SRC sh :tangle ../subprojects/dyaml.wrap
@@ -1464,12 +1517,12 @@ Upstream provides meson.build
#+BEGIN_SRC sh :NO-tangle ../subprojects/D-YAML/meson.build
project('D-YAML', 'd',
- meson_version: '>=0.40.0',
+ meson_version: '>=<<version_meson>>',
subproject_dir: 'contrib',
- version: '0.8.0'
+ version: '<<version_dyaml>>'
)
-project_soversion = '0'
+project_soversion = '<<version_soversion>>'
src_dir = include_directories('source/')
pkgc = import('pkgconfig')
@@ -1510,7 +1563,7 @@ dyaml_src = [
]
install_subdir('source/dyaml', install_dir: 'include/d/yaml/')
-tinyendian_dep = dependency('tinyendian', version: '>=0.2.0', fallback: ['tinyendian', 'tinyendian_dep'])
+tinyendian_dep = dependency('tinyendian', version: '>=<<version_tinyendian>>', fallback: ['tinyendian', 'tinyendian_dep'])
dyaml_lib = library('dyaml',
[dyaml_src],
@@ -1535,7 +1588,7 @@ dyaml_dep = declare_dependency(
)
#+END_SRC
-*** imageformats
+*** imageformats :imageformats:
**** wrap
#+BEGIN_SRC sh :tangle ../subprojects/imageformats.wrap
@@ -1549,12 +1602,12 @@ revision = head
#+BEGIN_SRC sh :NO-tangle ../subprojects/imageformats.meson.build
project('imageformats', 'd',
- meson_version: '>=0.46',
+ meson_version: '>=<<version_meson>>',
license: 'BSL-1.0',
- version: '7.0.2'
+ version: '<<version_imageformats>>'
)
-project_soversion = '0'
+project_soversion = '<<version_soversion>>'
src_dir = include_directories('.')
pkgc = import('pkgconfig')
@@ -1590,7 +1643,7 @@ imageformats_dep = declare_dependency(
)
#+END_SRC
-*** tinyendian (dyaml dependency)
+*** tinyendian (dyaml dependency) :tinyendian:
**** wrap
#+BEGIN_SRC sh :tangle ../subprojects/tinyendian.wrap
@@ -1610,8 +1663,8 @@ Upstream provides meson.build
project(
'tinyendian',
'd',
- meson_version: '>=0.41',
- version: '0.2.0',
+ meson_version: '>=<<version_meson>>',
+ version: '<<version_tinyendian>>',
default_options: ['buildtype=release'],
)
@@ -1648,13 +1701,13 @@ tinyendian_dep = declare_dependency(
)
#+END_SRC
-* nix
+* nix :nix:
- default.nix
- shell.nix
- dub2.nix
-** dub2nix notes (from author (Lionello Lunesu) email reply, 2020-10-12)
+** dub2nix notes (from author (Lionello Lunesu) email reply, 2020-10-12) NOTE
- https://github.com/lionello/dub2nix
@@ -1691,7 +1744,7 @@ in mkShell {
"license": "AGPL-3",
"name": "d2sqlite3_dub2nix",
"dependencies": {
- "d2sqlite3": "~>0.19.1"
+ "d2sqlite3": "~><<version_d2sqlite3>>"
},
"subConfigurations": {
"d2sqlite3": "with-lib"
@@ -1725,7 +1778,7 @@ make modificatons if desired
- run: nix-build
-** envrc
+** envrc :envrc:
#+BEGIN_SRC nix :tangle ../.envrc
if type lorri &>/dev/null; then
@@ -1743,8 +1796,8 @@ if [ -e .envrc-local ]; then
fi
#+END_SRC
-** shells shell.nix
-*** dmd shell
+** shells shell.nix :shell:
+*** dmd shell :dmd:
- ln -sf nixDevEnv/shells/shell-dmd-verNix.nix shell.nix
- ln -sf nixDevEnv/shells/shell-dmd-verUser.nix shell.nix
@@ -1783,7 +1836,7 @@ in pkgs.mkShell {
}
#+END_SRC
-*** ldc shell
+*** ldc shell :ldc:
- ln -sf nixDevEnv/shells/shell-ldc-verNix.nix shell.nix
- ln -sf nixDevEnv/shells/shell-ldc-verUser.nix shell.nix
@@ -1839,7 +1892,7 @@ dub2nix-src = fetchTarball {
dub2nix = (import dub2nix-src) { inherit pkgs; };
#+END_SRC
-**** overlays
+**** overlays :overlays:
#+NAME: nix_shell_overlay_none
#+BEGIN_SRC nix
@@ -1900,7 +1953,7 @@ buildInputs = with pkgs; [
];
#+END_SRC
-*** shell with dmd & ldc
+*** shell with dmd & ldc :shell:
#+NAME: nix_shell_with_compilers_dmd_and_ldc
#+BEGIN_SRC nix
@@ -1928,7 +1981,7 @@ in pkgs.mkShell {
}
#+END_SRC
-*** dub2nix version
+*** dub2nix version :dub2nix:
#+BEGIN_SRC nix
dub2nix-src = fetchTarball {
@@ -1937,7 +1990,7 @@ in pkgs.mkShell {
};
#+END_SRC
-** default.nix
+** default.nix :default:
#+BEGIN_SRC txt :tangle ../default.nix
<<nix_project>>
@@ -1955,7 +2008,7 @@ in pkgs.mkShell {
with import ./mkDub.nix { inherit pkgs; };
mkDubDerivation rec {
name = "spine-${version}";
- version = "0.11.1";
+ version = "<<version_spine>>";
src = ./.;
buildInputs = [ pkgs.sqlite ];
meta = with stdenv.lib; {
@@ -1968,7 +2021,7 @@ mkDubDerivation rec {
}
#+END_SRC
-** mkDub.nix TODO
+** mkDub.nix :mkDub:
Get current mkDub.nix from the dub2nix project:
@@ -2102,7 +2155,7 @@ in {
}
#+END_SRC
-*** mkDub ldc
+*** mkDub ldc HACK
#+BEGIN_SRC nix :tangle ../nixDevEnv/dub/mkDub-ldc.nix
{ pkgs ? import <nixpkgs> {},
@@ -2232,9 +2285,9 @@ in {
}
#+END_SRC
-** overlays
+** overlays :overlay:
*** compilers (latest versions) [version information set elsewhere]
-**** ldcVersion.nix overlay
+**** ldcVersion.nix overlay :ldc:version:
#+BEGIN_SRC nix :tangle ../nixDevEnv/overlays/ldcVersion.nix
self: super: rec {
@@ -2254,7 +2307,7 @@ self: super: rec {
}
#+END_SRC
-**** dmdVersion.nix overlay
+**** dmdVersion.nix overlay HACK :dmd:version:
no working overlay, tangle to work on
@@ -2276,16 +2329,16 @@ self: super: rec {
}
#+END_SRC
-** version info TODO
+** version info REVIEW :version:
- https://dlang.org/download.html
-*** compilers (set latest versions) TODO
-**** ldc
+*** compilers (set latest versions) :compiler:version:
+**** ldc VERSION :version:set:ldc:
- https://github.com/ldc-developers/ldc/releases
-***** 1.24.0
+***** 1.24.0 HACK
- https://github.com/ldc-developers/ldc/releases/tag/v1.24.0
- nix-prefetch-url https://github.com/ldc-developers/ldc/releases/download/v1.24.0/ldc-1.24.0-src.tar.gz
@@ -2309,7 +2362,7 @@ version = "1.23.0";
sha256 = "1fdgj222x29as466vdxy9c0m82zzlsb7vnvvh89n2riszcrx463d";
#+END_SRC
-**** dmd
+**** dmd :dmd:
https://dlang.org/changelog/index.html
https://dlang.org/changelog/pending.html
http://downloads.dlang.org/releases/
@@ -2322,7 +2375,7 @@ sha256 = "0xhm8m46ahfx3hcibi3vws02zaplny3226f3x8cd8584gzfqyzxp";
year = "2020";
#+END_SRC
-* .gitignore :gitignore:
+* .gitignore :gitignore:
#+BEGIN_SRC sh :tangle ../.gitignore
# git ls-files --others --exclude-from=.git/info/exclude
@@ -2399,7 +2452,7 @@ tmp/**
#.reggae/**
#+END_SRC
-* sh script to batch process _emacs org babel tangle_ :shell_script:tangle:
+* sh script to batch process _emacs org babel tangle_ :shell_script:tangle:
[[http://orgmode.org/manual/Batch-execution.html]]
creates a shell batch script called "tangle", that will tangle (emacs org
babel tangle) org files in ./org/ to create .d source files in ./src/doc_reform/
@@ -2471,20 +2524,20 @@ time make tangle ldc
time make ldc_testrun_find_pod_epub
#+END_SRC
-** dub zfunc :zfunc:
-*** ,dubdmd :dmd:
+** dub zfunc :zfunc:
+*** ,dubdmd :dmd:
#+BEGIN_SRC sh :tangle no
time dub --compiler=dmd -v --force
#+END_SRC
-*** ,dubldc :ldc:
+*** ,dubldc :ldc:
#+BEGIN_SRC sh :tangle no
time dub --compiler=ldc2 -v --force
#+END_SRC
-*** ,dubgdc :gdc:
+*** ,dubgdc :gdc:
#+BEGIN_SRC sh :tangle no
time dub --compiler=gdc -v --force
@@ -2545,7 +2598,7 @@ time make ldc_testrun_filelist_dir_pod
[[http://wiki.dlang.org/Compilers][D Compilers wiki https://wiki.dlang.org/Compilers]]
[[http://dlang.org/download.html][D Compilers download http://dlang.org/download.html]]
-*** dub :dub:
+*** dub :dub:
https://github.com/dlang/dub/
http://code.dlang.org/getting_started
diff --git a/org/util_cgi_d_sqlite_search.org b/org/util_cgi_d_sqlite_search.org
index e2f3cfd..4225833 100644
--- a/org/util_cgi_d_sqlite_search.org
+++ b/org/util_cgi_d_sqlite_search.org
@@ -15,7 +15,8 @@
#+PROPERTY: header-args+ :cache no
#+PROPERTY: header-args+ :padline no
-[[../maker.org][maker.org makefile]] [[./][org/]]
+[[./spine.org][spine.org]] [[../org/][org/]]
+[[./spine_build_scaffold.org][make/build]]
* cgi search
@@ -1167,7 +1168,7 @@ mainSourceFile "src/spine_cgi_sqlite_search.d"
configuration "default" {
targetType "executable"
targetName "spine-search"
- postGenerateCommands "/usr/bin/notify-send -t 0 'D executable ready' 'spine cgi sqlite search d'"
+ postGenerateCommands "notify-send -t 0 'D executable ready' 'spine cgi sqlite search d'"
}
#+END_SRC