diff options
| author | Jussi Pakkanen <jpakkane@gmail.com> | 2020-03-12 23:08:30 +0200 |
|---|---|---|
| committer | Jan-Marek Glogowski <glogow@fbihome.de> | 2021-04-07 16:17:19 +0000 |
| commit | 4bab7a5140ec17f31fe666246b590a10a40bd6cd (patch) | |
| tree | 40aae05b526d34daccb7a1805988102ac53d989d | |
| parent | cf5b19170ae3e7a69512b22410974ee031feb091 (diff) | |
Call svidl directly.
Change-Id: I4912a45287cd1f923fce0863b2e9eb37c623f8d2
| -rwxr-xr-x | basctl/basslots.py | 28 | ||||
| -rw-r--r-- | basctl/meson.build | 22 | ||||
| -rw-r--r-- | starmath/meson.build | 23 | ||||
| -rwxr-xr-x | starmath/smslots.py | 29 |
4 files changed, 27 insertions, 75 deletions
diff --git a/basctl/basslots.py b/basctl/basslots.py deleted file mode 100755 index bded1715b642..000000000000 --- a/basctl/basslots.py +++ /dev/null @@ -1,28 +0,0 @@ -#!/usr/bin/env python3 - -import sys, os, subprocess - -svidl = sys.argv[1] -source_root = sys.argv[2] -build_root = sys.argv[3] -build_dir = sys.argv[4] -input_file = sys.argv[5] -output_file = sys.argv[6] -dep_file = sys.argv[7] - -input_abs = os.path.normpath(os.path.join(build_root, input_file)) -output_abs = os.path.join(build_root, output_file) -dep_abs = os.path.join(build_root, dep_file) - -args = ['-quiet', - '-I' + os.path.join(source_root, 'svx/sdi'), - '-I' + os.path.join(source_root, 'sfx2/sdi'), - '-I' + os.path.join(source_root, 'basctl/sdi'), - '-I' + os.path.join(source_root, 'include'), - '-fx' + os.path.join(source_root, 'basctl/sdi/baside.sdi'), - '-fs' + output_abs, - '-fM' + dep_abs, - '-fm' + os.path.join(build_root, build_dir), - input_abs] - -sys.exit(subprocess.call([svidl] + args)) diff --git a/basctl/meson.build b/basctl/meson.build index 5353f78bb0fa..96f26799873c 100644 --- a/basctl/meson.build +++ b/basctl/meson.build @@ -2,15 +2,19 @@ basslots_hxx = custom_target('basslots', input: ['sdi/basslots.sdi'], output: ['basslots.hxx'], depfile: '@BASENAME@.d', - command: [find_program('basslots.py'), - svidl_bin, - meson.source_root(), - meson.build_root(), - meson.current_build_dir(), - '@INPUT@', - '@OUTPUT@', - '@DEPFILE@', - ]) + command: [svidl_bin, + '-quiet', + '-I' + meson.current_source_dir() + '/sdi', + '-I' + meson.source_root() + '/svx/sdi', + '-I' + meson.source_root() + '/sfx2/sdi', + '-I' + meson.source_root() + '/include', + '-fx' + meson.current_source_dir() + '/sdi/baside.sdi', + '-fs' + meson.build_root() + '/@OUTPUT@', + '-fM' + meson.build_root() + '/@DEPFILE@', + '-fm' + meson.current_build_dir(), + meson.build_root() + '/@INPUT@' + ] +) basctl_lib = shared_library('basctl', 'source/accessibility/accessibledialogcontrolshape.cxx', diff --git a/starmath/meson.build b/starmath/meson.build index b2038bfc5a2a..30e4f354409c 100644 --- a/starmath/meson.build +++ b/starmath/meson.build @@ -2,15 +2,20 @@ smslots_hxx = custom_target('smslots', input: ['sdi/smslots.sdi'], output: ['smslots.hxx'], depfile: '@BASENAME@.d', - command: [find_program('smslots.py'), - svidl_bin, - meson.source_root(), - meson.build_root(), - meson.current_build_dir(), - '@INPUT@', - '@OUTPUT@', - '@DEPFILE@', - ]) + command: [svidl_bin, + '-quiet', + '-I' + meson.current_source_dir() + '/sdi', + '-I' + meson.current_source_dir() + '/inc', + '-I' + meson.source_root() + '/svx/sdi', + '-I' + meson.source_root() + '/sfx2/sdi', + '-I' + meson.source_root() + '/include', + '-fx' + meson.current_source_dir() + '/sdi/smath.sdi', + '-fs' + meson.build_root() + '/@OUTPUT@', + '-fM' + meson.build_root() + '/@DEPFILE@', + '-fm' + meson.current_build_dir(), + meson.build_root() + '/@INPUT@' + ] +) sm_lib = shared_library('smlo', 'source/AccessibleSmElement.cxx', diff --git a/starmath/smslots.py b/starmath/smslots.py deleted file mode 100755 index c3702688b4c6..000000000000 --- a/starmath/smslots.py +++ /dev/null @@ -1,29 +0,0 @@ -#!/usr/bin/env python3 - -import sys, os, subprocess - -svidl = sys.argv[1] -source_root = sys.argv[2] -build_root = sys.argv[3] -build_dir = sys.argv[4] -input_file = sys.argv[5] -output_file = sys.argv[6] -dep_file = sys.argv[7] - -input_abs = os.path.normpath(os.path.join(build_root, input_file)) -output_abs = os.path.join(build_root, output_file) -dep_abs = os.path.join(build_root, dep_file) - -args = ['-quiet', - '-I' + os.path.join(source_root, 'starmath/sdi'), - '-I' + os.path.join(source_root, 'starmath/inc'), - '-I' + os.path.join(source_root, 'svx/sdi'), - '-I' + os.path.join(source_root, 'sfx2/sdi'), - '-I' + os.path.join(source_root, 'include'), - '-fx' + os.path.join(source_root, 'starmath/sdi/smath.sdi'), - '-fs' + output_abs, - '-fM' + dep_abs, - '-fm' + os.path.join(build_root, build_dir), - input_abs] - -sys.exit(subprocess.call([svidl] + args)) |