[gimp/meson: 82/127] Fix some names/paths/missing file. Add beginning of pygimp plugin.
- From: Félix Piédallu <fpiedallu src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gimp/meson: 82/127] Fix some names/paths/missing file. Add beginning of pygimp plugin.
- Date: Fri, 2 Feb 2018 16:06:39 +0000 (UTC)
commit 9a013925fe6e2140d69ce493b68da0f793a67532
Author: Félix Piédallu <felix piedallu me>
Date: Tue Jan 9 17:54:48 2018 +0100
Fix some names/paths/missing file. Add beginning of pygimp plugin.
data/dynamics/meson.build | 2 +-
desktop/meson.build | 10 ++++++
plug-ins/ifs-compose/meson.build | 2 +-
plug-ins/pygimp/meson.build | 64 ++++++++++++++++++++++++++++++++++++++
4 files changed, 76 insertions(+), 2 deletions(-)
---
diff --git a/data/dynamics/meson.build b/data/dynamics/meson.build
index b638c10..46ead86 100644
--- a/data/dynamics/meson.build
+++ b/data/dynamics/meson.build
@@ -8,7 +8,7 @@ install_data([
'Track-Direction.gdyn',
'Velocity-Tapering.gdyn',
],
- install_dir: join_paths(gimpdatadir, 'dynamics', 'FX')
+ install_dir: join_paths(gimpdatadir, 'dynamics')
)
subdir('Basic')
diff --git a/desktop/meson.build b/desktop/meson.build
index 27cfc08..cccd6f4 100644
--- a/desktop/meson.build
+++ b/desktop/meson.build
@@ -57,6 +57,16 @@ appdatafile = configure_file(
install_dir: join_paths(get_option('datadir'), 'appdata'),
)
+appdatafilename = 'gimp-data-extras.metainfo.xml'
+appdatafile = configure_file(
+ input : appdatafilename+'.in',
+ output: appdatafilename,
+ configuration: desktop_conf,
+ install: true,
+ install_dir: join_paths(get_option('datadir'), 'appdata'),
+)
+
+
custom_target('validate-desktop',
input : [ desktopfile, ],
output: [ 'validate-desktop' ],
diff --git a/plug-ins/ifs-compose/meson.build b/plug-ins/ifs-compose/meson.build
index 6d9c83a..dbec2a0 100644
--- a/plug-ins/ifs-compose/meson.build
+++ b/plug-ins/ifs-compose/meson.build
@@ -1,6 +1,6 @@
# TODO ifs-compose.rc.o
-ifs_compose = executable('if-compose',
+ifs_compose = executable('ifs-compose',
[
'ifs-compose-storage.c',
'ifs-compose-utils.c',
diff --git a/plug-ins/pygimp/meson.build b/plug-ins/pygimp/meson.build
index e69de29..93ec07b 100644
--- a/plug-ins/pygimp/meson.build
+++ b/plug-ins/pygimp/meson.build
@@ -0,0 +1,64 @@
+subdir('doc')
+subdir('plug-ins')
+
+plugin_pygimp_sources = [
+ 'gimpmodule.c',
+ 'pygimp-display.c',
+ 'pygimp-drawable.c',
+ 'pygimp-image.c',
+ 'pygimp-item.c',
+ 'pygimp-parasite.c',
+ 'pygimp-pdb.c',
+ 'pygimp-tile.c',
+ 'pygimp-vectors.c',
+]
+# TODO pygimp.rc.o
+pygimp = executable('pygimp',
+ plugin_pygimp_sources,
+ include_directories: [ rootInclude, ],
+ dependencies: [
+ gtk2, gegl,
+ x11, xmu, xext, xfixes,
+ ],
+ link_with: [
+ libgimp,
+ libgimpbase,
+ libgimpcolor,
+ libgimpconfig,
+ libgimpmath,
+ libgimpui,
+ libgimpwidgets,
+ ],
+ install: true,
+ install_dir: join_paths(gimpplugindir, 'plug-ins'),
+)
+
+
+
+
+
+
+path_separator = platform_win32 ? ';' : ':'
+
+custom_target('pygimp.env',
+ input : [],
+ output: [ 'pygimp.env' ],
+ command: [
+ 'echo', path_separator + ' PYTHONPATH=${gimp_plug_in_dir}/python'
+ ],
+ capture: true,
+ install: true,
+ install_dir: join_paths(gimpplugindir, 'environ'),
+)
+custom_target('pygimp.interp',
+ input : [],
+ output: [ 'pygimp.interp' ],
+ command: [
+ 'echo', 'python=' + pythonmod.find_python().path()
+ + '\n'+ '/usr/bin/python=' + pythonmod.find_python().path()
+ + '\n'+ ':Python:E::py::python:'
+ ],
+ capture: true,
+ install: true,
+ install_dir: join_paths(gimpplugindir, 'interpreters'),
+)
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]