[meld] Update Meson python package install to be more explicit



commit 85cf7f7d66aca1e14e3512c487a4df633cefe762
Author: Kai Willadsen <kai willadsen gmail com>
Date:   Sat Sep 21 10:43:01 2019 +1000

    Update Meson python package install to be more explicit

 meld/meson.build | 84 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 meson.build      | 17 +++---------
 2 files changed, 88 insertions(+), 13 deletions(-)
---
diff --git a/meld/meson.build b/meld/meson.build
new file mode 100644
index 00000000..6b4fef72
--- /dev/null
+++ b/meld/meson.build
@@ -0,0 +1,84 @@
+
+# TODO: Replace our existing conf.py hacks with configure_file().
+# See e.g., gnome-music for an example of this
+
+folders = {
+    '.': [
+        '__init__.py',
+        'accelerators.py',
+        'actiongutter.py',
+        'build_helpers.py',
+        'chunkmap.py',
+        'conf.py',
+        'const.py',
+        'diffgrid.py',
+        'dirdiff.py',
+        'filediff.py',
+        'filemerge.py',
+        'filters.py',
+        'gutterrendererchunk.py',
+        'iohelpers.py',
+        'linkmap.py',
+        'meldapp.py',
+        'meldbuffer.py',
+        'melddoc.py',
+        'meldwindow.py',
+        'menuhelpers.py',
+        'misc.py',
+        'newdifftab.py',
+        'patchdialog.py',
+        'preferences.py',
+        'recent.py',
+        'settings.py',
+        'sourceview.py',
+        'style.py',
+        'task.py',
+        'tree.py',
+        'treehelpers.py',
+        'undo.py',
+        'vcview.py',
+        'windowstate.py',
+    ],
+    'matchers': [
+        'matchers/__init__.py',
+        'matchers/diffutil.py',
+        'matchers/helpers.py',
+        'matchers/merge.py',
+        'matchers/myers.py',
+    ],
+    'ui': [
+      'ui/__init__.py',
+      'ui/bufferselectors.py',
+      'ui/cellrenderers.py',
+      'ui/emblemcellrenderer.py',
+      'ui/filechooser.py',
+      'ui/findbar.py',
+      'ui/gladesupport.py',
+      'ui/gtkcompat.py',
+      'ui/historyentry.py',
+      'ui/listwidget.py',
+      'ui/msgarea.py',
+      'ui/notebook.py',
+      'ui/notebooklabel.py',
+      'ui/recentselector.py',
+      'ui/statusbar.py',
+      'ui/util.py',
+      'ui/vcdialogs.py',
+    ],
+    'vc': [
+      'vc/__init__.py',
+      'vc/_null.py',
+      'vc/_vc.py',
+      'vc/bzr.py',
+      'vc/cvs.py',
+      'vc/darcs.py',
+      'vc/git.py',
+      'vc/mercurial.py',
+      'vc/svn.py',
+    ],
+}
+
+foreach folder_name, sources : folders
+  pkgdir = join_paths(meson.project_name(), folder_name)
+  python3.install_sources(sources, pure: true, subdir: pkgdir)
+endforeach
diff --git a/meson.build b/meson.build
index cbb3e64b..ee6a8a5d 100644
--- a/meson.build
+++ b/meson.build
@@ -1,7 +1,7 @@
 project(
     'meld',
     version: '3.21.0',
-    meson_version: '>=0.46.0',
+    meson_version: '>=0.47.0',
 )
 
 application_id = 'org.gnome.meld'
@@ -36,20 +36,11 @@ schemadir = join_paths(datadir, 'glib-2.0', 'schemas')
 itsdir = join_paths(meson.current_source_dir(), 'gettext')
 podir = join_paths(meson.current_source_dir(), 'po')
 
+subdir('meld')
 subdir('data')
 subdir('help')
 subdir('po')
 
+install_data('bin/meld', install_dir: bindir)
 
-install_data(
-    [
-        'bin/meld'
-    ],
-    install_dir: get_option('bindir')
-)
-install_subdir(
-    meson.project_name(),
-    install_dir: python3.get_path('purelib')
-)
-
-meson.add_install_script('meson_post_install.py')
\ No newline at end of file
+meson.add_install_script('meson_post_install.py')


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]