walkero
/
harfbuzz
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[build] No need to pass source directory to gen-hb-version 

The input file is by definition in the source directory, so dirname()
that instead of needing the directory to be passed.

Needed because a follow-up commit will change when this is called, and the
source directory isn't trivially available at that point.
This commit is contained in:
Ross Burton 2020-09-07 17:11:17 +01:00
parent faf09f5466
commit bc1c93fbe0
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/gen-hb-version.py
View File

@ -4,15 +4,15 @@
import os, sys, shutil import os, sys, shutil
if len (sys.argv) < 5: if len (sys.argv) < 4:
sys.exit(__doc__) sys.exit(__doc__)
version = sys.argv[1] version = sys.argv[1]
major, minor, micro = version.split (".") major, minor, micro = version.split (".")
OUTPUT = sys.argv[2] OUTPUT = sys.argv[2]
CURRENT_SOURCE_DIR = sys.argv[3] INPUT = sys.argv[3]
INPUT = sys.argv[4] CURRENT_SOURCE_DIR = os.path.dirname(INPUT)
with open (INPUT, "r", encoding='utf-8') as template: with open (INPUT, "r", encoding='utf-8') as template:
with open (OUTPUT, "wb") as output: with open (OUTPUT, "wb") as output:

2
src/meson.build
View File

@ -286,7 +286,7 @@ custom_target('hb-version.h',
input: 'hb-version.h.in', input: 'hb-version.h.in',
output: 'hb-version.h', output: 'hb-version.h',
command: [find_program('gen-hb-version.py'), meson.project_version(), command: [find_program('gen-hb-version.py'), meson.project_version(),
'@OUTPUT@', '@CURRENT_SOURCE_DIR@', '@INPUT@'], '@OUTPUT@', '@INPUT@'],
) )
ragel = find_program('ragel', required: false) ragel = find_program('ragel', required: false)