Commit 931dc3ab authored by Marcin Kolny's avatar Marcin Kolny

fix generating wrap_init.cc

parent 5cb89319
......@@ -109,7 +109,6 @@ giomm_modules = [
'dbusinterfaceskeleton',
'inetaddress',
'settingsschema',
'unixmount',
'dbusinterfacevtable',
'inetsocketaddress',
'settingsschemakey',
......@@ -152,9 +151,15 @@ private_dir = join_paths(meson.build_root(), 'gio', 'giomm', 'private')
giomm_targets += custom_target('giomm_generate_priv_dir',
output : 'private',
command : [python, '-c',
'import os\nos.mkdir("' + private_dir + '")'])
'import os\nos.makedirs("' + private_dir + '", exist_ok=True)'])
giomm_hg_files = []
foreach module : giomm_modules
giomm_hg_files += [join_paths(meson.current_source_dir(), '..', 'src', module + '.hg')]
endforeach
giomm_targets += custom_target('giomm_generate_wrap_init',
input : glibmm_hg_files,
output : 'wrap_init.cc',
command : [python,
wrap_output,
......@@ -162,7 +167,7 @@ giomm_targets += custom_target('giomm_generate_wrap_init',
join_paths(meson.current_build_dir(), 'wrap_init.cc'),
'--',
join_paths(meson.build_root(), 'tools', 'generate_wrap_init.pl'),
'--namespace=Gio', '--parent_dir=giomm'])
'--namespace=Gio', '--parent_dir=giomm'] + giomm_hg_files)
# TODO: foreach below could be replaced with simpler code (see glibmm's meson file)
foreach giomm_module : giomm_modules
......
......@@ -73,9 +73,15 @@ private_dir = join_paths(meson.build_root(), 'glib', 'glibmm', 'private')
glibmm_targets += custom_target('glibmm_generate_priv_dir',
output : 'private',
command : [python, '-c',
'import os\nos.mkdir("' + private_dir + '")'])
'import os\nos.makedirs("' + private_dir + '", exist_ok=True)'])
glibmm_hg_files = []
foreach module : glibmm_modules
glibmm_hg_files += [join_paths(meson.current_source_dir(), '..', 'src', module + '.hg')]
endforeach
glibmm_targets += custom_target('glibmm_generate_wrap_init',
input : glibmm_hg_files,
output : 'wrap_init.cc',
command : [python,
wrap_output,
......@@ -83,7 +89,7 @@ glibmm_targets += custom_target('glibmm_generate_wrap_init',
join_paths(meson.current_build_dir(), 'wrap_init.cc'),
'--',
join_paths(meson.build_root(), 'tools', 'generate_wrap_init.pl'),
'--namespace=Glib', '--parent_dir=glibmm'])
'--namespace=Glib', '--parent_dir=glibmm'] + glibmm_hg_files)
foreach glibmm_module : glibmm_modules
glibmm_targets += custom_target('glibmm_generate_cc_' + glibmm_module,
......
......@@ -14,7 +14,7 @@ gmoduledep = dependency('gmodule-2.0')
gobjectdep = dependency('gobject-2.0')
sigcppdep = dependency('sigc++-3.0')
python = find_program('python')
python = import('python3').find_python()
perl = find_program('perl')
m4 = find_program('m4')
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment