[gimp/meson: 581/805] Fix plug-ins a bit. Add windows subdir.



commit f62ebe7ab3260458140fd8dd667487af65ca12b6
Author: Félix Piédallu <felix piedallu me>
Date:   Tue Jan 9 17:47:43 2018 +0100

    Fix plug-ins a bit. Add windows subdir.

 build/windows/meson.build                  |    3 +++
 meson.build                                |    1 +
 meson_options.txt                          |    1 +
 plug-ins/gradient-flare/flares/meson.build |   11 +++++++++++
 plug-ins/gradient-flare/meson.build        |   13 +------------
 plug-ins/pygimp/doc/meson.build            |   25 +++++++++++++++++++++++++
 plug-ins/pygimp/plug-ins/meson.build       |   19 +++++++++++++++++++
 7 files changed, 61 insertions(+), 12 deletions(-)
---
diff --git a/build/windows/meson.build b/build/windows/meson.build
new file mode 100644
index 0000000..ba96f7d
--- /dev/null
+++ b/build/windows/meson.build
@@ -0,0 +1,3 @@
+if get_option('windows-installer')
+  # subdir('installer')
+endif
diff --git a/meson.build b/meson.build
index 18a7479..1b07e46 100644
--- a/meson.build
+++ b/meson.build
@@ -15,6 +15,7 @@ conf = configuration_data()
 pkgconfig = import('pkgconfig')
 i18n      = import('i18n')
 gnome     = import('gnome')
+pythonmod = import('python3')
 
 cc        = meson.get_compiler('c')
 prefix    = get_option('prefix')
diff --git a/meson_options.txt b/meson_options.txt
index f2d4c7a..e2394d7 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -4,6 +4,7 @@ option('enable-mp',         type: 'boolean', value: true)
 option('enable-sse',        type: 'boolean', value: true)
 option('enable-default-bin',type: 'boolean', value: true)
 option('enable-console-bin',type: 'boolean', value: true)
+option('windows-installer', type: 'boolean', value: false)
 option('gimpdir',           type: 'string',  value: '')
 option('profiling',         type: 'boolean', value: true)
 option('with-aa',           type: 'boolean', value: true)
diff --git a/plug-ins/gradient-flare/flares/meson.build b/plug-ins/gradient-flare/flares/meson.build
new file mode 100644
index 0000000..a4b3db5
--- /dev/null
+++ b/plug-ins/gradient-flare/flares/meson.build
@@ -0,0 +1,11 @@
+install_data([
+    'Bright_Star',
+    'Classic',
+    'Default',
+    'Distant_Sun',
+    'GFlare_101',
+    'GFlare_102',
+    'Hidden_Planet',
+  ],
+  install_dir: join_paths(gimpdatadir, 'gflare'),
+)
diff --git a/plug-ins/gradient-flare/meson.build b/plug-ins/gradient-flare/meson.build
index 826b005..a57a168 100644
--- a/plug-ins/gradient-flare/meson.build
+++ b/plug-ins/gradient-flare/meson.build
@@ -1,4 +1,5 @@
 # TODO gradient-flare.rc.o
+subdir('flares')
 
 gradient_flare = executable('gradient-flare',
   [
@@ -23,15 +24,3 @@ gradient_flare = executable('gradient-flare',
   install: true,
   install_dir: join_paths(gimpplugindir, 'plug-ins'),
 )
-
-install_data([
-    join_paths('flares', 'Bright_Star'),
-    join_paths('flares', 'Classic'),
-    join_paths('flares', 'Default'),
-    join_paths('flares', 'Distant_Sun'),
-    join_paths('flares', 'GFlare_101'),
-    join_paths('flares', 'GFlare_102'),
-    join_paths('flares', 'Hidden_Planet'),
-  ],
-  install_dir: join_paths(gimpdatadir, 'gflare'),
-)
diff --git a/plug-ins/pygimp/doc/meson.build b/plug-ins/pygimp/doc/meson.build
new file mode 100644
index 0000000..fdc4253
--- /dev/null
+++ b/plug-ins/pygimp/doc/meson.build
@@ -0,0 +1,25 @@
+
+pygimp_ps = custom_target('pygimp.ps',
+  input : [ 'pygimp.sgml' ],
+  output: [ 'pygimp.ps' ],
+  command: [
+    'db2ps',
+    '@INPUT@'
+  ],
+)
+pygimp_pdf = custom_target('pygimp.pdf',
+  input : [ 'pygimp.sgml' ],
+  output: [ 'pygimp.pdf' ],
+  command: [
+    'db2pdf',
+    '@INPUT@'
+  ],
+)
+pygimp_html = custom_target('pygimp.html',
+  input : [ 'pygimp.sgml' ],
+  output: [ 'pygimp.html' ],
+  command: [
+    'db2html', '--nochunks',
+    '@INPUT@'
+  ],
+)
diff --git a/plug-ins/pygimp/plug-ins/meson.build b/plug-ins/pygimp/plug-ins/meson.build
new file mode 100644
index 0000000..2500b55
--- /dev/null
+++ b/plug-ins/pygimp/plug-ins/meson.build
@@ -0,0 +1,19 @@
+install_data([
+    'colorxhtml.py',
+    'file-openraster.py',
+    'foggify.py',
+    'gradients-save-as-css.py',
+    'histogram-export.py',
+    'palette-offset.py',
+    'palette-sort.py',
+    'palette-to-gradient.py',
+    'py-slice.py',
+    'python-eval.py',
+  ],
+  install_dir: join_paths(gimpplugindir, 'plug-ins'),
+)
+install_data([
+    'python-console.py',
+  ],
+  install_dir: join_paths(gimpplugindir, 'plug-ins', 'python-console'),
+)


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