Haiku: fix adding resources

The custom_command was run in src/haiku/ and created a file with only resources inside. Since xres edits the file in-place and meson doesn't like it, we have to run a shell script for now. Maybe later I'll add proper support in meson.

Haiku: fix adding resources
cde93480 · François Revol · Max Kellermann · 095e6e6a · cde93480 · cde93480
Commit cde93480 authored Mar 26, 2019 by François Revol Committed by Max Kellermann Mar 29, 2019
Hide whitespace changes
Inline Side-by-side

Showing with 16 additions and 9 deletions

meson.build meson.build +12 -1

add_resources.sh src/haiku/add_resources.sh +3 -0

meson.build src/haiku/meson.build +1 -8

No files found.
--- a/meson.build
+++ b/meson.build
@@ -390,6 +390,7 @@ more_deps = []
 if is_android
  subdir('src/java')
  target_type = 'shared_library'
+  target_name = 'mpd'
  link_args += [
    '-Wl,--no-undefined,-shared,-Bsymbolic',
    '-llog',
@@ -401,16 +402,18 @@ if is_android
  ]
 elif is_haiku
  target_type = 'executable'
+  target_name = 'mpd.nores'
  link_args += [
    '-lnetwork',
    '-lbe',
  ]
 else
  target_type = 'executable'
+  target_name = 'mpd'
 endif

 mpd = build_target(
-  'mpd',
+  target_name,
  sources,
  target_type: target_type,
  include_directories: inc,
@@ -449,6 +452,14 @@ endif

 if is_haiku
  subdir('src/haiku')
+  custom_target(
+    'mpd',
+    output: 'mpd',
+    input: [mpd, rsrc],
+    command: [addres, '@OUTPUT@', '@INPUT0@', '@INPUT1@'],
+    install: true,
+    install_dir: get_option('bindir'),
+  )
 endif

 configure_file(output: 'config.h', configuration: conf)

--- a/src/haiku/add_resources.sh
+++ b/src/haiku/add_resources.sh
+#!/bin/sh
+
+cp "$2" "$1" && xres -o "$1" -- "$3" && mimeset -f "$1" || (rm -f "$1"; exit 1)
--- a/src/haiku/meson.build
+++ b/src/haiku/meson.build
@@ -8,11 +8,4 @@ rsrc = custom_target(
  command: [rc, '-o', '@OUTPUT@', '@INPUT@'],
 )

-custom_target(
-  'mpd.xres',
-  output: 'mpd',
-  input: [mpd, rsrc],
-  command: [xres, '-o', '@OUTPUT@', '--', '@INPUT@'],
-  install: true,
-  install_dir: get_option('bindir'),
-)
+addres = files('add_resources.sh')