update sdlang, start looking to using dub remote dependenciesdoc-reform_v0.0.6

1 files changed, 284 insertions, 139 deletions

diff --git a/maker.org b/maker.org
index aa7db86..c701391 100644
--- a/maker.org
+++ b/maker.org
@@ -184,6 +184,7 @@ PRG_SRC=$(PRG_NAME).d
 PRG_SRCDIR=./src
 PRG_BIN=$(PRG_NAME)
 PRG_BINDIR=./bin
+PRG_DOCDIR=./docs
 #+END_SRC
 
 *** Emacs Org settings                            :settings:emacs:org:tangle:
@@ -247,39 +248,50 @@ debug_dub: $(PRG_SRCDIR)/$(PRG_SRC)
 #+BEGIN_SRC makefile :tangle makefile
 # dmd
 dub_dmd_release: expunge skel tangle
-	$(DUB) $(DUB_FLAGS)dmd --config=sdp-release
+	$(DUB) --config=sdp-release
 dub_dmd_release_stamp: clean_src skel tangle
-	$(DUB) $(DUB_FLAGS)dmd --config=sdp-dmd
+	$(DUB) --config=sdp-dmd
 dub_dmd_test_release: tangle
-	$(DUB) $(DUB_FLAGS)dmd --config=sdp-dmd
+	$(DUB) --config=sdp-dmd
 dub_dmd_debug: tangle
-	$(DUB) $(DUB_FLAGS)dmd --config=sdp-debug-dmd
+	$(DUB) --config=sdp-debug-dmd
+dub_dmd_debug_unittest: tangle
+	$(DUB) --config=sdp-debug-unittest-dmd
+dub_dmd_debug_docs: clean_docs tangle
+	$(DUB) --config=sdp-debug-docs-dmd
 dub_dmd_debug_clean: tangle
-	$(DUB) $(DUB_FLAGS)dmd --config=sdp-debug-clean
+	$(DUB) --config=sdp-debug-clean
 dub_dmd_tmp: tangle
-	$(DUB) $(DUB_FLAGS)dmd --config=sdp-tmp
+	$(DUB) --config=sdp-tmp
 dub_dmd_debug_src:
-	$(DUB) $(DUB_FLAGS)dmd --config=sdp-debug
+	$(DUB) --config=sdp-debug
 #+END_SRC
 
 ****** ldc
 #+BEGIN_SRC makefile :tangle makefile
 # ldc2
 dub_ldc_release: expunge skel tangle
-	$(DUB) $(DUB_FLAGS)ldc2 --config=sdp-release
+	$(DUB) --config=sdp-release
 dub_ldc_release_stamp: clean_src skel tangle
-	$(DUB) $(DUB_FLAGS)ldc2 --config=sdp-ldc
+	$(DUB) --config=sdp-ldc
 dub_ldc_test_release: tangle
-	$(DUB) $(DUB_FLAGS)ldc2 --config=sdp-ldc
+	$(DUB) --config=sdp-ldc
 dub_ldc_debug: tangle
-	$(DUB) $(DUB_FLAGS)ldc2 --config=sdp-debug-ldc
+	$(DUB) --config=sdp-debug-ldc
+dub_ldc_debug_unittest: tangle
+	$(DUB) --config=sdp-debug-unittest-ldc
+dub_ldc_debug_docs: clean_docs tangle
+	$(DUB) --config=sdp-debug-docs-ldc
 dub_ldc_debug_clean: tangle
-	$(DUB) $(DUB_FLAGS)ldc2 --config=sdp-debug-clean
+	$(DUB) --config=sdp-debug-clean
 dub_ldc_tmp: tangle
-	$(DUB) $(DUB_FLAGS)ldc2 --config=sdp-tmp
+	$(DUB) --config=sdp-tmp
 dub_ldc_debug_src:
-	$(DUB) $(DUB_FLAGS)ldc2 --config=sdp-debug
-# test releases
+	$(DUB) --config=sdp-debug
+#+END_SRC
+
+****** test releases
+#+BEGIN_SRC makefile :tangle makefile
 dub_release_test_dmd: tangle dub_dmd_release_test
 dub_release_test_ldc: tangle dub_ldc_release_test
 #+END_SRC
@@ -378,10 +390,15 @@ clean_src:
 	rm -f $(PRG_SRCDIR)/*; \
 	rm -rf $(PRG_SRCDIR)/$(PRG_NAME); \
 
+clean_docs:
+	rm -rf $(PRG_DOCDIR)
+
 expunge:
+	rm -f dub.selections.json; \
 	rm -f $(PRG_SRCDIR)/*; \
 	rm -rf $(PRG_SRCDIR)/$(PRG_NAME); \
-	rm -rf $(PRG_BINDIR);
+	rm -rf $(PRG_BINDIR); \
+	rm -rf $(PRG_DOCDIR);
 
 distclean: expunge
 
@@ -469,47 +486,58 @@ targetPath        "./bin"
 sourcePath        "./src"
 stringImportPaths "./views"
 buildRequirements "allowWarnings"
+dependency        "sdlang-d" version="~>0.10.0"
 #+END_SRC
 
-**** configuration generic                                           :generic:
+**** configuration generic                                          :generic:
 #+BEGIN_SRC sh  :tangle dub.sdl
-configuration     "sdp-release" {
-  name            "release"
-  targetType      "executable"
-  platforms       "posix"
-  targetName      "sdp"
-  buildOptions    "releaseMode" "optimize" "inline"
+configuration "sdp-release" {
+  name                 "release"
+  targetType           "executable"
+  platforms            "posix"
+  #compiler             "dmd"
+  targetName           "sdp"
+  dflags               "-J=views" "-I=src/sdp"
+  buildOptions         "verbose" "releaseMode" "optimize" "inline"
   postGenerateCommands "/usr/bin/notify-send -t 0 'D release executable ready' 'sdp'"
 }
-configuration     "sdp-debug" {
-  name            "debuging"
-  targetType      "executable"
-  platforms       "posix"
-  targetName      "sdp-debug"
-  debugVersions   "checkdoc"
-  debugVersions   "summary"
-  debugVersions   "dumpdoc"
-  buildOptions    "debugMode" "debugInfo" "optimize"
+configuration "sdp-debug" {
+  name                 "debuging"
+  targetType           "executable"
+  platforms            "posix"
+  #compiler             "dmd"
+  targetName           "sdp-debug"
+  dflags               "-J=views" "-I=src/sdp"
+  buildRequirements    "allowWarnings"
+  buildOptions         "verbose" "debugMode" "debugInfo" "optimize"
+  debugVersions        "checkdoc" "summary"
+  debugVersions        "dumpdoc"
   postGenerateCommands "/usr/bin/notify-send -t 0 'D (debug) executable ready' 'sdp-debug'"
 }
-configuration     "sdp-tmp" {
-  name            "tmp"
-  targetType      "executable"
-  platforms       "posix"
-  targetName      "sdp-tmp"
-  debugVersions   "tmp"
-  debugVersions   "crap"
-  debugVersions   "header"
-  debugVersions   "header1"
-  buildOptions    "debugMode" "debugInfo" "optimize"
+configuration "sdp-tmp" {
+  name                 "tmp"
+  targetType           "executable"
+  platforms            "posix"
+  #compiler             "dmd"
+  targetName           "sdp-tmp"
+  dflags               "-J=views" "-I=src/sdp"
+  buildRequirements    "allowWarnings"
+  buildOptions         "verbose" "debugMode" "debugInfo" "optimize"
+  debugVersions        "checkdoc" "summary"
+  debugVersions        "tmp"
+  debugVersions        "crap"
+  debugVersions        "header"
+  debugVersions        "header1"
   postGenerateCommands "/usr/bin/notify-send -t 0 'D (debug) executable ready' 'sdp-tmp'"
 }
-configuration     "sdp-debug-clean" {
-  name            "debug-clean"
-  targetType      "executable"
-  platforms       "posix"
-  targetName      "sdp-debug-clean"
-  buildOptions    "debugMode" "debugInfo" "optimize"
+configuration "sdp-debug-clean" {
+  name                 "debug-clean"
+  targetType           "executable"
+  platforms            "posix"
+  #compiler             "dmd"
+  targetName           "sdp-debug-clean"
+  dflags               "-J=views" "-I=src/sdp"
+  buildOptions         "verbose" "debugMode" "debugInfo" "optimize"
   postGenerateCommands "/usr/bin/notify-send -t 0 'D (debug) executable ready' 'sdp-debug-clean'"
 }
 #+END_SRC
@@ -517,28 +545,67 @@ configuration     "sdp-debug-clean" {
 **** configuration dmd                                                  :dmd:
 ***** sdp-dmd
 #+BEGIN_SRC sh  :tangle dub.sdl
-configuration     "sdp-dmd" {
-  name            "dmd"
-  targetType      "executable"
-  platforms       "posix"
-  #compiler        "dmd"
-  targetName      "sdp-dmd"
-  buildOptions    "releaseMode" "optimize" "inline"
+configuration "sdp-dmd" {
+  name                 "dmd"
+  targetType           "executable"
+  platforms            "posix"
+  compiler             "dmd"
+  targetName           "sdp-dmd"
+  dflags               "-J=views" "-I=src/sdp"
+  buildRequirements    "allowWarnings"
+  buildOptions         "verbose" "releaseMode" "optimize" "inline"
   postGenerateCommands "/usr/bin/notify-send -t 0 'D dmd compiled test release executable ready' 'sdp-dmd'"
 }
 #+END_SRC
 
 ***** sdp-debug-dmd                                                   :debug:
 #+BEGIN_SRC sh  :tangle dub.sdl
-configuration     "sdp-debug-dmd" {
-  name            "debuging"
-  targetType      "executable"
-  platforms       "posix"
-  targetName      "sdp-debug-dmd"
-  debugVersions   "checkdoc"
-  debugVersions   "summary"
-  debugVersions   "dumpdoc"
-  buildOptions    "debugMode" "debugInfo" "optimize"
+configuration "sdp-debug-dmd" {
+  name                 "debuging"
+  targetType           "executable"
+  platforms            "posix"
+  compiler             "dmd"
+  targetName           "sdp-debug-dmd"
+  dflags               "-J=views" "-I=src/sdp"
+  buildRequirements    "allowWarnings"
+  buildOptions         "verbose" "debugMode" "debugInfo" "optimize"
+  debugVersions        "checkdoc" "summary"
+  debugVersions        "dumpdoc"
+  postGenerateCommands "/usr/bin/notify-send -t 0 'D (debug) executable ready' 'sdp-debug-dmd'"
+}
+#+END_SRC
+
+***** sdp-debug-unittest-dmd                                 :unittest:debug:
+#+BEGIN_SRC sh  :tangle dub.sdl
+configuration "sdp-debug-unittest-dmd" {
+  name                 "debuging"
+  targetType           "executable"
+  platforms            "posix"
+  compiler             "dmd"
+  targetName           "sdp-debug-dmd"
+  dflags               "-J=views" "-I=src/sdp"
+  buildRequirements    "allowWarnings"
+  buildOptions         "verbose" "debugMode" "debugInfo" "unittests" "optimize"
+  debugVersions        "checkdoc" "summary"
+  debugVersions        "dumpdoc"
+  postGenerateCommands "/usr/bin/notify-send -t 0 'D (debug) executable ready' 'sdp-debug-dmd'"
+}
+#+END_SRC
+
+***** sdp-debug-docs-dmd                                         :docs:debug:
+#+BEGIN_SRC sh  :tangle dub.sdl
+configuration "sdp-debug-docs-dmd" {
+  name                 "debuging"
+  targetType           "executable"
+  platforms            "posix"
+  compiler             "dmd"
+  targetName           "sdp-debug-dmd"
+  dflags               "-J=views" "-I=src/sdp"
+  #lflags               "ld.gold"
+  buildRequirements    "allowWarnings"
+  buildOptions         "verbose" "debugMode" "debugInfo" "optimize"
+  debugVersions        "checkdoc" "summary"
+  debugVersions        "dumpdoc"
   postGenerateCommands "/usr/bin/notify-send -t 0 'D (debug) executable ready' 'sdp-debug-dmd'"
 }
 #+END_SRC
@@ -546,98 +613,167 @@ configuration     "sdp-debug-dmd" {
 **** configuration ldc                                                  :ldc:
 ***** sdp-ldc
 #+BEGIN_SRC sh  :tangle dub.sdl
-configuration     "sdp-ldc" {
-  name            "ldc"
-  targetType      "executable"
-  platforms       "posix"
-  #compiler        "ldc2"
-  targetName      "sdp-ldc"
-  buildOptions    "releaseMode" "optimize" "inline"
+configuration "sdp-ldc" {
+  name                 "ldc"
+  targetType           "executable"
+  platforms            "posix"
+  compiler             "ldc2"
+  targetName           "sdp-ldc"
+  dflags               "-J=views" "-I=src/sdp"
+  buildRequirements    "allowWarnings"
+  buildOptions         "verbose" "releaseMode" "optimize" "inline"
   postGenerateCommands "/usr/bin/notify-send -t 0 'D ldc2 compiled test release executable ready' 'sdp-ldc'"
 }
 #+END_SRC
 
 ***** sdp-debug-ldc                                                   :debug:
 #+BEGIN_SRC sh  :tangle dub.sdl
-configuration     "sdp-debug-ldc" {
-  name            "debuging"
-  targetType      "executable"
-  platforms       "posix"
-  targetName      "sdp-debug-ldc"
-  debugVersions   "checkdoc"
-  debugVersions   "summary"
-  #debugVersions   "dumpdoc"
-  #debugVersions   "bookindex"
-  #debugVersions   "biblio"
-  buildOptions    "debugMode" "debugInfo" "optimize"
+configuration "sdp-debug-ldc" {
+  name                 "debuging"
+  targetType           "executable"
+  platforms            "posix"
+  compiler             "ldc2"
+  targetName           "sdp-debug-ldc"
+  dflags               "-J=views" "-I=src/sdp"
+  buildRequirements    "allowWarnings"
+  buildOptions         "verbose" "debugMode" "debugInfo" "optimize"
+  debugVersions        "checkdoc" "summary"
   postGenerateCommands "/usr/bin/notify-send -t 0 'D (debug) executable ready' 'sdp-debug-ldc'"
 }
 #+END_SRC
 
-**** configuration debug list                                         :debug:
+***** sdp-debug-unittest-ldc                                 :unittest:debug:
+#+BEGIN_SRC sh  :tangle dub.sdl
+configuration "sdp-debug-unittest-ldc" {
+  name                 "debuging"
+  targetType           "executable"
+  platforms            "posix"
+  compiler             "ldc2"
+  targetName           "sdp-debug-ldc"
+  dflags               "-J=views" "-I=src/sdp" "-Dddocs"
+  buildRequirements    "allowWarnings"
+  buildOptions         "verbose" "debugMode" "debugInfo" "unittests" "optimize"
+  debugVersions        "checkdoc" "summary"
+  #debugVersions        "dumpdoc"
+  postGenerateCommands "/usr/bin/notify-send -t 0 'D (debug) executable ready' 'sdp-debug-ldc'"
+}
+#+END_SRC
+
+***** sdp-debug-docs-ldc                                         :docs:debug:
+#+BEGIN_SRC sh  :tangle dub.sdl
+configuration "sdp-debug-docs-ldc" {
+  name                 "debuging"
+  targetType           "executable"
+  platforms            "posix"
+  compiler             "ldc2"
+  targetName           "sdp-debug-ldc"
+  dflags               "-J=views" "-I=src/sdp" "-Dddocs"
+  buildRequirements    "allowWarnings"
+  buildOptions         "verbose" "debugMode" "debugInfo" "optimize"
+  debugVersions        "checkdoc" "summary"
+  #debugVersions        "dumpdoc"
+  postGenerateCommands "/usr/bin/notify-send -t 0 'D (debug) executable ready' 'sdp-debug-ldc'"
+}
+#+END_SRC
+
+**** call dub directly
+
+#+BEGIN_SRC sh  :tangle no
+dub --config=sdp-debug-ldc
+dub --config=sdp-debug-unittest-ldc
+#+END_SRC
+
 
 #+BEGIN_SRC sh  :tangle no
-  debugVersions "biblio"
-  debugVersions "biblio0"
-  debugVersions "bibliobuild"
-  debugVersions "biblioblock"
-  debugVersions "biblioblockinclude"
-  debugVersions "bibliosorted"
-  debugVersions "biblio_sorted"
-  debugVersions "block"
-  debugVersions "bookindex"
-  debugVersions "bookindexmatch"
-  debugVersions "bookindexraw"
-  debugVersions "check"
-  debugVersions "checkdoc"
-  debugVersions "code"
-  debugVersions "comment"
-  debugVersions "configfile"
-  debugVersions "dumpdoc"
-  debugVersions "endnotes"
-  debugVersions "endnotes_build"
-  debugVersions "footnotes"
-  debugVersions "footnotesdone"
-  debugVersions "group"
-  debugVersions "header"
-  debugVersions "header_and_content"
-  debugVersions "header1"
-  debugVersions "headerjson"
-  debugVersions "headermakejson"
-  debugVersions "headermetadatajson"
-  debugVersions "headersdlang"
-  debugVersions "heading"
-  debugVersions "headings"
-  debugVersions "headingsfound"
-  debugVersions "insert"
-  debugVersions "munge"
-  debugVersions "node"
-  debugVersions "objectrelated1"
-  debugVersions "objectrelated2"
-  debugVersions "objects"
-  debugVersions "ocnoff"
-  debugVersions "para"
-  debugVersions "parabullet"
-  debugVersions "parabulletindent"
-  debugVersions "paraindent"
-  debugVersions "paraindenthang"
-  debugVersions "parent"
-  debugVersions "poem"
-  debugVersions "quote"
-  debugVersions "raw"
-  debugVersions "sdlang"
-  debugVersions "source"
-  debugVersions "srclines"
-  debugVersions "structattrib"
-  debugVersions "summary"
-  debugVersions "table"
+dub --config=sdp-debug-ldc
+dub --config=sdp-debug-unittest-ldc
+#+END_SRC
+
+**** TODO configuration debug list                                    :debug:
+
+#+BEGIN_SRC sh  :tangle no
+debugVersions "biblio"
+debugVersions "biblio0"
+debugVersions "bibliobuild"
+debugVersions "biblioblock"
+debugVersions "biblioblockinclude"
+debugVersions "bibliosorted"
+debugVersions "biblio_sorted"
+debugVersions "block"
+debugVersions "bookindex"
+debugVersions "bookindexmatch"
+debugVersions "bookindexraw"
+debugVersions "check"
+debugVersions "checkdoc"
+debugVersions "code"
+debugVersions "comment"
+debugVersions "configfile"
+debugVersions "dumpdoc"
+debugVersions "endnotes"
+debugVersions "endnotes_build"
+debugVersions "footnotes"
+debugVersions "footnotesdone"
+debugVersions "group"
+debugVersions "header"
+debugVersions "header_and_content"
+debugVersions "header1"
+debugVersions "headerjson"
+debugVersions "headermakejson"
+debugVersions "headermetadatajson"
+debugVersions "headersdlang"
+debugVersions "heading"
+debugVersions "headings"
+debugVersions "headingsfound"
+debugVersions "insert"
+debugVersions "munge"
+debugVersions "node"
+debugVersions "objectrelated1"
+debugVersions "objectrelated2"
+debugVersions "objects"
+debugVersions "ocnoff"
+debugVersions "para"
+debugVersions "parabullet"
+debugVersions "parabulletindent"
+debugVersions "paraindent"
+debugVersions "paraindenthang"
+debugVersions "parent"
+debugVersions "poem"
+debugVersions "quote"
+debugVersions "raw"
+debugVersions "sdlang"
+debugVersions "source"
+debugVersions "srclines"
+debugVersions "structattrib"
+debugVersions "summary"
+debugVersions "table"
 #+END_SRC
 
 dflags        platform="dmd" "-v --force -de -w -J./views -I./src/sdp -of./bin/sdp"
 dflags        platform="dmd" "-O -release"
 #buildOptions      "-O -release"
 
-*** +dub.json+                                                       :json:
+**** dub dependencies
+
+https://code.dlang.org/docs/commandline
+https://code.dlang.org/package-format?lang=sdl
+https://code.dlang.org/getting_started
+https://code.dlang.org/packages/sdlang-d
+https://github.com/Abscissa/SDLang-D/blob/master/HOWTO.md
+
+dub list
+dub upgrade
+dub fetch sdlang-d
+dub fetch taggedalgebraic
+dub fetch libinputvisitor
+dub fetch unit-threaded ?
+
+sdp ~master: /home/ralph/grotto/repo/git.repo/utils/sdp-x/
+sdlang-d 0.10.0: /home/ralph/.dub/packages/sdlang-d-0.10.0/sdlang-d/
+taggedalgebraic 0.10.2: /home/ralph/.dub/packages/taggedalgebraic-0.10.2/taggedalgebraic/
+libinputvisitor 1.2.2: /home/ralph/.dub/packages/libinputvisitor-1.2.2/libinputvisitor/
+unit-threaded 0.6.28: /home/ralph/.dub/packages/unit-threaded-0.6.28/unit-threaded/
+
+*** +dub.json+                                                           :json:
 
 **** +sdp+
 #+BEGIN_SRC json  :tangle no
@@ -722,16 +858,22 @@ dflags        platform="dmd" "-O -release"
 !.gitignore
 !makefile
 !version.txt
-!dub.json
+!dub*.json
 !dub.sdl
 .dub/**
 !tangle
 !*.org
 !*.d
 !*.txt
+!*.sst
+!conf.sdl
+!sisu_document_make
 !org
 !src
+!src/*
+!sisudoc
 !views
+!docs/*.html
 !**/
 **/.#*
 #!*/
@@ -863,6 +1005,9 @@ dub -v --force --config=sdp-release --build=release
 dub --compiler=dmd --force -v --config=sdp-debug
 dub --compiler=dmd --force -v --config=sdp-release
 
+dub --config=sdp-debug-ldc
+dub --config=sdp-debug-unittest-ldc
+
 # dmd
 ,dubdmd --config=sdp-debug-clean
 # time ~sdp3/bin/sdp-debug-clean -v --html --no-assert en/autonomy_markup0.sst