config.h -> config.vala (#2544)

Author: lenemter

.gitignore

@@ -3,9 +3,6 @@ aclocal.m4
 autom4te.cache
 /build-aux/*
 ChangeLog
-config.h
-config.h.in
-config.h.in~
 config.log
 config.status
 configure

vapi/config.vapi renamed to config.vala.in

@@ -5,10 +5,9 @@
  *                         2011 Rico Tzschichholz
  */
 
-[CCode (cprefix = "", lower_case_cprefix = "", cheader_filename = "config.h")]
 namespace Config {
-	public const string GETTEXT_PACKAGE;
-	public const string LOCALEDIR;
-	public const string VERSION;
-	public const string PLUGINDIR;
+	public const string GETTEXT_PACKAGE = "@GETTEXT_PACKAGE@";
+	public const string LOCALEDIR = "@LOCALEDIR@";
+	public const string VERSION = "@VERSION@";
+	public const string PLUGINDIR = "@PLUGINDIR@";
 }

daemon-gtk3/meson.build

@@ -13,6 +13,7 @@ hdy_dep = dependency('libhandy-1')
 gala_daemon_bin = executable(
     'gala-daemon-gtk3',
     gala_daemon_sources,
+    config_header,
     dependencies: [gala_dep, gala_base_dep, granite_dep_old, hdy_dep],
     include_directories: config_inc_dir,
     install: true,

daemon/meson.build

@@ -10,8 +10,9 @@ gala_daemon_sources = files(
 gala_daemon_bin = executable(
     'gala-daemon',
     gala_daemon_sources,
+    config_header,
     gala_resources,
-    dependencies: [config_dep, granite_dep, gtk4_dep],
+    dependencies: [granite_dep, gtk4_dep],
     include_directories: config_inc_dir,
     install: true,
 )

docs/meson.build

@@ -23,7 +23,6 @@ basic_command = [
     '--pkg', 'sqlite3',
     '--pkg', 'libsystemd',
     '--pkg', 'granite',
-    '--pkg', 'config',
     vala_flags,
     '--vapidir=' + join_paths(meson.build_root(), 'lib'),
     '--vapidir=' + join_paths(meson.global_source_root(), 'vapi'),
@@ -58,6 +57,6 @@ all_doc_target = custom_target(
         '@INPUT@'
     ],
     build_by_default: true,
-    input: gala_lib_sources + gala_bin_sources,
+    input: gala_lib_sources + gala_bin_sources + [config_header],
     output: 'full'
 )

meson.build

@@ -1,5 +1,5 @@
 project('gala',
-    'c', 'vala',
+    'vala',
     version: '8.2.5',
     meson_version: '>= 0.59.0',
     license: 'GPL3',
@@ -18,20 +18,16 @@ data_dir = join_paths(get_option('prefix'), get_option('datadir'))
 plugins_dir = join_paths(get_option('prefix'), get_option('libdir'), meson.project_name(), 'plugins')
 
 conf = configuration_data()
-conf.set_quoted('GETTEXT_PACKAGE', meson.project_name())
-conf.set_quoted('LOCALEDIR', locale_dir)
-conf.set_quoted('PLUGINDIR', plugins_dir)
-conf.set_quoted('VERSION', meson.project_version())
-config_h = configure_file(
-    output: 'config.h',
+conf.set('GETTEXT_PACKAGE', meson.project_name())
+conf.set('LOCALEDIR', locale_dir)
+conf.set('PLUGINDIR', plugins_dir)
+conf.set('VERSION', meson.project_version())
+config_header = configure_file (
+    input: 'config.vala.in',
+    output: 'config.vala',
     configuration: conf
 )
 
-config_dep = declare_dependency(
-    dependencies: vala.find_library('config', dirs: vapi_dir),
-    sources: config_h
-)
-
 config_inc_dir = include_directories('.')
 
 add_project_arguments([
@@ -158,7 +154,7 @@ endif
 add_project_arguments(vala_flags, language: 'vala')
 add_project_link_arguments(['-Wl,-rpath,@0@'.format(mutter_typelib_dir)], language: 'c')
 
-gala_base_dep = [atk_bridge_dep, glib_dep, gobject_dep, gio_dep, gio_unix_dep, gmodule_dep, gee_dep, gtk_dep, mutter_dep, gnome_desktop_dep, m_dep, posix_dep, sqlite3_dep, xext_dep, config_dep]
+gala_base_dep = [atk_bridge_dep, glib_dep, gobject_dep, gio_dep, gio_unix_dep, gmodule_dep, gee_dep, gtk_dep, mutter_dep, gnome_desktop_dep, m_dep, posix_dep, sqlite3_dep, xext_dep]
 
 if get_option('systemd')
     gala_base_dep += systemd_dep

src/meson.build

@@ -70,6 +70,7 @@ gala_bin_sources = files(
 gala_bin = executable(
     'gala',
     gala_bin_sources,
+    config_header,
     dependencies: [gala_dep, gala_base_dep, pantheon_desktop_shell_dep],
     include_directories: config_inc_dir,
     install_rpath: mutter_typelib_dir,