[gnome-builder/wip/tingping/meson-build] fixup! build: Initial conversion to Meson

[Patrick Griffis <pgriffis src gnome org>]

commit d9eec882a6d1fb6a0fe01fc8b656da08634afcdd
Author: Patrick Griffis <tingping tingping se>
Date:   Sun Oct 2 13:24:45 2016 -0400

    fixup! build: Initial conversion to Meson

 contrib/egg/meson.build        |    2 +-
 contrib/pnl/meson.build        |    2 +-
 contrib/tmpl/meson.build       |    6 ++-
 data/fonts/meson.build         |    3 ++
 data/gsettings/meson.build     |   12 ++++++++
 data/icons/meson.build         |   31 ++++++++++++++++++++
 data/meson.build               |   61 ++++++++++++++++++++++++++++++++++++++++
 data/style-schemes/meson.build |    4 ++
 libide/meson.build             |    7 ++--
 meson.build                    |    5 +++
 10 files changed, 126 insertions(+), 7 deletions(-)
---
diff --git a/contrib/egg/meson.build b/contrib/egg/meson.build
index b88348e..4bd62c7 100644
--- a/contrib/egg/meson.build
+++ b/contrib/egg/meson.build
@@ -80,7 +80,7 @@ libegg_deps = [
   dependency('gio-2.0'),
 ]
 
-libegg = shared_library('egg', libegg_sources,
+libegg = shared_library('egg-private', libegg_sources,
   dependencies: libegg_deps,
   install: true,
   install_dir: get_option('libdir') + '/gnome-builder',
diff --git a/contrib/pnl/meson.build b/contrib/pnl/meson.build
index a9c1d02..189711d 100644
--- a/contrib/pnl/meson.build
+++ b/contrib/pnl/meson.build
@@ -64,7 +64,7 @@ libpnl_deps = [
   dependency('gtk+-3.0'),
 ]
 
-libpnl = shared_library('pnl', libpnl_sources,
+libpnl = shared_library('panel-gtk', libpnl_sources,
   dependencies: libpnl_deps,
   c_args: ['-DPNL_COMPILATION'],
   install: true,
diff --git a/contrib/tmpl/meson.build b/contrib/tmpl/meson.build
index 5ce84a7..a63836b 100644
--- a/contrib/tmpl/meson.build
+++ b/contrib/tmpl/meson.build
@@ -88,7 +88,9 @@ libtmpl_sources = libtmpl_sources + [
   pgen.process('tmpl-expr-parser.y'),
 ]
 
-libtmpl = shared_library('tmpl', libtmpl_sources,
+libtmpl_api_version = '1.0'
+
+libtmpl = shared_library('template-glib-' + libtmpl_api_version, libtmpl_sources,
   dependencies: libtmpl_deps,
   c_args: ['-DTMPL_GLIB_COMPILATION'],
   install: true,
@@ -117,7 +119,7 @@ libtmpl_introspection_sources = [
 
 libtmpl_gir = gnome.generate_gir(libtmpl,
   sources: libtmpl_introspection_sources,
-  nsversion: '1.0',
+  nsversion: libtmpl_api_version,
   namespace: 'Template',
   symbol_prefix: 'tmpl',
   identifier_prefix: 'Tmpl',
diff --git a/data/fonts/meson.build b/data/fonts/meson.build
new file mode 100644
index 0000000..d666e8f
--- /dev/null
+++ b/data/fonts/meson.build
@@ -0,0 +1,3 @@
+install_data([
+  'BuilderBlocks.ttf',
+], install_dir: get_option('datadir') + '/gnome-builder/fonts')
diff --git a/data/gsettings/meson.build b/data/gsettings/meson.build
new file mode 100644
index 0000000..ca468f9
--- /dev/null
+++ b/data/gsettings/meson.build
@@ -0,0 +1,12 @@
+install_data([
+  'org.gnome.builder.build.gschema.xml',
+  'org.gnome.builder.code-insight.gschema.xml',
+  'org.gnome.builder.editor.gschema.xml',
+  'org.gnome.builder.editor.language.gschema.xml',
+  'org.gnome.builder.extension-type.gschema.xml',
+  'org.gnome.builder.gschema.xml',
+  'org.gnome.builder.plugin.gschema.xml',
+  'org.gnome.builder.project-tree.gschema.xml',
+  'org.gnome.builder.terminal.gschema.xml',
+  'org.gnome.builder.workbench.gschema.xml',
+], install_dir: get_option('datadir') + '/glib-2.0/schemas')
diff --git a/data/icons/meson.build b/data/icons/meson.build
new file mode 100644
index 0000000..f700a29
--- /dev/null
+++ b/data/icons/meson.build
@@ -0,0 +1,31 @@
+icondir = get_option('datadir') + '/icons'
+
+# FIXME: We have unrelated files in some of these
+
+install_subdir('hicolor/16x16',
+  install_dir: icondir,
+)
+
+install_subdir('hicolor/24x24',
+  install_dir: icondir,
+)
+
+install_subdir('hicolor/32x32',
+  install_dir: icondir,
+)
+
+install_subdir('hicolor/48x48',
+  install_dir: icondir,
+)
+
+install_subdir('hicolor/256x256',
+  install_dir: icondir,
+)
+
+install_subdir('hicolor/512x512',
+  install_dir: icondir,
+)
+
+install_subdir('hicolor/symbolic',
+  install_dir: icondir,
+)
diff --git a/data/meson.build b/data/meson.build
new file mode 100644
index 0000000..1470e42
--- /dev/null
+++ b/data/meson.build
@@ -0,0 +1,61 @@
+msgfmt = find_program('msgfmt')
+
+# Desktop launcher and description file.
+custom_target(
+  'desktop-file',
+  input: 'org.gnome.Builder.desktop.in.in',
+  output: 'org.gnome.Builder.desktop',
+  install: true,
+  install_dir: get_option('datadir') + '/applications',
+  command: [msgfmt, '--desktop', '--template', '@INPUT@',
+    '-d', meson.source_root() + '/po', '-o', '@OUTPUT@'],
+)
+
+# Appdata file.
+custom_target(
+  'appdata-file',
+  input: 'org.gnome.Builder.appdata.xml.in',
+  output: 'org.gnome.Builder.appdata.xml',
+  install: true,
+  install_dir: get_option('datadir') + '/appdata',
+  command: [msgfmt, '--xml', '--template', '@INPUT@',
+    '-d', meson.source_root() + '/po', '-o', '@OUTPUT@'],
+)
+
+# D-Bus service file.
+dbusconf = configuration_data()
+dbusconf.set('bindir', '@0@/@1@'.format(get_option('prefix'), get_option('bindir')))
+configure_file(
+       input: 'org.gnome.Builder.service.in',
+       output: 'org.gnome.Builder.service',
+       configuration: dbusconf,
+       install: true,
+       install_dir: get_option('datadir') + '/dbus-1/services',
+)
+
+# pkg-config files.
+pkgpkgconfdir = get_option('libdir') + '/gnome-builder/pkgconfig'
+
+pkgconf = configuration_data()
+pkgconf.set('prefix', get_option('prefix'))
+pkgconf.set('libdir', '${exec_prefix}/' + get_option('libdir'))
+pkgconf.set('VERSION', meson.project_version())
+
+# TODO: Use the pkgconfig module to generate these
+
+configure_file(
+       input: 'libide-1.0.pc.in',
+       output: 'libide-1.0.pc',
+       configuration: pkgconf,
+       install: true,
+       install_dir: pkgpkgconfdir,
+)
+
+configure_file(
+       input: 'template-glib-1.0.pc.in',
+       output: 'template-glib-1.0.pc',
+       configuration: pkgconf,
+       install: true,
+       install_dir: pkgpkgconfdir,
+)
+
diff --git a/data/style-schemes/meson.build b/data/style-schemes/meson.build
new file mode 100644
index 0000000..29f1a58
--- /dev/null
+++ b/data/style-schemes/meson.build
@@ -0,0 +1,4 @@
+install_data([
+  'builder.xml',
+  'builder-dark.xml',
+], install_dir: get_option('datadir') + '/gtksourceview-3.0/styles')
diff --git a/libide/meson.build b/libide/meson.build
index 6317130..3807198 100644
--- a/libide/meson.build
+++ b/libide/meson.build
@@ -543,7 +543,9 @@ if get_option('with_editorconfig')
   ]
 endif
 
-libide = shared_library('ide', libide_sources,
+libide_api_version = '1.0'
+
+libide = shared_library('ide-' + libide_api_version, libide_sources,
   dependencies: libide_deps,
   include_directories: include_directories(libide_includes),
   link_with: libide_libs,
@@ -556,12 +558,11 @@ if get_option('with_introspection')
 
 gnome.generate_gir(libide,
   sources: libide_public_headers + libide_public_sources,
-  nsversion: '1.0',
+  nsversion: libide_api_version,
   namespace: 'Ide',
   symbol_prefix: 'ide',
   identifier_prefix: 'Ide',
   includes: ['Gio-2.0', 'Gtk-3.0', 'GtkSource-3.0', 'Peas-1.0', libtmpl_gir[0]],
-  export_packages: 'ide-1.0',
   install: true,
   install_dir_gir: get_option('datadir') + '/gnome-builder/gir-1.0',
   install_dir_typelib: get_option('datadir') + '/gnome-builder/girepository-1.0',
diff --git a/meson.build b/meson.build
index c067f9f..5c2686c 100644
--- a/meson.build
+++ b/meson.build
@@ -43,6 +43,11 @@ pkglibdir = get_option('libdir') + '/gnome-builder'
 pkggirdir = get_option('datadir') + '/gnome-builder/gir-1.0'
 gnome = import('gnome')
 
+subdir('data')
+subdir('data/fonts')
+subdir('data/gsettings')
+subdir('data/icons')
+subdir('data/style-schemes')
 subdir('contrib/egg')
 subdir('contrib/gd')
 subdir('contrib/gstyle')