Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
meson: add update-orc-dist target
Add target to update backup orc -dist.[ch] files.

Part-of: <https://gitlab.freedesktop.org/gstreamer/gst-plugins-base/-/merge_requests/734>
  • Loading branch information
tp-m committed Jul 4, 2020
1 parent e82eb9d commit 6bb3e01
Show file tree
Hide file tree
Showing 9 changed files with 80 additions and 0 deletions.
1 change: 1 addition & 0 deletions gst-libs/gst/audio/meson.build
Expand Up @@ -86,6 +86,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',
Expand Down
1 change: 1 addition & 0 deletions gst-libs/gst/video/meson.build
Expand Up @@ -116,6 +116,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',
Expand Down
1 change: 1 addition & 0 deletions gst/adder/meson.build
Expand Up @@ -10,6 +10,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',
Expand Down
1 change: 1 addition & 0 deletions gst/audiomixer/meson.build
Expand Up @@ -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',
Expand Down
1 change: 1 addition & 0 deletions gst/compositor/meson.build
Expand Up @@ -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',
Expand Down
1 change: 1 addition & 0 deletions gst/videotestsrc/meson.build
Expand Up @@ -10,6 +10,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',
Expand Down
1 change: 1 addition & 0 deletions gst/volume/meson.build
Expand Up @@ -10,6 +10,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',
Expand Down
24 changes: 24 additions & 0 deletions meson.build
Expand Up @@ -317,6 +317,7 @@ gst_controller_dep = dependency('gstreamer-controller-1.0', version : gst_req,

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'])
Expand Down Expand Up @@ -417,6 +418,29 @@ if find_program('xgettext', required : get_option('nls')).found()
endif
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

# Use core_conf after all subdirs have set values
configure_file(output : 'config.h', configuration : core_conf)

Expand Down
49 changes: 49 additions & 0 deletions 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 <tim centricular com>
#
# 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])

0 comments on commit 6bb3e01

Please sign in to comment.