[dia: 59/105] #19: Windows build working: remove group_type from libdia.def.



commit 64083e960c28f36417fec1a60566fe27632ce69e
Author: Eduard Nicodei <eddnicodei gmail com>
Date:   Fri Jan 4 02:19:17 2019 +0000

    #19: Windows build working: remove group_type from libdia.def.
    
      - This seems to magically have made things better:
        ninja install and PATH=`pwd`/lib/:$PATH bin/dia.exe works!
      - Also disable some of the plugins / tests that were causing trouble.

 lib/libdia.def       |  2 +-
 plug-ins/meson.build | 14 +++++++++++---
 tests/meson.build    | 40 ++++++++++++++++++++++------------------
 3 files changed, 34 insertions(+), 22 deletions(-)
---
diff --git a/lib/libdia.def b/lib/libdia.def
index 8d9b5b9a..57b40b1e 100644
--- a/lib/libdia.def
+++ b/lib/libdia.def
@@ -492,7 +492,7 @@ EXPORTS
  group_get_transform
  group_destroy_shallow
  group_objects
- group_type
+ ;group_type
 
  get_active_focus
  give_focus
diff --git a/plug-ins/meson.build b/plug-ins/meson.build
index d6272c85..ab23f882 100644
--- a/plug-ins/meson.build
+++ b/plug-ins/meson.build
@@ -8,14 +8,19 @@ install_plugins_desc = []
 # install_plugins_desc.  Some however have
 # non-standard compilations and therefore are
 # marked as such.
-subdir('cairo')
+if host_machine.system() != 'windows'
+  subdir('cairo')
+endif
 subdir('cgm')
 subdir('drs')  # Non-standard: does not get installed.
 subdir('dxf')
 subdir('hpgl')
 subdir('shape')
 subdir('pixbuf')
-subdir('layout')  # Non-standard: shared_module
+#TODO: get this running on windows
+if host_machine.system() != 'windows'
+  subdir('layout')  # Non-standard: shared_module
+endif
 subdir('libart')
 subdir('metapost')
 subdir('pdf')
@@ -26,7 +31,10 @@ subdir('python')  # Non-standard: shared_module
 subdir('stress')  # Non-standard: does not get installed.
 subdir('svg')
 subdir('vdx')
-subdir('wmf')  # Non-standard: Only installs if libemf present.
+#TODO: same here.
+if host_machine.system() != 'windows'
+  subdir('wmf')  # Non-standard: Only installs if libemf present.
+endif
 subdir('wpg')
 subdir('xfig')
 subdir('xslt')
diff --git a/tests/meson.build b/tests/meson.build
index a83936b3..4344282e 100644
--- a/tests/meson.build
+++ b/tests/meson.build
@@ -1,20 +1,22 @@
 # TODO: minimise code duplication.
-bb = executable(
-    'boundingbox',
-    'test-boundingbox.c',
-    dependencies: [libgtk_dep, libxml_dep, libm_dep],
-    link_with: [libdia],
-    link_args: dia_link_args,
-    include_directories: [configuration_inc, libdia_inc],
-)
-objs = executable(
-    'objects',
-    'test-objects.c',
-    dependencies: [libgtk_dep, libxml_dep, libm_dep],
-    link_with: [libdia],
-    link_args: dia_link_args,
-    include_directories: [configuration_inc, libdia_inc],
-)
+if host_machine.system() != 'windows'
+  bb = executable(
+      'boundingbox',
+      'test-boundingbox.c',
+      dependencies: [libgtk_dep, libxml_dep, libm_dep],
+      link_with: [libdia],
+      link_args: dia_link_args,
+      include_directories: [configuration_inc, libdia_inc],
+  )
+  objs = executable(
+      'objects',
+      'test-objects.c',
+      dependencies: [libgtk_dep, libxml_dep, libm_dep],
+      link_with: [libdia],
+      link_args: dia_link_args,
+      include_directories: [configuration_inc, libdia_inc],
+  )
+endif
 tsvg = executable(
     'testsvg',
     'test-svg.c',
@@ -23,6 +25,8 @@ tsvg = executable(
     link_args: dia_link_args,
     include_directories: [configuration_inc, libdia_inc],
 )
-test('boundingbox', bb)
-test('objects', objs, args: [join_paths(meson.build_root(), 'objects')])
+if host_machine.system() != 'windows'
+  test('boundingbox', bb)
+  test('objects', objs, args: [join_paths(meson.build_root(), 'objects')])
+endif
 test('testsvg', tsvg)


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