Skip to content

Commit 2043e1a

Browse files
committed
build: add DBMS_UTILITY support to meson build
- Add plisql_inc export in src/pl/plisql/src/meson.build - Add dbms_utility.c source to contrib/ivorysql_ora - Add plisql include directory for plisql.h header - Update regress test list to match Makefile ORA_REGRESS
1 parent e475355 commit 2043e1a

2 files changed

Lines changed: 21 additions & 11 deletions

File tree

contrib/ivorysql_ora/meson.build

Lines changed: 18 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ ivorysql_ora_sources = files(
2626
'src/merge/ora_merge.c',
2727
'src/sysview/sysview_functions.c',
2828
'src/xml_functions/ora_xml_functions.c',
29+
'src/builtin_packages/dbms_utility/dbms_utility.c',
2930
)
3031

3132
if host_system == 'windows'
@@ -44,6 +45,7 @@ custom_target('ivorysql_ora--1.0.sql',
4445

4546
ivorysql_ora = shared_module('ivorysql_ora',
4647
ivorysql_ora_sources,
48+
include_directories: plisql_inc,
4749
kwargs: contrib_mod_args,
4850
)
4951
contrib_targets += ivorysql_ora
@@ -64,16 +66,22 @@ tests += {
6466
'bd': meson.current_build_dir(),
6567
'regress': {
6668
'sql': [
67-
'check',
68-
'check_btree',
69-
'check_heap',
70-
],
71-
},
72-
'tap': {
73-
'tests': [
74-
't/001_verify_heapam.pl',
75-
't/002_cic.pl',
76-
't/003_cic_2pc.pl',
69+
'ora_character',
70+
'ora_datetime',
71+
'ora_interval',
72+
'ora_number',
73+
'ora_binary_float',
74+
'ora_binary_double',
75+
'ora_raw_long',
76+
'ora_character_datatype_functions',
77+
'ora_datetime_datatype_functions',
78+
'ora_misc_functions',
79+
'ora_merge',
80+
'datatype_and_func_bugs',
81+
'ora_sysview',
82+
'ora_like_operator',
83+
'ora_xml_functions',
84+
'dbms_utility',
7785
],
7886
},
7987
}

src/pl/plisql/src/meson.build

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,10 +52,12 @@ if host_system == 'windows'
5252
'--FILEDESC', 'PL/iSQL - procedural language',])
5353
endif
5454

55+
plisql_inc = include_directories('.')
56+
5557
plisql = shared_module('plisql',
5658
plisql_sources,
5759
c_pch: pch_postgres_h,
58-
include_directories: include_directories('.'),
60+
include_directories: plisql_inc,
5961
link_with: ora_parser,
6062
kwargs: pg_mod_args,
6163
)

0 commit comments

Comments
 (0)