RepoMirrors
/
mpv
mirror of https://github.com/mpv-player/mpv
1
0
Fork 0
Code Issues Releases Wiki Activity

meson: use relative file paths for file2string 

This fixes "Generated from" comments to not include local source path in
generated files.
This commit is contained in:
Kacper Michajłow 2024-09-21 19:21:02 +02:00
parent ff47926d6a
commit 71f2220991
7 changed files with 20 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
TOOLS/file2string.py
View File

@ -22,6 +22,7 @@
# License along with mpv. If not, see <http://www.gnu.org/licenses/>.
#
import os
import sys
def file2string(infilename, infile, outfile):
@ -39,6 +40,6 @@ def file2string(infilename, infile, outfile):
outfile.write('"' + ''.join(conv[c] for c in line) + '"\n')
if __name__ == "__main__":
outfile = open(sys.argv[2], "w")
with open(sys.argv[1], 'rb') as infile:
file2string(sys.argv[1], infile, outfile)
with open(sys.argv[1], 'rb') as infile, open(sys.argv[2], "w") as outfile:
file2string(os.path.relpath(sys.argv[1], sys.argv[3]), infile, outfile)

6
TOOLS/osxbundle/meson.build
View File

@ -1,8 +1,6 @@
input = join_paths(source_root, 'TOOLS', 'osxbundle',
'mpv.app', 'Contents', 'Resources', 'icon.icns')
osxbundle = custom_target('osxbundle',
input: input,
input: join_paths('mpv.app', 'Contents', 'Resources', 'icon.icns'),
output: 'icon.icns.inc',
command: [file2string, '@INPUT@', '@OUTPUT@'],
command: [file2string, '@INPUT@', '@OUTPUT@', '@SOURCE_ROOT@'],
)
sources += osxbundle

8
etc/meson.build
View File

@ -2,9 +2,9 @@ icons = ['16', '32', '64', '128']
foreach size: icons
name = 'mpv-icon-8bit-'+size+'x'+size+'.png'
icon = custom_target(name,
input: join_paths(source_root, 'etc', name),
input: name,
output: name + '.inc',
command: [file2string, '@INPUT@', '@OUTPUT@'],
command: [file2string, '@INPUT@', '@OUTPUT@', '@SOURCE_ROOT@'],
)
sources += icon
endforeach
@ -12,9 +12,9 @@ endforeach
etc_files = ['input.conf', 'builtin.conf']
foreach file: etc_files
etc_file = custom_target(file,
input: join_paths(source_root, 'etc', file),
input: file,
output: file + '.inc',
command: [file2string, '@INPUT@', '@OUTPUT@'],
command: [file2string, '@INPUT@', '@OUTPUT@', '@SOURCE_ROOT@'],
)
sources += etc_file
endforeach

8
input/meson.build
View File

@ -2,9 +2,9 @@ icons = ['16', '32', '64', '128']
foreach size: icons
name = 'mpv-icon-8bit-'+size+'x'+size+'.png'
icon = custom_target(name,
input: join_paths(source_root, 'etc', name),
input: name,
output: name + '.inc',
command: [file2string, '@INPUT@', '@OUTPUT@'],
command: [file2string, '@INPUT@', '@OUTPUT@', '@SOURCE_ROOT@'],
)
sources += icon
endforeach
@ -12,9 +12,9 @@ endforeach
etc_files = ['input.conf', 'builtin.conf']
foreach file: etc_files
etc_file = custom_target(file,
input: join_paths(source_root, 'etc', file),
input: file,
output: file + '.inc',
command: [file2string, '@INPUT@', '@OUTPUT@'],
command: [file2string, '@INPUT@', '@OUTPUT@', '@SOURCE_ROOT@'],
)
sources += etc_file
endforeach

4
player/javascript/meson.build
View File

@ -1,6 +1,6 @@
defaults_js = custom_target('defaults.js',
input: join_paths(source_root, 'player', 'javascript', 'defaults.js'),
input: 'defaults.js',
output: 'defaults.js.inc',
command: [file2string, '@INPUT@', '@OUTPUT@'],
command: [file2string, '@INPUT@', '@OUTPUT@', '@SOURCE_ROOT@'],
)
sources += defaults_js

4
player/lua/meson.build
View File

@ -3,9 +3,9 @@ lua_files = ['defaults.lua', 'assdraw.lua', 'options.lua', 'osc.lua',
'input.lua', 'fzy.lua', 'select.lua']
foreach file: lua_files
lua_file = custom_target(file,
input: join_paths(source_root, 'player', 'lua', file),
input: file,
output: file + '.inc',
command: [file2string, '@INPUT@', '@OUTPUT@'],
command: [file2string, '@INPUT@', '@OUTPUT@', '@SOURCE_ROOT@'],
)
sources += lua_file
endforeach

4
sub/meson.build
View File

@ -1,6 +1,6 @@
osd_font = custom_target('osd_font.otf',
input: join_paths(source_root, 'sub', 'osd_font.otf'),
input: 'osd_font.otf',
output: 'osd_font.otf.inc',
command: [file2string, '@INPUT@', '@OUTPUT@'],
command: [file2string, '@INPUT@', '@OUTPUT@', '@SOURCE_ROOT@'],
)
sources += osd_font