maker, subprojects arrange, minordoc-reform_v0.0.27

1 files changed, 24 insertions, 8 deletions

diff --git a/maker.org b/maker.org
index b2cc94f..7dd9906 100644
--- a/maker.org
+++ b/maker.org
@@ -187,6 +187,22 @@ all_ver: dmd_ver ldc_ver gdc_ver
 all_debug: dmd_debug gdc_debug ldc_debug
 #+END_SRC
 
+******** _meson_ build                                           :meson:
+
+#+BEGIN_SRC makefile :tangle makefile
+meson:
+	rm -r build && mkdir build
+	meson --buildtype=debugoptimized build
+	ninja -C build
+mesonredo:
+	rm -r build && mkdir build
+	meson --buildtype=debugoptimized build
+	ninja -C build
+mesonclean: clean skel tangle
+	meson --buildtype=debugoptimized build
+	ninja -C build
+#+END_SRC
+
 ******* clean & tangle                                   :clean:tangle:
 ******** default                                             :default:
 
@@ -818,12 +834,12 @@ targetPath          "./bin"
 #sourcePath          "./src/sdp"
 stringImportPaths   "./views"
 buildRequirements   "allowWarnings"
-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.16.2"     # https://code.dlang.org/packages/d2sqlite3     http://biozic.github.io/d2sqlite3/d2sqlite3.html
   subconfiguration  "d2sqlite3"   "all-included"
-dependency          "archive"      version="~>0.6.0"      # http://code.dlang.org/packages/archive        https://github.com/rcythr/archive
 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"
 #+END_SRC
 
 ** generic                                                         :generic:
@@ -1108,20 +1124,20 @@ sdp_sources = [ 'src/sdp/sdp.d',
 source_root = meson.source_root()
 sources_dir = include_directories('src/')
 # Dependencies
-dep_toml         = dependency('toml-d',         version: '>= 1.0.0',  fallback: ['toml-d',         'toml_dep'])
-dep_d2sqlite3    = dependency('d2sqlite3',      version: '>= 0.16.2', fallback: ['d2sqlite3',      'd2sqlite3_dep'])
 dep_archive      = dependency('archive',        version: '>= 0.6.0',  fallback: ['archived',       'archive_dep'])
+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
 sdp_exe = executable('sdp',
   [sdp_sources],
   include_directories : [sources_dir],
   d_import_dirs: [include_directories('views')],
   dependencies : [
-    dep_toml,
-    dep_d2sqlite3,
     dep_archive,
-    dep_imageformats
+    dep_d2sqlite3,
+    dep_imageformats,
+    dep_toml
   ],
   install : true
 )