From ba1712e77b31704fd9ba16d14e15518e7a7dd104 Mon Sep 17 00:00:00 2001 From: Ralph Amissah Date: Sat, 1 Oct 2016 14:12:13 -0400 Subject: 0.7.0 using dub remote dependencies (local src related to sdlang removed) --- maker.org | 299 +++++++++++++++++++++++--------------------------------------- 1 file changed, 110 insertions(+), 189 deletions(-) (limited to 'maker.org') diff --git a/maker.org b/maker.org index c701391..9884b02 100644 --- a/maker.org +++ b/maker.org @@ -383,20 +383,22 @@ skel: init: skel +clean: + rm -rf $(PRG_SRCDIR); \ + rm -rf $(PRG_DOCDIR); + clean_bin: rm $(PRG_BINDIR)/* clean_src: - rm -f $(PRG_SRCDIR)/*; \ - rm -rf $(PRG_SRCDIR)/$(PRG_NAME); \ + rm -rf $(PRG_SRCDIR); 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_SRCDIR); \ rm -rf $(PRG_BINDIR); \ rm -rf $(PRG_DOCDIR); @@ -474,7 +476,6 @@ Every DUB package should contain a [[http://code.dlang.org/package-format?lang=j *** TODO dub.sdl [#A] :sdl: **** header :header: - #+BEGIN_SRC sh :tangle dub.sdl name "sdp" description "sisu document parser" @@ -483,7 +484,6 @@ authors "Ralph Amissah" copyright "Copyright © 2016 Ralph Amissah" license "AGPL-3+" targetPath "./bin" -sourcePath "./src" stringImportPaths "./views" buildRequirements "allowWarnings" dependency "sdlang-d" version="~>0.10.0" @@ -542,7 +542,7 @@ configuration "sdp-debug-clean" { } #+END_SRC -**** configuration dmd :dmd: +**** configuration dmd [#A] :dmd: ***** sdp-dmd #+BEGIN_SRC sh :tangle dub.sdl configuration "sdp-dmd" { @@ -610,7 +610,7 @@ configuration "sdp-debug-docs-dmd" { } #+END_SRC -**** configuration ldc :ldc: +**** configuration ldc [#A] :ldc: ***** sdp-ldc #+BEGIN_SRC sh :tangle dub.sdl configuration "sdp-ldc" { @@ -676,103 +676,6 @@ configuration "sdp-debug-docs-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 -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 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+ @@ -793,62 +696,6 @@ unit-threaded 0.6.28: /home/ralph/.dub/packages/unit-threaded-0.6.28/unit-thread } #+END_SRC -**** +sdlang+ :sdlang: -#+BEGIN_SRC json :tangle ./src/sdlang/dub.json -{ - "name": "sdlang-d", - "description": "An SDL (Simple Declarative Language) library for D.", - "homepage": "http://github.com/Abscissa/SDLang-D", - "authors": ["Nick Sabalausky"], - "license": "zlib/libpng", - "copyright": "©2012-2015 Nick Sabalausky", - "sourcePaths": ["."], - "importPaths": ["."], - "buildRequirements": ["allowWarnings"], - "dependencies": { - "libinputvisitor": "~>1.2.0" - }, - "subPackages": [ - "./libinputvisitor" - ], - "configurations": [ - { - "name": "test", - "targetType": "executable", - "versions": ["SDLang_TestApp"], - "targetPath": "../../bin/", - "targetName": "sdlang" - }, - { - "name": "library", - "targetType": "library" - }, - { - "name": "unittest", - "targetType": "executable", - "targetPath": "../../bin/", - "targetName": "sdlang-unittest", - - "versions": ["sdlangUnittest", "sdlangTrace"] - } - ] -} -#+END_SRC - -**** +libinputvisitor+ :libinputvisitor: -#+BEGIN_SRC json :tangle ./src/sdlang/libinputvisitor/dub.json -{ - "name": "libinputvisitor", - "description": "Write D input range generators in a straightforward coroutine style", - "authors": ["Nick Sabalausky"], - "homepage": "https://github.com/abscissa/libInputVisitor", - "license": "WTFPL", - "sourcePaths": ["."], - "importPaths": ["."], - "excludedSourceFiles": ["libInputVisitorExample.d"] -} -#+END_SRC - ** .gitignore :gitignore: #+BEGIN_SRC sh :tangle .gitignore @@ -943,7 +790,7 @@ ldc2 -de -w -J./views -I./src/sdp -of=./bin/sdp ./src/sdp.d ldc2 -de -w -J./views -I./src/sdp -O4 -release -of=./bin/sdp ./src/sdp.d #+END_SRC -*** TODO gdc :gdc: +*** gdc (not done) [#F] :gdc: not done @@ -957,7 +804,7 @@ not done re: dmd "one can easily get 2x (and even more) speedup by simply switching to gdc -O2", ketmar ** build tools :build:tool: -*** rdmd [#B] :rdmd: +*** rdmd [#C] :rdmd: flags similar to dmd @@ -977,57 +824,131 @@ rdmd -de -w -J./views -I./src/sdp -unittest -d-debug=checkdoc -d-debug=summary - https://github.com/dlang/dub/ http://code.dlang.org/getting_started http://code.dlang.org/docs/commandline +**** dub json or sdlang 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]] +https://code.dlang.org/package-format?lang=sdl +https://code.dlang.org/packages/sdlang-d +https://github.com/Abscissa/SDLang-D/blob/master/HOWTO.md -#+BEGIN_SRC sh ---compiler=dmd ---compiler=ldc2 +**** dub dependencies +dub list +dub upgrade +dub fetch sdlang-d +dub fetch taggedalgebraic +dub fetch libinputvisitor +dub fetch unit-threaded ? ---compiler=dmd -v --force ---compiler=ldc2 -v --force -#+END_SRC +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/ -#+BEGIN_SRC sh -dub -v --force --debug=checkdoc --debug=summary --debug=dumpdoc -dub -v --force --build=release +**** TODO call dub directly [#A] -dub -v --combined --build-mode allAtOnce --build release # --annotate -dub build sdp -v --combined --build-mode allAtOnce -dub describe -dub build sdp -v --force --debug=checkdoc --debug=dumpdoc +#+BEGIN_SRC sh :tangle no +dub --config=sdp-debug-ldc +dub --config=sdp-debug-unittest-ldc -dub -v --force --build=release +make tangle && dub --config=sdp-debug-unittest-ldc #--debug=node --debug=anchor --debug=endnotes -dub -v --force --config=sdp-debug -dub -v --force --config=sdp-release -dub -v --force --config=sdp-release --build=release +make expunge && make skel && make tangle && dub --config=sdp-ldc +make expunge && make skel && make tangle && dub --config=sdp-debug-unittest-ldc #--debug=node --debug=anchor --debug=endnotes -dub --compiler=dmd --force -v --config=sdp-debug -dub --compiler=dmd --force -v --config=sdp-release +make expunge && +make skel && make tangle && +dub --config=sdp-debug-unittest-ldc \ +--debug=node --debug=anchor --debug=endnotes -dub --config=sdp-debug-ldc -dub --config=sdp-debug-unittest-ldc +make tangle && +dub --config=sdp-debug-ldc --debug=node --debug=anchor +dub --config=sdp-debug-unittest-ldc --debug=node --debug=anchor +#+END_SRC + +*** sisu markup +#+BEGIN_SRC sh # dmd -,dubdmd --config=sdp-debug-clean +dub --compiler=dmd -v --force --config=sdp-debug-clean # time ~sdp3/bin/sdp-debug-clean -v --html --no-assert en/autonomy_markup0.sst # ldc # flags -,dubldc --config=sdp-release # sdp + +dub --compiler=ldc2 -v --force --config=sdp-release # sdp # time ~sdp3/bin/sdp -v --html --no-assert en/autonomy_markup0.sst -,dubldc --config=sdp-debug # sdp-debug +dub --compiler=ldc2 -v --force --config=sdp-debug # sdp-debug # time ~sdp3/bin/sdp-debug -v --html --no-assert en/autonomy_markup0.sst -,dubldc --config=sdp-tmp # sdp-tmp +dub --compiler=ldc2 -v --force --config=sdp-tmp # sdp-tmp # time ~sdp3/bin/sdp-tmp -v --html --no-assert en/autonomy_markup0.sst -,dubldc --config=sdp-debug-clean # sdp-debug-clean +dub --compiler=ldc2 -v --force --config=sdp-debug-clean # sdp-debug-clean # time ~sdp3/bin/sdp-debug-clean -v --html --no-assert en/autonomy_markup0.sst +#+END_SRC +** TODO debug options list [#A] :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 ** make (emacs) #+BEGIN_SRC sh +make -k tangle + make -k dub_dmd_release make -k dub_dmd_debug make -k dub_dmd_debug_clean -- cgit v1.2.3