From 31ff32872781413fc8f71dc45dc5ddc0f2b97c5a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tim-Philipp=20M=C3=BCller?= Date: Sat, 4 Jul 2020 01:02:02 +0100 Subject: [PATCH] meson: add update-orc-dist target Add target to update backup orc -dist.[ch] files. Part-of: --- gst/audiofx/meson.build | 1 + gst/deinterlace/meson.build | 1 + gst/videobox/meson.build | 1 + gst/videomixer/meson.build | 1 + meson.build | 24 ++++++++++++++++ scripts/update-orc-dist-files.py | 49 ++++++++++++++++++++++++++++++++ 6 files changed, 77 insertions(+) create mode 100755 scripts/update-orc-dist-files.py diff --git a/gst/audiofx/meson.build b/gst/audiofx/meson.build index d0375a76f3..1711cb6670 100644 --- a/gst/audiofx/meson.build +++ b/gst/audiofx/meson.build @@ -28,6 +28,7 @@ if have_orcc input : orcsrc + '.orc', output : orcsrc + '.c', command : orcc_args + ['--implementation', '-o', '@OUTPUT@', '@INPUT@']) + orc_targets += {'name': orcsrc, 'orc-source': files(orcsrc + '.orc'), 'header': orc_h, 'source': orc_c} else orc_h = configure_file(input : orcsrc + '-dist.h', output : orcsrc + '.h', diff --git a/gst/deinterlace/meson.build b/gst/deinterlace/meson.build index 7ba4e2a100..49c915c69b 100644 --- a/gst/deinterlace/meson.build +++ b/gst/deinterlace/meson.build @@ -24,6 +24,7 @@ if have_orcc input : orcsrc + '.orc', output : orcsrc + '.c', command : orcc_args + ['--implementation', '-o', '@OUTPUT@', '@INPUT@']) + orc_targets += {'name': orcsrc, 'orc-source': files(orcsrc + '.orc'), 'header': orc_h, 'source': orc_c} else orc_h = configure_file(input : orcsrc + '-dist.h', output : orcsrc + '.h', diff --git a/gst/videobox/meson.build b/gst/videobox/meson.build index 8c8e074bcb..1511c30661 100644 --- a/gst/videobox/meson.build +++ b/gst/videobox/meson.build @@ -8,6 +8,7 @@ if have_orcc input : orcsrc + '.orc', output : orcsrc + '.c', command : orcc_args + ['--implementation', '-o', '@OUTPUT@', '@INPUT@']) + orc_targets += {'name': orcsrc, 'orc-source': files(orcsrc + '.orc'), 'header': orc_h, 'source': orc_c} else orc_h = configure_file(input : orcsrc + '-dist.h', output : orcsrc + '.h', diff --git a/gst/videomixer/meson.build b/gst/videomixer/meson.build index b0f1c425c4..2e1cb77743 100644 --- a/gst/videomixer/meson.build +++ b/gst/videomixer/meson.build @@ -13,6 +13,7 @@ if have_orcc input : orcsrc + '.orc', output : orcsrc + '.c', command : orcc_args + ['--implementation', '-o', '@OUTPUT@', '@INPUT@']) + orc_targets += {'name': orcsrc, 'orc-source': files(orcsrc + '.orc'), 'header': orc_h, 'source': orc_c} else orc_h = configure_file(input : orcsrc + '-dist.h', output : orcsrc + '.h', diff --git a/meson.build b/meson.build index 692ed37e9e..c003c2bb88 100644 --- a/meson.build +++ b/meson.build @@ -322,6 +322,7 @@ libsinc = include_directories('gst-libs') have_orcc = false orcc_args = [] +orc_targets = [] # Used by various libraries/elements that use Orc code orc_dep = dependency('orc-0.4', version : orc_req, required : get_option('orc'), fallback : ['orc', 'orc_dep']) @@ -414,6 +415,29 @@ subdir('ext') subdir('tests') subdir('docs') +if have_orcc + update_orc_dist_files = find_program('scripts/update-orc-dist-files.py') + + orc_update_targets = [] + foreach t : orc_targets + orc_name = t.get('name') + orc_file = t.get('orc-source') + header = t.get('header') + source = t.get('source') + # alias_target() only works with build targets, so can't use run_target() here + orc_update_targets += [ + custom_target('update-orc-@0@'.format(orc_name), + input: [header, source], + command: [update_orc_dist_files, orc_file, header, source], + output: ['@0@-dist.c'.format(orc_name)]) # not entirely true + ] + endforeach + + if meson.version().version_compare('>= 0.52') + update_orc_dist_target = alias_target('update-orc-dist', orc_update_targets) + endif +endif + # xgettext is optional (on Windows for instance) if find_program('xgettext', required : get_option('nls')).found() cdata.set('ENABLE_NLS', 1) diff --git a/scripts/update-orc-dist-files.py b/scripts/update-orc-dist-files.py new file mode 100755 index 0000000000..592d04e6e7 --- /dev/null +++ b/scripts/update-orc-dist-files.py @@ -0,0 +1,49 @@ +#!/usr/bin/env python3 +# +# update-orc-dist-files.py ORC-FILE GENERATED-HEADER GENERATED-SOURCE +# +# Copies generated orc .c and .h files into source dir as -dist.[ch] backups, +# based on location of passed .orc file. +# +# Copyright (C) 2020 Tim-Philipp Müller +# +# This library is free software; you can redistribute it and/or +# modify it under the terms of the GNU Library General Public +# License as published by the Free Software Foundation; either +# version 2 of the License, or (at your option) any later version. +# +# This library is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Library General Public License for more details. +# +# You should have received a copy of the GNU Library General Public +# License along with this library; if not, write to the +# Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, +# Boston, MA 02110-1301, USA. + +import shutil +import subprocess +import sys + +assert(len(sys.argv) == 4) + +orc_file = sys.argv[1] +gen_header = sys.argv[2] +gen_source = sys.argv[3] + +# split off .orc suffix +assert(orc_file.endswith('.orc')) +orc_src_base = sys.argv[1][:-4] + +# figure out names of disted backup files +dist_h = orc_src_base + "-dist.h" +dist_c = orc_src_base + "-dist.c" + +# copy generated files from build dir into source dir +shutil.copyfile(gen_header, dist_h) +shutil.copyfile(gen_source, dist_c) + +# run gst-indent on the .c files (twice, because gnu indent) +subprocess.run(['gst-indent', dist_c]) +subprocess.run(['gst-indent', dist_c])