Merge pull request #889 from OreoYang/meson_build_v0_61

gaoxueyu · web-flow · commit cea5eaeb6542 · 2025-09-22T14:45:34.000+08:00
fix some meson build issues
diff --git a/.github/workflows/meson_build.yml b/.github/workflows/meson_build.yml
@@ -24,12 +24,12 @@ jobs:
               libreadline-dev libedit-dev uuid-dev libossp-uuid-dev \
               libipc-run-perl libtime-hires-perl libtest-simple-perl \
               libgssapi-krb5-2 libicu-dev
-        curl -L "https://github.com/mesonbuild/meson/releases/download/0.57.2/meson-0.57.2.tar.gz" -o meson-0.57.2.tar.gz
+        curl -L "https://github.com/mesonbuild/meson/releases/download/1.0.1/meson-1.0.1.tar.gz" -o meson-1.0.1.tar.gz
         curl -L "https://github.com/ninja-build/ninja/releases/download/v1.10.1/ninja-linux.zip" -o ninja-linux.zip
         unzip -o ninja-linux.zip
         sudo cp ninja /usr/bin/
-        tar xzf meson-0.57.2.tar.gz
-        cd meson-0.57.2
+        tar xzf meson-1.0.1.tar.gz
+        cd meson-1.0.1
         sudo python3 setup.py install
     
     - name: configure - linux
diff --git a/contrib/gb18030_2022/meson.build b/contrib/gb18030_2022/meson.build
@@ -0,0 +1,50 @@
+# Portions Copyright (c) 2023-2025, IvorySQL Global Development Team
+
+gb18030_2022_src_files = files(
+  'utf8_and_gb18030_2022.c'
+)
+
+if host_system == 'windows'
+  gb18030_2022_src_files += rc_lib_gen.process(win32ver_rc, extra_args: [
+    '--NAME', 'gb18030_2022',
+    '--FILEDESC', 'gb18030_2022 - support gb18030 2022 with extension',])
+endif
+
+custom_target('gb18030_2022.bc',
+  output: 'utf8_and_gb18030_2022.bc',
+  command: [perl, '../contrib/ivorysql_ora/gensql.pl', 'meson', '1.0'],
+  capture: true,
+  install: true,
+  install_dir: contrib_data_args['install_dir'],
+)
+
+foreach file : ['utf8_and_gb18030_2022.bc', 'gb18030_2022.bc']
+  run_target(
+    file,
+    command: ['touch', meson.current_build_dir() / file]
+  )
+endforeach
+
+gb18030_2022 = shared_module('gb18030_2022',
+  gb18030_2022_src_files,
+  kwargs: contrib_mod_args,
+)
+contrib_targets += gb18030_2022
+
+install_data(
+  'gb18030_2022.control',
+  'gb18030_2022--1.0.sql',
+  kwargs: contrib_data_args,
+)
+
+tests += {
+  'name': 'gb18030_2022',
+  'sd': meson.current_source_dir(),
+  'bd': meson.current_build_dir(),
+  'regress': {
+    'sql': [
+      'gb18030_2022_and_utf8',
+      'copy',
+    ],
+  },
+}
diff --git a/contrib/ivorysql_ora/meson.build b/contrib/ivorysql_ora/meson.build
@@ -25,6 +25,7 @@ ivorysql_ora_sources = files(
   'src/builtin_functions/misc_functions.c',
   'src/merge/ora_merge.c',
   'src/sysview/sysview_functions.c',
+  'src/xml_functions/ora_xml_functions.c',
 )
 
 if host_system == 'windows'
@@ -52,6 +53,11 @@ install_data(
   kwargs: contrib_data_args,
 )
 
+install_data(
+  'preload_ora_misc.sql',
+  install_dir: dir_data,
+)
+
 tests += {
   'name': 'ivorysql_ora',
   'sd': meson.current_source_dir(),
diff --git a/contrib/meson.build b/contrib/meson.build
@@ -74,4 +74,5 @@ subdir('tsm_system_time')
 subdir('unaccent')
 subdir('uuid-ossp')
 subdir('vacuumlo')
+subdir('gb18030_2022')
 subdir('xml2')
diff --git a/meson.build b/meson.build
@@ -27,6 +27,8 @@ project('postgresql',
   ]
 )
 
+# IvorySQL version
+ivorysql_version = '5.0'
 
 
 ###############################################################
@@ -152,6 +154,8 @@ cdata.set_quoted('PG_MAJORVERSION', pg_version_major.to_string())
 cdata.set('PG_MAJORVERSION_NUM', pg_version_major)
 cdata.set('PG_MINORVERSION_NUM', pg_version_minor)
 cdata.set('PG_VERSION_NUM', pg_version_num)
+
+cdata.set('PACKAGE_IVORYSQL_VERSION', ivorysql_version)
 # PG_VERSION_STR is built later, it depends on compiler test results
 cdata.set_quoted('CONFIGURE_ARGS', '')
 
@@ -487,7 +491,7 @@ pkg = 'postgresql'
 
 dir_prefix = get_option('prefix')
 
-dir_prefix_contains_pg = (dir_prefix.contains('pgsql') or dir_prefix.contains('postgres'))
+dir_prefix_contains_pg = (dir_prefix.contains('pgsql') or dir_prefix.contains('postgres') or dir_prefix.contains('IvorySQL'))
 
 dir_bin = get_option('bindir')
 
@@ -2973,9 +2977,9 @@ cdata.set_quoted('DLSUFFIX', dlsuffix)
 
 # built later than the rest of the version metadata, we need SIZEOF_VOID_P
 cdata.set_quoted('PG_VERSION_STR',
-  'PostgreSQL @0@ on @1@-@2@, compiled by @3@-@4@, @5@-bit'.format(
+  'PostgreSQL (IvorySQL @6@) @0@ on @1@-@2@, compiled by @3@-@4@, @5@-bit'.format(
     pg_version, host_machine.cpu_family(), host_system,
-    cc.get_id(), cc.version(), cdata.get('SIZEOF_VOID_P') * 8,
+    cc.get_id(), cc.version(), cdata.get('SIZEOF_VOID_P') * 8, cdata.get('PACKAGE_IVORYSQL_VERSION')
   )
 )
 
diff --git a/meson_options.txt b/meson_options.txt
@@ -160,7 +160,7 @@ option('systemd', type: 'feature', value: 'auto',
   description: 'systemd support')
 
 option('uuid', type: 'combo', choices: ['none', 'bsd', 'e2fs', 'ossp'],
-  value: 'none',
+  value: 'ossp',
   description: 'Use LIB for contrib/uuid-ossp support')
 
 option('zlib', type: 'feature', value: 'auto',
diff --git a/src/include/catalog/meson.build b/src/include/catalog/meson.build
@@ -167,6 +167,7 @@ ara_generated_catalog_headers = custom_target('ara_generated_catalog_headers',
     '@INPUT@',
     '-M=oracle'
   ],
+  depends: [generated_catalog_headers]
 )
 
 # Target for Oracle
@@ -187,7 +188,8 @@ ora_generated_catalog_headers = custom_target('ora_generated_catalog_headers',
     '--output=@OUTDIR@',
     '@INPUT@',
     '-M=oracle'
-  ]
+  ],
+  depends: [ara_generated_catalog_headers]
 )
 
 

Original file line number	Diff line number	Diff line change
`@@ -167,6 +167,7 @@ ara_generated_catalog_headers = custom_target('ara_generated_catalog_headers',`
`167`	`167`	`'@INPUT@',`
`168`	`168`	`'-M=oracle'`
`169`	`169`	`],`
	`170`	`+ depends: [generated_catalog_headers]`
`170`	`171`	`)`
`171`	`172`
`172`	`173`	`# Target for Oracle`
`@@ -187,7 +188,8 @@ ora_generated_catalog_headers = custom_target('ora_generated_catalog_headers',`
`187`	`188`	`'--output=@OUTDIR@',`
`188`	`189`	`'@INPUT@',`
`189`	`190`	`'-M=oracle'`
`190`		`- ]`
	`191`	`+ ],`
	`192`	`+ depends: [ara_generated_catalog_headers]`
`191`	`193`	`)`
`192`	`194`
`193`	`195`