[dia: 101/105] #19 cleanup: Use 'install' key in install_plugins_desc dictionary.



commit cf6107555b635c5943e812af4944e650ac3a2a13
Author: Eduard Nicodei <eddnicodei gmail com>
Date:   Sun Jan 27 21:45:11 2019 +0000

    #19 cleanup: Use 'install' key in install_plugins_desc dictionary.
    
      - This allows us to specify which plugins should be installed.

 plug-ins/drs/meson.build    | 14 +++++---------
 plug-ins/meson.build        |  6 +++---
 plug-ins/stress/meson.build | 20 +++++++-------------
 3 files changed, 15 insertions(+), 25 deletions(-)
---
diff --git a/plug-ins/drs/meson.build b/plug-ins/drs/meson.build
index ee9cc830..3c0806c5 100644
--- a/plug-ins/drs/meson.build
+++ b/plug-ins/drs/meson.build
@@ -5,12 +5,8 @@ sources = files(
     'dia-render-script-renderer.c'
 )
 
-# Prevent installation - currently a debug tool only
-shared_library(
-    'drs_filter',
-    sources + [config_h],
-    dependencies: [libc_dep, libgtk_dep, libm_dep, libxml_dep],
-    include_directories: [libdia_inc, configuration_inc],
-    link_with: [libdia],
-    install: false,
-)
+install_plugins_desc += {
+    'name': 'drs_filter',
+    'sources': sources,
+    'install': false,
+}
diff --git a/plug-ins/meson.build b/plug-ins/meson.build
index f1e52684..27808d31 100644
--- a/plug-ins/meson.build
+++ b/plug-ins/meson.build
@@ -10,7 +10,7 @@ install_plugins_desc = []
 # marked as such.
 subdir('cairo')
 subdir('cgm')
-subdir('drs')  # Non-standard: does not get installed.
+subdir('drs')
 subdir('dxf')
 subdir('hpgl')
 subdir('shape')
@@ -23,7 +23,7 @@ subdir('pgf')
 subdir('postscript')
 subdir('pstricks')
 subdir('python')  # Non-standard: shared_module
-subdir('stress')  # Non-standard: does not get installed.
+subdir('stress')
 subdir('svg')
 subdir('vdx')
 # TODO: Port to Windows.
@@ -42,7 +42,7 @@ foreach p : install_plugins_desc
         dependencies: [libc_dep, libgtk_dep, libm_dep, libxml_dep] + p.get('extra_deps', []),
         include_directories: [libdia_inc, configuration_inc],
         link_with: [libdia],
-        install: true,
+        install: p.get('install', true),
         install_dir: dialibdir
     )
 endforeach
diff --git a/plug-ins/stress/meson.build b/plug-ins/stress/meson.build
index d3c89564..141ed47e 100644
--- a/plug-ins/stress/meson.build
+++ b/plug-ins/stress/meson.build
@@ -1,19 +1,13 @@
-# This is currently windows+development only
-# It should be easy to port but never get installed
-
 sources = files(
     'stress.c',
     'stress-memory.c'
 )
 
-# TODO: test this on Windows.
-if host_machine.system() != 'windows'
-    library(
-        'stress_filter',
-        sources + [config_h],
-        dependencies: [libc_dep, libgtk_dep, libm_dep],
-        include_directories: [libdia_inc, configuration_inc],
-        link_with: [libdia],
-        install: false,
-    )
+# This is a development tool for windows.
+if host_machine.system() == 'windows'
+    install_plugins_desc += {
+        'name': 'stress_filter',
+        'sources': sources,
+        'install': false,
+    }
 endif


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