From 24269204508d8cf8f963eb9c7d149d18840e4dad Mon Sep 17 00:00:00 2001
From: Ralph Amissah <ralph.amissah@gmail.com>
Date: Thu, 12 Aug 2021 13:14:49 -0400
Subject: config, clean up and make a bit more consistent

- check version settings with:
  rg -A2 _version_set$ org
---
 org/config_meson.org | 54 ++++++++++++++++++++++++++--------------------------
 1 file changed, 27 insertions(+), 27 deletions(-)

(limited to 'org/config_meson.org')

diff --git a/org/config_meson.org b/org/config_meson.org
index 52cfa51..1366f8b 100644
--- a/org/config_meson.org
+++ b/org/config_meson.org
@@ -17,10 +17,10 @@
 #+PROPERTY:    header-args+ :mkdirp yes
 
 * spine
-** version info VERSION :version:set:project:
-*** project
+** version info SET VERSION :version:set:project:
+*** project SET VERSION
 
-#+NAME: version_spine
+#+NAME: spine_version_set
 #+BEGIN_SRC sh
 0.11.3
 #+END_SRC
@@ -30,7 +30,7 @@
 - d2sqlite3
   https://code.dlang.org/packages/d2sqlite3
 
-#+NAME: version_d2sqlite3
+#+NAME: d2sqlite3_version_set
 #+BEGIN_SRC sh
 0.19.1
 #+END_SRC
@@ -38,7 +38,7 @@
 - imageformats
   https://code.dlang.org/packages/imageformats
 
-#+NAME: version_imageformats
+#+NAME: imageformats_version_set
 #+BEGIN_SRC sh
 7.0.2
 #+END_SRC
@@ -46,7 +46,7 @@
 - dyaml
   https://code.dlang.org/packages/dyaml
 
-#+NAME: version_dyaml
+#+NAME: dyaml_version_set
 #+BEGIN_SRC sh
 0.8.3
 #+END_SRC
@@ -54,7 +54,7 @@
 - tinyendian
   https://code.dlang.org/packages/tinyendian
 
-#+NAME: version_tinyendian
+#+NAME: tinyendian_version_set
 #+BEGIN_SRC sh
 0.2.0
 #+END_SRC
@@ -63,14 +63,14 @@
 
 - meson
 
-#+NAME: version_meson
+#+NAME: meson_version_set
 #+BEGIN_SRC sh
 0.46
 #+END_SRC
 
 - soversion
 
-#+NAME: version_soversion
+#+NAME: soversion_version_set
 #+BEGIN_SRC sh
 0
 #+END_SRC
@@ -115,8 +115,8 @@ cat spine_sources.txt
 #+BEGIN_SRC sh
 project('spine', 'd',
   license: 'AGPL-3',
-  version: '<<version_spine>>',
-  meson_version: '>=<<version_meson>>'
+  version: '<<spine_version_set>>',
+  meson_version: '>=<<meson_version_set>>'
 )
 #if meson.get_compiler('d').get_id() == 'gcc'
 #    error('spine cannot be compiled with GDC at time. Sorry.')
@@ -165,10 +165,10 @@ spine_src = [
 source_root = meson.source_root()
 src_dir = include_directories('src/')
 # Dependencies
-dep_tinyendian   = dependency('tinyendian',   version: '>= <<version_tinyendian>>',  fallback: ['tinyendian',   'tinyendian_dep'],   method: 'dub')
-dep_dyaml        = dependency('dyaml',        version: '>= <<version_dyaml>>',  fallback: ['dyaml',        'dyaml_dep'],        method: 'dub')
-dep_d2sqlite3    = dependency('d2sqlite3',    version: '>= <<version_d2sqlite3>>', fallback: ['d2sqlite3',    'd2sqlite3_dep'],    method: 'dub')
-dep_imageformats = dependency('imageformats', version: '>= <<version_imageformats>>',  fallback: ['imageformats', 'imageformats_dep'], method: 'dub')
+dep_tinyendian   = dependency('tinyendian',   version: '>= <<tinyendian_version_set>>',  fallback: ['tinyendian',   'tinyendian_dep'],   method: 'dub')
+dep_dyaml        = dependency('dyaml',        version: '>= <<dyaml_version_set>>',  fallback: ['dyaml',        'dyaml_dep'],        method: 'dub')
+dep_d2sqlite3    = dependency('d2sqlite3',    version: '>= <<d2sqlite3_version_set>>', fallback: ['d2sqlite3',    'd2sqlite3_dep'],    method: 'dub')
+dep_imageformats = dependency('imageformats', version: '>= <<imageformats_version_set>>',  fallback: ['imageformats', 'imageformats_dep'], method: 'dub')
 # Executable
 spine_exe = executable('spine',
   [spine_src],
@@ -229,12 +229,12 @@ revision  = head
 #+HEADER: :NO-tangle ../subprojects/d2sqlite3.meson.build
 #+BEGIN_SRC sh
 project('d2sqlite3', 'd',
-  meson_version: '>=<<version_meson>>',
+  meson_version: '>=<<meson_version_set>>',
   license: 'BSL-1.0',
-  version: '<<version_d2sqlite3>>'
+  version: '<<d2sqlite3_version_set>>'
 )
 
-project_soversion = '<<version_soversion>>'
+project_soversion = '<<soversion_version_set>>'
 
 src_dir = include_directories('source/')
 pkgc = import('pkgconfig')
@@ -296,12 +296,12 @@ Upstream provides meson.build
 #+HEADER: :NO-tangle ../subprojects/D-YAML/meson.build
 #+BEGIN_SRC sh
 project('D-YAML', 'd',
-    meson_version: '>=<<version_meson>>',
+    meson_version: '>=<<meson_version_set>>',
     subproject_dir: 'contrib',
-    version: '<<version_dyaml>>'
+    version: '<<dyaml_version_set>>'
 )
 
-project_soversion    = '<<version_soversion>>'
+project_soversion    = '<<soversion_version_set>>'
 
 src_dir = include_directories('source/')
 pkgc = import('pkgconfig')
@@ -342,7 +342,7 @@ dyaml_src = [
 ]
 install_subdir('source/dyaml', install_dir: 'include/d/yaml/')
 
-tinyendian_dep = dependency('tinyendian', version: '>=<<version_tinyendian>>', fallback: ['tinyendian', 'tinyendian_dep'])
+tinyendian_dep = dependency('tinyendian', version: '>=<<tinyendian_version_set>>', fallback: ['tinyendian', 'tinyendian_dep'])
 
 dyaml_lib = library('dyaml',
         [dyaml_src],
@@ -383,12 +383,12 @@ revision  = head
 #+HEADER: :NO-tangle ../subprojects/imageformats.meson.build
 #+BEGIN_SRC sh
 project('imageformats', 'd',
-  meson_version: '>=<<version_meson>>',
+  meson_version: '>=<<meson_version_set>>',
   license: 'BSL-1.0',
-  version: '<<version_imageformats>>'
+  version: '<<imageformats_version_set>>'
 )
 
-project_soversion = '<<version_soversion>>'
+project_soversion = '<<soversion_version_set>>'
 
 src_dir = include_directories('.')
 pkgc = import('pkgconfig')
@@ -446,8 +446,8 @@ Upstream provides meson.build
 project(
     'tinyendian',
     'd',
-    meson_version: '>=<<version_meson>>',
-    version: '<<version_tinyendian>>',
+    meson_version: '>=<<meson_version_set>>',
+    version: '<<tinyendian_version_set>>',
     default_options: ['buildtype=release'],
 )
 
-- 
cgit v1.2.3