[dia: 52/105] #19: Add `ninja run` to be used instead of run_dia.sh.



commit 59467b64282b12314d3a6fdcd6daae54518388e1
Author: Eduard Nicodei <eddnicodei gmail com>
Date:   Thu Jan 3 23:26:45 2019 +0000

    #19: Add `ninja run` to be used instead of run_dia.sh.

 app/meson.build      | 2 +-
 meson.build          | 5 +++++
 objects/meson.build  | 3 ++-
 plug-ins/meson.build | 3 ++-
 run_dia.sh           | 8 ++++++++
 5 files changed, 18 insertions(+), 3 deletions(-)
---
diff --git a/app/meson.build b/app/meson.build
index 79aebf65..4117cf65 100644
--- a/app/meson.build
+++ b/app/meson.build
@@ -74,7 +74,7 @@ endif
 
 diaapp_inc = include_directories('.')
 
-executable('dia',
+diaapp = executable('dia',
     dia_sources + [dia_app_icons_h, diamarshal_h],
     dependencies : [libgtk_dep, libxml_dep, libm_dep],
     link_with : [libdia],
diff --git a/meson.build b/meson.build
index aa99710e..31090261 100644
--- a/meson.build
+++ b/meson.build
@@ -81,4 +81,9 @@ subdir('plug-ins')
 subdir('sheets')
 subdir('shapes')
 
+# Convenience target
+run_target('run',
+    command: [find_program('run_dia.sh')],
+    depends: [diaapp, diaobjects, diaplugins],
+)
 meson.add_install_script('meson-helpers/post-install.py', datadir)
diff --git a/objects/meson.build b/objects/meson.build
index 485872c6..f7a4ac61 100644
--- a/objects/meson.build
+++ b/objects/meson.build
@@ -19,8 +19,9 @@ subdir('Sozi')
 subdir('standard')
 subdir('UML')
 
+diaobjects = []
 foreach o : dia_object_desc
-    library(o[0],
+    diaobjects += library(o[0],
         o[1],
         dependencies : [libc_dep, libgtk_dep, libxml_dep, libm_dep] + o[2],
         link_with : libdia,
diff --git a/plug-ins/meson.build b/plug-ins/meson.build
index 4b07d73b..c655afe4 100644
--- a/plug-ins/meson.build
+++ b/plug-ins/meson.build
@@ -31,9 +31,10 @@ subdir('wpg')
 subdir('xfig')
 subdir('xslt')
 
+diaplugins = []
 foreach p : install_plugins_desc
     message(p[0])
-    library(
+    diaplugins += library(
         p[0],
         p[1],
         dependencies: [libc_dep, libgtk_dep, libm_dep, libxml_dep] + [p[2]],
diff --git a/run_dia.sh b/run_dia.sh
new file mode 100644
index 00000000..d9ab0e2e
--- /dev/null
+++ b/run_dia.sh
@@ -0,0 +1,8 @@
+#!/usr/bin/env sh
+export DIA_BASE_PATH="${MESON_SOURCE_ROOT}"
+export DIA_LIB_PATH="${MESON_BUILD_ROOT}/objects/:${MESON_BUILD_ROOT}/plug-ins"
+export DIA_SHAPE_PATH="${MESON_SOURCE_ROOT}/shapes/"
+export DIA_SHEET_PATH="${MESON_BUILD_ROOT}/sheets"
+export DIA_XSLT_PATH="${MESON_SOURCE_ROOT}/plug-ins/xslt/"
+export DIA_PYTHON_PATH="${MESON_SOURCE_ROOT}/plug-ins/python/"
+${MESON_BUILD_ROOT}/app/dia


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