enhancing and cleaning meson.build

Author: okbob

README.md

@@ -971,7 +971,8 @@ or compile by self:
 1. `meson setup build`
 2. `cd build`
 3. `ninja`
-4. `sudo ninja install`
+4. `ninja install`
+5. optionaly `ninja bindist`
 
 ## Checked on
 

meson.build

@@ -1,4 +1,4 @@
-project('plpgsql_check', ['c'], version: '2.7')
+project('plpgsql_check', ['c'], version: '2.7.13')
 
 pg_config = find_program('pg_config')
 
@@ -11,7 +11,6 @@ libdir = run_command(pg_config, '--libdir', check: true).stdout().strip()
 
 versionstring = run_command(pg_config, '--version', check: true).stdout().strip()
 pg_version = versionstring.split(' ')[1]
-plpgsql_check_version = meson.project_version()
 
 if pg_version.endswith('devel')
   pg_version_arr = [pg_version.split('devel')[0], '0']
@@ -27,7 +26,12 @@ pg_version_major = pg_version_arr[0].to_int()
 pg_version_minor = pg_version_arr[1].to_int()
 pg_version_num = (pg_version_major * 10000) + pg_version_minor
 
-plpgsql_check_sources = files(
+module_version_minor = meson.project_version()
+module_version_arr = module_version_minor.split('.')
+module_version = module_version_arr[0] + '.' + module_version_arr[1]
+module_name = meson.project_name()
+
+sources = files(
   'src/assign.c',
   'src/cursors_leaks.c',
   'src/format.c',
@@ -47,6 +51,14 @@ plpgsql_check_sources = files(
   'src/tracer.c',
 )
 
+data = [ module_name + '.control',
+         module_name + '--' + module_version + '.sql' ]
+
+tests = [ 'plpgsql_check_active',
+          'plpgsql_check_passive',
+          'plpgsql_check_active-'  + pg_version_major.to_string(),
+          'plpgsql_check_passive-' + pg_version_major.to_string() ]
+
 compilerName = meson.get_compiler('c').get_id()
 
 if meson.get_compiler('c').get_id() == 'msvc'
@@ -61,39 +73,55 @@ if meson.get_compiler('c').get_id() == 'msvc'
                                             required: true
                                          )
 else
-  incdir = [includedir_server]
+  incdir = [ includedir_server ]
   postgres_lib = ''
 endif
 
-plpgsql_check_lib = shared_module(
-  'plpgsql_check',
-  plpgsql_check_sources,
+module_lib = shared_module(
+  module_name,
+  sources,
   include_directories: incdir,
   install: true,
   install_dir: pkglibdir,
   name_prefix: '',
   dependencies: postgres_lib,
 )
 
-install_data(
-  'plpgsql_check.control',
-  'plpgsql_check--' + plpgsql_check_version + '.sql',
-  install_dir: sharedir / 'extension',
-)
+install_data(data, install_dir: sharedir / 'extension')
+
+fs = import('fs')
+bindistdir = fs.expanduser('~' / module_name / module_name + '-' +
+  '-'.join( [ module_version_minor,
+              target_machine.cpu(),
+              target_machine.system() ] ))
+
+lib_name = fs.name(module_lib.full_path())
+lib_suffix = lib_name.split('.')[1]
+
+python_exe = find_program('python3', 'python')
+
+custom_target('bindist',
+  depends: module_lib,
+  input: module_lib,
+  output: 'bindist',
+  command: [ python_exe,
+             meson.current_source_dir() / 'install_bindist.py',
+             meson.current_source_dir(),
+             bindistdir,
+             module_lib.full_path(),
+             fs.stem(lib_name) + '_' + pg_version_major.to_string() + '.' + lib_suffix,
+             data ],
+  install: false,
+  build_by_default: false)
 
 pg_regress = find_program(
   'pg_regress',
   dirs: [pkglibdir / 'pgxs/src/test/regress']
 )
 
-regress_tests = ['plpgsql_check_active',
-                 'plpgsql_check_passive',
-                 'plpgsql_check_active-'  + pg_version_major.to_string(),
-                 'plpgsql_check_passive-' + pg_version_major.to_string()]
-
 test('regress',
   pg_regress,
-  args: ['--bindir', bindir,
-         '--inputdir', meson.current_source_dir(),
-        ] + regress_tests,
+  args: [ '--bindir', bindir,
+          '--inputdir', meson.current_source_dir(),
+        ]  + tests,
 )