diff options
| -rw-r--r-- | dub.sdl | 47 | ||||
| -rw-r--r-- | maker.org | 94 | ||||
| -rw-r--r-- | org/ao_abstract_doc_source.org | 2 | ||||
| -rw-r--r-- | org/ao_read_source_files.org | 4 | ||||
| -rw-r--r-- | src/sdp/ao_abstract_doc_source.d | 2 | ||||
| -rw-r--r-- | src/sdp/ao_read_source_files.d | 4 |
6 files changed, 133 insertions, 20 deletions
@@ -157,3 +157,50 @@ configuration "sdp-debug-docs-ldc" { #debugVersions "dumpdoc" postGenerateCommands "/usr/bin/notify-send -t 0 'D (debug) executable ready' 'sdp-debug-ldc'" } +configuration "sdp-gdc" { + name "gdc" + targetType "executable" + platforms "posix" + compiler "gdc" + targetName "sdp-gdc" + dflags "-J=views" "-I=src/sdp" + buildRequirements "allowWarnings" + buildOptions "verbose" "releaseMode" "optimize" "inline" + postGenerateCommands "/usr/bin/notify-send -t 0 'D gdc compiled test release executable ready' 'sdp-gdc'" +} +configuration "sdp-debug-gdc" { + name "debuging" + targetType "executable" + platforms "posix" + compiler "gdc" + targetName "sdp-debug-gdc" + 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-gdc'" +} +configuration "sdp-debug-unittest-gdc" { + name "debuging" + targetType "executable" + platforms "posix" + compiler "gdc" + targetName "sdp-debug-gdc" + dflags "-J=views" "-I=src/sdp" "-Dddocs" + buildRequirements "allowWarnings" + buildOptions "verbose" "debugMode" "debugInfo" "unittests" "optimize" + debugVersions "checkdoc" "summary" + postGenerateCommands "/usr/bin/notify-send -t 0 'D (debug) executable ready' 'sdp-debug-gdc'" +} +configuration "sdp-debug-docs-gdc" { + name "debuging" + targetType "executable" + platforms "posix" + compiler "gdc" + targetName "sdp-debug-gdc" + dflags "-J=views" "-I=src/sdp" "-Dddocs" + buildRequirements "allowWarnings" + buildOptions "verbose" "debugMode" "debugInfo" "optimize" + debugVersions "checkdoc" "summary" + postGenerateCommands "/usr/bin/notify-send -t 0 'D (debug) executable ready' 'sdp-debug-gdc'" +} @@ -469,13 +469,13 @@ gitsnapshot: distclean tangle tangle gitsnapshot #+END_SRC -* conf misc -** dub :dub:description: +* TODO configuration misc :configuration: +** dub :dub: 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]]) *** TODO dub.sdl [#A] :sdl: -**** header :header: +**** header :header: #+BEGIN_SRC sh :tangle dub.sdl name "sdp" description "sisu document parser" @@ -489,7 +489,7 @@ buildRequirements "allowWarnings" dependency "sdlang-d" version="~>0.10.0" #+END_SRC -**** configuration generic :generic: +**** generic :generic: #+BEGIN_SRC sh :tangle dub.sdl configuration "sdp-release" { name "release" @@ -542,7 +542,7 @@ configuration "sdp-debug-clean" { } #+END_SRC -**** configuration dmd [#A] :dmd: +**** dmd [#A] :dmd: ***** sdp-dmd #+BEGIN_SRC sh :tangle dub.sdl configuration "sdp-dmd" { @@ -558,7 +558,7 @@ configuration "sdp-dmd" { } #+END_SRC -***** sdp-debug-dmd :debug: +***** sdp-debug-dmd :debug: #+BEGIN_SRC sh :tangle dub.sdl configuration "sdp-debug-dmd" { name "debuging" @@ -575,7 +575,7 @@ configuration "sdp-debug-dmd" { } #+END_SRC -***** sdp-debug-unittest-dmd :unittest:debug: +***** sdp-debug-unittest-dmd :unittest:debug: #+BEGIN_SRC sh :tangle dub.sdl configuration "sdp-debug-unittest-dmd" { name "debuging" @@ -592,7 +592,7 @@ configuration "sdp-debug-unittest-dmd" { } #+END_SRC -***** sdp-debug-docs-dmd :docs:debug: +***** sdp-debug-docs-dmd :docs:debug: #+BEGIN_SRC sh :tangle dub.sdl configuration "sdp-debug-docs-dmd" { name "debuging" @@ -610,7 +610,7 @@ configuration "sdp-debug-docs-dmd" { } #+END_SRC -**** configuration ldc [#A] :ldc: +**** ldc [#A] :ldc: ***** sdp-ldc #+BEGIN_SRC sh :tangle dub.sdl configuration "sdp-ldc" { @@ -626,7 +626,7 @@ configuration "sdp-ldc" { } #+END_SRC -***** sdp-debug-ldc :debug: +***** sdp-debug-ldc :debug: #+BEGIN_SRC sh :tangle dub.sdl configuration "sdp-debug-ldc" { name "debuging" @@ -642,7 +642,7 @@ configuration "sdp-debug-ldc" { } #+END_SRC -***** sdp-debug-unittest-ldc :unittest:debug: +***** sdp-debug-unittest-ldc :unittest:debug: #+BEGIN_SRC sh :tangle dub.sdl configuration "sdp-debug-unittest-ldc" { name "debuging" @@ -659,7 +659,7 @@ configuration "sdp-debug-unittest-ldc" { } #+END_SRC -***** sdp-debug-docs-ldc :docs:debug: +***** sdp-debug-docs-ldc :docs:debug: #+BEGIN_SRC sh :tangle dub.sdl configuration "sdp-debug-docs-ldc" { name "debuging" @@ -676,6 +676,70 @@ configuration "sdp-debug-docs-ldc" { } #+END_SRC +**** gdc [#F] :gdc: +***** sdp-gdc +#+BEGIN_SRC sh :tangle dub.sdl +configuration "sdp-gdc" { + name "gdc" + targetType "executable" + platforms "posix" + compiler "gdc" + targetName "sdp-gdc" + dflags "-J=views" "-I=src/sdp" + buildRequirements "allowWarnings" + buildOptions "verbose" "releaseMode" "optimize" "inline" + postGenerateCommands "/usr/bin/notify-send -t 0 'D gdc compiled test release executable ready' 'sdp-gdc'" +} +#+END_SRC + +***** sdp-debug-gdc :debug: +#+BEGIN_SRC sh :tangle dub.sdl +configuration "sdp-debug-gdc" { + name "debuging" + targetType "executable" + platforms "posix" + compiler "gdc" + targetName "sdp-debug-gdc" + 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-gdc'" +} +#+END_SRC + +***** sdp-debug-unittest-gdc :unittest:debug: +#+BEGIN_SRC sh :tangle dub.sdl +configuration "sdp-debug-unittest-gdc" { + name "debuging" + targetType "executable" + platforms "posix" + compiler "gdc" + targetName "sdp-debug-gdc" + dflags "-J=views" "-I=src/sdp" "-Dddocs" + buildRequirements "allowWarnings" + buildOptions "verbose" "debugMode" "debugInfo" "unittests" "optimize" + debugVersions "checkdoc" "summary" + postGenerateCommands "/usr/bin/notify-send -t 0 'D (debug) executable ready' 'sdp-debug-gdc'" +} +#+END_SRC + +***** sdp-debug-docs-gdc :docs:debug: +#+BEGIN_SRC sh :tangle dub.sdl +configuration "sdp-debug-docs-gdc" { + name "debuging" + targetType "executable" + platforms "posix" + compiler "gdc" + targetName "sdp-debug-gdc" + dflags "-J=views" "-I=src/sdp" "-Dddocs" + buildRequirements "allowWarnings" + buildOptions "verbose" "debugMode" "debugInfo" "optimize" + debugVersions "checkdoc" "summary" + postGenerateCommands "/usr/bin/notify-send -t 0 'D (debug) executable ready' 'sdp-debug-gdc'" +} +#+END_SRC + *** +dub.json+ :json: **** +sdp+ @@ -849,6 +913,12 @@ unit-threaded 0.6.28: /home/ralph/.dub/packages/unit-threaded-0.6.28/unit-thread #+BEGIN_SRC sh :tangle no dub --config=sdp-debug-ldc dub --config=sdp-debug-unittest-ldc +dub --config=sdp-debug-unittest-ldc --debug=node + +make clean && make skel && make tangle && dub --config=sdp-debug-ldc +make clean && make skel && make tangle && CC=/usr/bin/clang-4.0 dub --config=sdp-debug-ldc +make clean && make skel && make tangle && dub --config=sdp-ldc +make clean && make skel && make tangle && dub CC=/usr/bin/clang-4.0 --config=sdp-ldc make tangle && dub --config=sdp-debug-unittest-ldc #--debug=node --debug=anchor --debug=endnotes diff --git a/org/ao_abstract_doc_source.org b/org/ao_abstract_doc_source.org index 7255cc7..7aa8a0a 100644 --- a/org/ao_abstract_doc_source.org +++ b/org/ao_abstract_doc_source.org @@ -525,7 +525,7 @@ if ((type["heading"] == State.on) obj_im.obj_inline_markup_and_anchor_tags(an_object, dochead_make_aa); // tuple this with anchor tags? an_object["substantive"] = substantive_object_and_anchor_tags_tuple[0]; anchor_tags = substantive_object_and_anchor_tags_tuple[1]; - if (to!int(an_object["lev_markup_number"]) == 4) { + if (to!int(an_object["lev_markup_number"]) == 4) { segment_object_belongs_to = anchor_tags[0]; } else if (to!int(an_object["lev_markup_number"]) < 4) { segment_object_belongs_to = ""; diff --git a/org/ao_read_source_files.org b/org/ao_read_source_files.org index a004fc2..8aab5c9 100644 --- a/org/ao_read_source_files.org +++ b/org/ao_read_source_files.org @@ -242,9 +242,7 @@ auto markupSourceReadIn(in string fn_src) { auto markupSourceHeaderContentRawLineTupleArray(in string source_txt_str) { auto hc = header0Content1(source_txt_str); auto header = hc[0]; - char[] la; - la ~= "A~ "; - char[] source_txt = la ~ hc[1]; + char[] source_txt = hc[1]; auto source_line_arr = markupSourceLineArray(source_txt); auto t = tuple( header, diff --git a/src/sdp/ao_abstract_doc_source.d b/src/sdp/ao_abstract_doc_source.d index 143040f..074fbc5 100644 --- a/src/sdp/ao_abstract_doc_source.d +++ b/src/sdp/ao_abstract_doc_source.d @@ -345,7 +345,7 @@ template SiSUdocAbstraction() { obj_im.obj_inline_markup_and_anchor_tags(an_object, dochead_make_aa); // tuple this with anchor tags? an_object["substantive"] = substantive_object_and_anchor_tags_tuple[0]; anchor_tags = substantive_object_and_anchor_tags_tuple[1]; - if (to!int(an_object["lev_markup_number"]) == 4) { + if (to!int(an_object["lev_markup_number"]) == 4) { segment_object_belongs_to = anchor_tags[0]; } else if (to!int(an_object["lev_markup_number"]) < 4) { segment_object_belongs_to = ""; diff --git a/src/sdp/ao_read_source_files.d b/src/sdp/ao_read_source_files.d index 66ea561..3ceedd0 100644 --- a/src/sdp/ao_read_source_files.d +++ b/src/sdp/ao_read_source_files.d @@ -108,9 +108,7 @@ template SiSUmarkupRaw() { auto markupSourceHeaderContentRawLineTupleArray(in string source_txt_str) { auto hc = header0Content1(source_txt_str); auto header = hc[0]; - char[] la; - la ~= "A~ "; - char[] source_txt = la ~ hc[1]; + char[] source_txt = hc[1]; auto source_line_arr = markupSourceLineArray(source_txt); auto t = tuple( header, |