From 4623bdcff2d96192a3399fe9601856a5fb934ed9 Mon Sep 17 00:00:00 2001 From: Ralph Amissah Date: Thu, 5 Sep 2019 11:14:52 -0400 Subject: build related --- .gitignore | 19 ++++++++++++++++ dub.sdl | 14 +++++++----- dub.selections.json | 6 +++-- makefile | 8 ++++--- meson.build | 13 +++++++++-- org/dr_build_scaffold.org | 58 ++++++++++++++++++++++++++++++++++++----------- 6 files changed, 92 insertions(+), 26 deletions(-) diff --git a/.gitignore b/.gitignore index c87e3ae..87bd2c0 100644 --- a/.gitignore +++ b/.gitignore @@ -19,10 +19,20 @@ !src !src/doc_reform !src/doc_reform/* +!src_toml +!src_toml/doc_reform +!src_toml/doc_reform/* +!src_yaml +!src_yaml/doc_reform +!src_yaml/doc_reform/* !data !data/* !data/src/** +!data/src_toml/** +!data/src_yaml/** !data/pod/** +!data/pod_toml/** +!data/pod_yaml/** !*.sst !*.ssm !**/*.sst @@ -38,6 +48,12 @@ !sisudoc !views !docs/*.html +!notes +notes/** +!notes/*.org +!notes/sisu-description.sst +!notes/reminders +!notes/reminders/** .dub/** tmp/** *_.org @@ -51,3 +67,6 @@ tmp/** #*~ #\#* #*.\#* +#!debian +#!debian/* +#.reggae/** diff --git a/dub.sdl b/dub.sdl index b695132..475bd14 100644 --- a/dub.sdl +++ b/dub.sdl @@ -10,12 +10,14 @@ stringImportPaths "./views" buildRequirements "allowWarnings" targetType "executable" platforms "posix" -dependency "archive" version="~>0.6.0" # http://code.dlang.org/packages/archive https://github.com/rcythr/archive -dependency "d2sqlite3" version="~>0.16.2" # https://code.dlang.org/packages/d2sqlite3 http://biozic.github.io/d2sqlite3/d2sqlite3.html - subconfiguration "d2sqlite3" "all-included" -dependency "imageformats" version="~>7.0.0" # https://code.dlang.org/packages/imageformats https://github.com/lgvz/imageformats -dependency "toml" version="~>1.0.0-rc.3" # https://code.dlang.org/packages/toml https://github.com/toml-lang/toml/wiki -dependency "toml:json" version="~>1.0.0-rc.3" +dependency "archive" version="~>0.6.0" # http://code.dlang.org/packages/archive https://github.com/rcythr/archive +dependency "d2sqlite3" version="~>0.18.3" # https://code.dlang.org/packages/d2sqlite3 http://biozic.github.io/d2sqlite3/d2sqlite3.html + subconfiguration "d2sqlite3" "all-included" +dependency "imageformats" version="~>7.0.1" # https://code.dlang.org/packages/imageformats https://github.com/lgvz/imageformats +dependency "toml" version="~>1.0.0-rc.3" # https://code.dlang.org/packages/toml https://github.com/toml-lang/toml/wiki +dependency "toml:json" version="~>1.0.0-rc.3" +dependency "dyaml" version="~>0.8.0" +dependency "tinyendian" version="~>0.2.0" // for dyaml configuration "default" { targetName "doc-reform" postGenerateCommands "/usr/bin/notify-send -t 0 'D executable ready' 'doc-reform'" diff --git a/dub.selections.json b/dub.selections.json index 58bf72a..22b6951 100644 --- a/dub.selections.json +++ b/dub.selections.json @@ -2,11 +2,13 @@ "fileVersion": 1, "versions": { "archive": "0.6.0", - "d2sqlite3": "0.16.2", - "imageformats": "7.0.0", + "d2sqlite3": "0.18.3", + "dyaml": "0.8.0", + "imageformats": "7.0.1", "libinputvisitor": "1.2.2", "sdlang-d": "0.10.2", "taggedalgebraic": "0.10.9", + "tinyendian": "0.2.0", "toml": "1.0.0-rc.3", "unit-threaded": "0.6.36" } diff --git a/makefile b/makefile index d9a0f13..380fd70 100644 --- a/makefile +++ b/makefile @@ -109,7 +109,7 @@ dmd_debug: $(DUB) --compiler=dmd --config=dmd -b debug dmd_ver: $(DUB) --compiler=dmd --config=dmd-version - mv bin/doc-reform-dmd-ver bin/doc-reform-$(PROJECT_VERSION)-dmd + mv bin/doc-reform-dmd-ver bin-archive/doc-reform-$(PROJECT_VERSION)-dmd notify-send -t 0 'D dmd compiled test release executable ready' 'doc-reform-$(PROJECT_VERSION)-dmd' dmd_clean_ver: clean tangle dmd_ver dmd_rel: expunge skel tangle @@ -125,7 +125,7 @@ gdc_debug: $(DUB) --compiler=gdc --config=gdc -b debug gdc_ver: $(DUB) --compiler=gdc --config=gdc-version - mv bin/doc-reform-gdc-ver bin/doc-reform-$(PROJECT_VERSION)-gdc + mv bin/doc-reform-gdc-ver bin-archive/doc-reform-$(PROJECT_VERSION)-gdc notify-send -t 0 'D gdc compiled test release executable ready' 'doc-reform-$(PROJECT_VERSION)-gdc' gdc_clean_ver: clean tangle gdc_ver gdc_rel: expunge skel tangle @@ -141,7 +141,7 @@ ldc_debug: $(DUB) --compiler=ldc2 --config=ldc -b debug ldc_ver: $(DUB) --compiler=ldc2 --config=ldc-version - mv bin/doc-reform-ldc-ver bin/doc-reform-$(PROJECT_VERSION)-ldc + mv bin/doc-reform-ldc-ver bin-archive/doc-reform-$(PROJECT_VERSION)-ldc notify-send -t 0 'D ldc2 compiled test release executable ready' 'doc-reform-$(PROJECT_VERSION)-ldc' ldc_clean_ver: clean tangle ldc_ver ldc_rel: expunge skel tangle @@ -153,6 +153,8 @@ ldc_debug_tangle: tangle $(DUB) --compiler=ldc2 --config=doc-reform-ldc-debug reinit: clean skel tangle skel: + mkdir -p $(PRG_BINDIR); \ + mkdir -p $(PRG_BINDIR)-archive; \ mkdir -p build; \ mkdir -p subprojects; \ mkdir -p views; \ diff --git a/meson.build b/meson.build index 1b87097..1d54829 100644 --- a/meson.build +++ b/meson.build @@ -1,17 +1,23 @@ project('doc-reform', 'd', - license: 'GPL3', + license: 'AGPL3', version: '0.26.5', meson_version: '>=0.46' ) -doc_reform_sources = [ 'src/doc_reform/doc_reform.d', +doc_reform_sources = [ + 'src/doc_reform/doc_reform.d', 'src/doc_reform/conf/compile_time_info.d', 'src/doc_reform/meta/conf_make_meta_json.d', 'src/doc_reform/meta/conf_make_meta_structs.d', 'src/doc_reform/meta/conf_make_meta_toml.d', + 'src/doc_reform/meta/conf_make_meta_yaml.d', 'src/doc_reform/meta/defaults.d', 'src/doc_reform/meta/doc_debugs.d', 'src/doc_reform/meta/metadoc.d', 'src/doc_reform/meta/metadoc_from_src.d', + 'src/doc_reform/meta/metadoc_harvest.d', + 'src/doc_reform/meta/metadoc_harvests_authors.d', + 'src/doc_reform/meta/metadoc_harvests_topics.d', + 'src/doc_reform/meta/metadochead.d', 'src/doc_reform/meta/metadoc_summary.d', 'src/doc_reform/meta/object_setter.d', 'src/doc_reform/meta/package.d', @@ -21,6 +27,8 @@ doc_reform_sources = [ 'src/doc_reform/doc_reform.d', 'src/doc_reform/output/epub3.d', 'src/doc_reform/output/html.d', 'src/doc_reform/output/hub.d', + 'src/doc_reform/output/latex.d', + 'src/doc_reform/output/odt.d', 'src/doc_reform/output/package.d', 'src/doc_reform/output/paths_output.d', 'src/doc_reform/output/rgx.d', @@ -28,6 +36,7 @@ doc_reform_sources = [ 'src/doc_reform/doc_reform.d', 'src/doc_reform/output/sqlite.d', 'src/doc_reform/output/xmls_css.d', 'src/doc_reform/output/xmls.d', + 'src/doc_reform/share/defaults.d', 'src/doc_reform/source/paths_source.d', 'src/doc_reform/source/read_config_files.d', 'src/doc_reform/source/read_source_files.d', diff --git a/org/dr_build_scaffold.org b/org/dr_build_scaffold.org index 80969ad..267594f 100644 --- a/org/dr_build_scaffold.org +++ b/org/dr_build_scaffold.org @@ -253,7 +253,7 @@ dmd_debug: #+BEGIN_SRC makefile :tangle ../makefile dmd_ver: $(DUB) --compiler=dmd --config=dmd-version - mv bin/doc-reform-dmd-ver bin/doc-reform-$(PROJECT_VERSION)-dmd + mv bin/doc-reform-dmd-ver bin-archive/doc-reform-$(PROJECT_VERSION)-dmd notify-send -t 0 'D dmd compiled test release executable ready' 'doc-reform-$(PROJECT_VERSION)-dmd' dmd_clean_ver: clean tangle dmd_ver #+END_SRC @@ -293,7 +293,7 @@ gdc_debug: #+BEGIN_SRC makefile :tangle ../makefile gdc_ver: $(DUB) --compiler=gdc --config=gdc-version - mv bin/doc-reform-gdc-ver bin/doc-reform-$(PROJECT_VERSION)-gdc + mv bin/doc-reform-gdc-ver bin-archive/doc-reform-$(PROJECT_VERSION)-gdc notify-send -t 0 'D gdc compiled test release executable ready' 'doc-reform-$(PROJECT_VERSION)-gdc' gdc_clean_ver: clean tangle gdc_ver #+END_SRC @@ -333,7 +333,7 @@ ldc_debug: #+BEGIN_SRC makefile :tangle ../makefile ldc_ver: $(DUB) --compiler=ldc2 --config=ldc-version - mv bin/doc-reform-ldc-ver bin/doc-reform-$(PROJECT_VERSION)-ldc + mv bin/doc-reform-ldc-ver bin-archive/doc-reform-$(PROJECT_VERSION)-ldc notify-send -t 0 'D ldc2 compiled test release executable ready' 'doc-reform-$(PROJECT_VERSION)-ldc' ldc_clean_ver: clean tangle ldc_ver #+END_SRC @@ -356,6 +356,8 @@ ldc_debug_tangle: tangle #+BEGIN_SRC makefile :tangle ../makefile reinit: clean skel tangle skel: + mkdir -p $(PRG_BINDIR); \ + mkdir -p $(PRG_BINDIR)-archive; \ mkdir -p build; \ mkdir -p subprojects; \ mkdir -p views; \ @@ -849,12 +851,14 @@ stringImportPaths "./views" buildRequirements "allowWarnings" targetType "executable" platforms "posix" -dependency "archive" version="~>0.6.0" # http://code.dlang.org/packages/archive https://github.com/rcythr/archive -dependency "d2sqlite3" version="~>0.16.2" # https://code.dlang.org/packages/d2sqlite3 http://biozic.github.io/d2sqlite3/d2sqlite3.html - subconfiguration "d2sqlite3" "all-included" -dependency "imageformats" version="~>7.0.0" # https://code.dlang.org/packages/imageformats https://github.com/lgvz/imageformats -dependency "toml" version="~>1.0.0-rc.3" # https://code.dlang.org/packages/toml https://github.com/toml-lang/toml/wiki -dependency "toml:json" version="~>1.0.0-rc.3" +dependency "archive" version="~>0.6.0" # http://code.dlang.org/packages/archive https://github.com/rcythr/archive +dependency "d2sqlite3" version="~>0.18.3" # https://code.dlang.org/packages/d2sqlite3 http://biozic.github.io/d2sqlite3/d2sqlite3.html + subconfiguration "d2sqlite3" "all-included" +dependency "imageformats" version="~>7.0.1" # https://code.dlang.org/packages/imageformats https://github.com/lgvz/imageformats +dependency "toml" version="~>1.0.0-rc.3" # https://code.dlang.org/packages/toml https://github.com/toml-lang/toml/wiki +dependency "toml:json" version="~>1.0.0-rc.3" +dependency "dyaml" version="~>0.8.0" +dependency "tinyendian" version="~>0.2.0" // for dyaml #+END_SRC ** default @@ -994,21 +998,29 @@ http://mesonbuild.com/Dependencies.html#Dub *** projects +tree -fi ./src |rg "\.d$" + #+BEGIN_SRC sh :tangle ../meson.build project('doc-reform', 'd', - license: 'GPL3', + license: 'AGPL3', version: '0.26.5', meson_version: '>=0.46' ) -doc_reform_sources = [ 'src/doc_reform/doc_reform.d', +doc_reform_sources = [ + 'src/doc_reform/doc_reform.d', 'src/doc_reform/conf/compile_time_info.d', 'src/doc_reform/meta/conf_make_meta_json.d', 'src/doc_reform/meta/conf_make_meta_structs.d', 'src/doc_reform/meta/conf_make_meta_toml.d', + 'src/doc_reform/meta/conf_make_meta_yaml.d', 'src/doc_reform/meta/defaults.d', 'src/doc_reform/meta/doc_debugs.d', 'src/doc_reform/meta/metadoc.d', 'src/doc_reform/meta/metadoc_from_src.d', + 'src/doc_reform/meta/metadoc_harvest.d', + 'src/doc_reform/meta/metadoc_harvests_authors.d', + 'src/doc_reform/meta/metadoc_harvests_topics.d', + 'src/doc_reform/meta/metadochead.d', 'src/doc_reform/meta/metadoc_summary.d', 'src/doc_reform/meta/object_setter.d', 'src/doc_reform/meta/package.d', @@ -1018,6 +1030,8 @@ doc_reform_sources = [ 'src/doc_reform/doc_reform.d', 'src/doc_reform/output/epub3.d', 'src/doc_reform/output/html.d', 'src/doc_reform/output/hub.d', + 'src/doc_reform/output/latex.d', + 'src/doc_reform/output/odt.d', 'src/doc_reform/output/package.d', 'src/doc_reform/output/paths_output.d', 'src/doc_reform/output/rgx.d', @@ -1025,6 +1039,7 @@ doc_reform_sources = [ 'src/doc_reform/doc_reform.d', 'src/doc_reform/output/sqlite.d', 'src/doc_reform/output/xmls_css.d', 'src/doc_reform/output/xmls.d', + 'src/doc_reform/share/defaults.d', 'src/doc_reform/source/paths_source.d', 'src/doc_reform/source/read_config_files.d', 'src/doc_reform/source/read_source_files.d', @@ -1147,10 +1162,20 @@ revision = head !src !src/doc_reform !src/doc_reform/* +!src_toml +!src_toml/doc_reform +!src_toml/doc_reform/* +!src_yaml +!src_yaml/doc_reform +!src_yaml/doc_reform/* !data !data/* !data/src/** +!data/src_toml/** +!data/src_yaml/** !data/pod/** +!data/pod_toml/** +!data/pod_yaml/** !*.sst !*.ssm !**/*.sst @@ -1166,6 +1191,12 @@ revision = head !sisudoc !views !docs/*.html +!notes +notes/** +!notes/*.org +!notes/sisu-description.sst +!notes/reminders +!notes/reminders/** .dub/** tmp/** *_.org @@ -1179,6 +1210,9 @@ tmp/** #*~ #\#* #*.\#* +#!debian +#!debian/* +#.reggae/** #+END_SRC * sh script to batch process _emacs org babel tangle_ :shell_script:tangle: @@ -1348,7 +1382,6 @@ https://code.dlang.org/docs/commandline dub list dub upgrade -dub fetch sdlang-d dub fetch taggedalgebraic dub fetch libinputvisitor dub fetch unit-threaded ? @@ -1403,7 +1436,6 @@ parent poem quote raw -sdlang source srclines structattrib -- cgit v1.2.3