From da0f051e1aced4fa1fd5cd13c0548279bf04b2a0 Mon Sep 17 00:00:00 2001 From: Ralph Amissah Date: Wed, 12 Apr 2017 15:23:23 -0400 Subject: 0.13.9 sisupod & epub3, zipped output --- maker.org | 89 +++++++++++++++++++++++++++++++++++---------------------------- 1 file changed, 50 insertions(+), 39 deletions(-) (limited to 'maker.org') diff --git a/maker.org b/maker.org index c3d44e5..5e6a3c7 100644 --- a/maker.org +++ b/maker.org @@ -15,13 +15,13 @@ [[./org/sdp.org][sdp.org]] [[./org/][org/]] * sdp makefile :makefile: -** TODO settings [+2] :settings: -*** alternative D compilers (dmd/ldc2/gdc) [+1] :compiler: +** TODO settings [+2] :settings: +*** alternative D compilers (dmd/ldc2/gdc) [+1] :compiler: http://dlang.org/download.html https://wiki.dlang.org/Compilers -**** dmd [#A] :dmd: +**** dmd [#A] :dmd: http://dlang.org/ @@ -32,7 +32,7 @@ DMD_FLAGS_RELEASE=-O -inline -release DMD_FLAG_BINOF=-of #+END_SRC -**** ldc2 [#A] :ldc: +**** ldc2 [#A] :ldc: https://github.com/ldc-developers/ldc @@ -43,7 +43,7 @@ LDC_FLAGS_RELEASE=-O4 -inline -release LDC_FLAG_BINOF=-of= #+END_SRC -**** TODO gdc :gdc: +**** TODO gdc :gdc: #+BEGIN_SRC makefile :tangle makefile GDC=gdc @@ -52,26 +52,26 @@ GDC_FLAGS_RELEASE=-march=native -O3 -pipe -frelease GDC_FLAG_BINOF=-o #+END_SRC -*** build tools (dub/rdmd) [+1] :build:tool: -**** rdmd :rdmd: +*** build tools (dub/rdmd) [+1] :build:tool: +**** rdmd :rdmd: #+BEGIN_SRC makefile :tangle makefile RDMD=rdmd RDMD_FLAGS=--build-only --compiler= #+END_SRC -**** dub [#A] :dub: +**** dub [#A] :dub: #+BEGIN_SRC makefile :tangle makefile DUB=dub DUB_FLAGS=-v --force --compiler= #+END_SRC -*** TODO [#A] set/select: ~D compiler~ & ~debug flags~ [+1] [2/2] :select: +*** TODO [#A] set/select: ~D compiler~ & ~debug flags~ [+1] [2/2] :select: - [X] Set D_COMPILER (one of DMD LDC or GDC) - [X] Set debug flags (using DMD standard flag -debug=) -**** TODO SET compiler: "SET_D_COMPILER=": :compiler:select: +**** TODO SET compiler: "SET_D_COMPILER=": :compiler:select: [[http://wiki.dlang.org/Compilers][D Compilers wiki]] [[http://dlang.org/download.html][D Compilers download]] Set D_COMPILER one of DMD, LDC or GDC e.g.: SET_D_COMPILER=DMD @@ -147,8 +147,9 @@ Set debug flags using DMD standard flag -debug= e.g.: structattrib summary table + toc -*** D compiler settings [+1] :settings:compiler: +*** D compiler settings [+1] :settings:compiler: **** compiler settings #+BEGIN_SRC makefile :tangle makefile @@ -176,7 +177,7 @@ endif DUB_FLAGS_DEBUG :=$(shell echo $(DC_FLAGS_DEBUG_SET)| sed -e "s/-debug/--debug/g"| sed -e "s/-unittest//g") #+END_SRC -*** Project Details :project:sdp: +*** Project Details :project:sdp: #+BEGIN_SRC makefile :tangle makefile PRG_NAME=sdp @@ -187,11 +188,11 @@ PRG_BINDIR=./bin PRG_DOCDIR=./docs #+END_SRC -*** Emacs Org settings :settings:emacs:org:tangle: +*** Emacs Org settings :settings:emacs:org:tangle: #+BEGIN_SRC makefile :tangle makefile # ORG -ORG_VERSION=20160725 +ORG_VERSION=20161214 EMACSLISP=/usr/share/emacs/site-lisp EMACSLISP_ORG=~/.emacs.d/elpa/org-$($(shell echo $(ORG_VERSION))) EMACSLISP_ORG_CONTRIB=~/.emacs.d/elpa/org-plus-contrib-$($(shell echo $(ORG_VERSION))) @@ -200,7 +201,7 @@ ORGFILES="" ORGDIR=$(shell echo `pwd`) #+END_SRC -** "make" commands [+2] :make:commands: +** "make" commands [+2] :make:commands: - build commands - build - debug @@ -216,8 +217,8 @@ ORGDIR=$(shell echo `pwd`) - git snapshot - gitsnapshot -*** build commands [+1] :build:compile: -**** build rebuild :build:rebuild: +*** build commands [+1] :build:compile: +**** build rebuild :build:rebuild: ***** compilers #+BEGIN_SRC makefile :tangle makefile @@ -234,7 +235,7 @@ makefile_new: make -k tangle_maker #+END_SRC -***** TODO _dub_ build rebuild [#A] :dub: +***** TODO _dub_ build rebuild [#A] :dub: ****** generic #+BEGIN_SRC makefile :tangle makefile @@ -296,7 +297,7 @@ dub_release_test_dmd: tangle dub_dmd_release_test dub_release_test_ldc: tangle dub_ldc_release_test #+END_SRC -***** rdmd build rebuild :rdmd: +***** rdmd build rebuild :rdmd: #+BEGIN_SRC makefile :tangle makefile rdmd: $(PRG_SRCDIR)/$(PRG_SRC) @@ -305,7 +306,7 @@ rdmd: $(PRG_SRCDIR)/$(PRG_SRC) $(PRG_SRCDIR)/$(PRG_NAME)/$(PRG_SRC) #+END_SRC -**** debug :debug: +**** debug :debug: ***** debug #+BEGIN_SRC makefile :tangle makefile @@ -354,7 +355,7 @@ debug_rdmd_gdc: $(PRG_SRCDIR)/$(PRG_SRC) $(PRG_SRCDIR)/$(PRG_NAME)/$(PRG_SRC) #+END_SRC -**** release :release: +**** release :release: ***** release @@ -374,7 +375,7 @@ release_rdmd: distclean tangle $(PRG_SRCDIR)/$(PRG_SRC) $(PRG_SRCDIR)/$(PRG_SRC) #+END_SRC -*** init clean distclean etc. :clean: +*** init clean distclean etc. :clean: #+BEGIN_SRC makefile :tangle makefile skel: @@ -409,7 +410,7 @@ distclean_and_init: expunge mkdir -p $(PRG_BINDIR); #+END_SRC -*** Org Babel Tangle batch process command :tangle: +*** Org Babel Tangle batch process command :tangle: **** tangle: org babel tangle *.org #+BEGIN_SRC makefile :tangle makefile tangle: skel @@ -470,10 +471,10 @@ gitsnapshot: distclean tangle #+END_SRC * TODO configuration misc :configuration: -** dub :dub: +** 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: +*** TODO dub.sdl [#A] :sdl: **** header :header: #+BEGIN_SRC sh :tangle dub.sdl @@ -650,7 +651,8 @@ configuration "sdp-debug-unittest-ldc" { platforms "posix" compiler "ldc2" targetName "sdp-debug-ldc" - dflags "-J=views" "-I=src/sdp" "-Dddocs" + dflags "-J=views" "-I=src/sdp" + #dflags "-J=views" "-I=src/sdp" "-Dddocs" buildRequirements "allowWarnings" buildOptions "verbose" "debugMode" "debugInfo" "unittests" "optimize" debugVersions "checkdoc" "summary" @@ -740,7 +742,7 @@ configuration "sdp-debug-docs-gdc" { } #+END_SRC -*** +dub.json+ :json: +*** +dub.json+ :json: **** +sdp+ #+BEGIN_SRC json :tangle no @@ -760,7 +762,7 @@ configuration "sdp-debug-docs-gdc" { } #+END_SRC -** .gitignore :gitignore: +** .gitignore :gitignore: #+BEGIN_SRC sh :tangle .gitignore # git ls-files --others --exclude-from=.git/info/exclude @@ -793,7 +795,7 @@ configuration "sdp-debug-docs-gdc" { #*.\#* #+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/sdp/ @@ -827,18 +829,18 @@ emacs --batch -Q -q \ #+END_SRC * dub zfunc :zfunc: -** ,dubdmd :dmd: +** ,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 * D build notes :notes: -** compilers :compiler: -*** dmd [#A] :dmd: +** compilers :compiler: +*** dmd [#A] :dmd: #+BEGIN_SRC sh dmd -de -w -J./views -I./src/sdp -unittest -debug=checkdoc -debug=summary -debug=dumpdoc -of./bin/sdp ./src/sdp.d @@ -846,7 +848,7 @@ dmd -de -w -J./views -I./src/sdp -of./bin/sdp ./src/sdp.d dmd -de -w -J./views -I./src/sdp -O -release -of./bin/sdp ./src/sdp.d #+END_SRC -*** ldc2 [#A] :ldc2: +*** ldc2 [#A] :ldc2: #+BEGIN_SRC sh ldc2 -de -w -J./views -I./src/sdp -unittest -d-debug=checkdoc -d-debug=summary -d-debug=dumpdoc -of=./bin/sdp ./src/sdp.d @@ -854,7 +856,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 -*** gdc (not done) [#F] :gdc: +*** gdc (not done) [#F] :gdc: not done @@ -867,8 +869,8 @@ not done "gdc might be worth a shot if your code is compatible", profan re: dmd "one can easily get 2x (and even more) speedup by simply switching to gdc -O2", ketmar -** build tools :build:tool: -*** rdmd [#C] :rdmd: +** build tools :build:tool: +*** rdmd [#C] :rdmd: flags similar to dmd @@ -884,7 +886,7 @@ rdmd -de -w -J./views -I./src/sdp -unittest -debug=checkdoc -debug=summary -debu rdmd -de -w -J./views -I./src/sdp -unittest -d-debug=checkdoc -d-debug=summary -d-debug=dumpdoc --compiler=ldc2 -of./bin/sdp ./src/sdp.d #+END_SRC -*** dub [#A] :dub: +*** dub [#A] :dub: https://github.com/dlang/dub/ http://code.dlang.org/getting_started http://code.dlang.org/docs/commandline @@ -955,9 +957,10 @@ 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: +** TODO debug options list [#A] :debug: #+BEGIN_SRC sh :tangle no +debugVersions "asserts" debugVersions "biblio" debugVersions "biblio0" debugVersions "bibliobuild" @@ -977,6 +980,9 @@ debugVersions "configfile" debugVersions "dumpdoc" debugVersions "endnotes" debugVersions "endnotes_build" +debugVersions "epubmanifest" +debugVersions "epub_archive" +debugVersions "epub_output" debugVersions "footnotes" debugVersions "footnotesdone" debugVersions "glossary" @@ -1004,6 +1010,7 @@ debugVersions "parabulletindent" debugVersions "paraindent" debugVersions "paraindenthang" debugVersions "parent" +debugVersions "paths" debugVersions "poem" debugVersions "quote" debugVersions "raw" @@ -1022,12 +1029,16 @@ debugVersions "section_bookindex" debugVersions "section_bookindex_seg" debugVersions "section_bookindex_scroll" debugVersions "section_blurb" +debugVersions "segnames" +debugVersions "sisupod" +debugVersions "sisupod_zip" debugVersions "source" debugVersions "srclines" debugVersions "structattrib" debugVersions "summary" debugVersions "table" debugVersions "toc" +debugVersions "toc_nav_dom" #+END_SRC ** make (emacs) -- cgit v1.2.3