From 1083951efc4f8ddbf8de65907cc5aee2ac6be2ed Mon Sep 17 00:00:00 2001 From: Ralph Amissah Date: Sat, 5 Oct 2019 20:45:42 -0400 Subject: 0.8.1 conf, make, meta: yaml only (toml removed) - yaml only: config, make & headers (yaml is converted directly to struct) - toml removed: preemptively remove confusion of having multiple config formats (toml was converted to json & json to struct) - json removed (intermediate representation): takes out intermediate conversion to json which could be attractive to have if there are multiple formats --- org/dr_build_scaffold.org | 29 ----------------------------- 1 file changed, 29 deletions(-) (limited to 'org/dr_build_scaffold.org') diff --git a/org/dr_build_scaffold.org b/org/dr_build_scaffold.org index 815be88..ca6b224 100644 --- a/org/dr_build_scaffold.org +++ b/org/dr_build_scaffold.org @@ -854,8 +854,6 @@ platforms "posix" 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 @@ -1010,7 +1008,6 @@ doc_reform_sources = [ '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', @@ -1048,7 +1045,6 @@ sources_dir = include_directories('src/') # Dependencies dep_d2sqlite3 = dependency('d2sqlite3', version: '>= 0.16.2', fallback: ['d2sqlite3', 'd2sqlite3_dep']) dep_imageformats = dependency('imageformats-d', version: '>= 7.0.0', fallback: ['imageformats-d', 'imageformats_dep']) -dep_toml = dependency('toml-d', version: '>= 1.0.0', fallback: ['toml-d', 'toml_dep']) # executable doc_reform_exe = executable('rad', [doc_reform_sources], @@ -1057,7 +1053,6 @@ doc_reform_exe = executable('rad', dependencies : [ dep_d2sqlite3, dep_imageformats, - dep_toml ], install : true ) @@ -1081,14 +1076,6 @@ imageformats - https://github.com/lgvz/imageformats - mathias - https://github.com/ximion/imageformats.git - -toml -- dub - - https://code.dlang.org/packages/toml -- upstream - - https://github.com/Kripth/toml -- mathias - - https://github.com/ximion/toml.git #+END_SRC *** d2sqlite3 @@ -1109,15 +1096,6 @@ url = https://github.com/ximion/imageformats.git revision = head #+END_SRC -*** toml-d - -#+BEGIN_SRC sh :tangle ../subprojects/toml-d.wrap -[wrap-git] -directory = toml-d -url = https://github.com/ximion/toml.git -revision = head -#+END_SRC - * .gitignore :gitignore: #+BEGIN_SRC sh :tangle ../.gitignore @@ -1142,19 +1120,14 @@ 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 @@ -1166,8 +1139,6 @@ revision = head !pod.manifest !sisu_document_make !config_local_site -!sisu_document_make.toml -!config_local_site.toml !sisudoc !views !docs/*.html -- cgit v1.2.3