OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

build-sys: fix crlf-ending C code

Browse Source 
On msys2, the shader-to-C script produces bad C:
./ui/shader/texture-blit-vert.h:2:5: error: missing terminating " character [-Werror]

Fix it by changing the line ending from crlf to lf, and convert the
script to Python (qemu build seems perl-free after that).

Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Acked-by: Thomas Huth <thuth@redhat.com>
Message-Id: <20230110132700.833690-2-marcandre.lureau@redhat.com>
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Message-Id: <20230124180127.1881110-6-alex.bennee@linaro.org>
This commit is contained in:
Marc-André Lureau 2023-01-24 18:00:57 +00:00 committed by Alex Bennée
parent c906e6fbaa
commit e2c4012bc3
3 changed files with 27 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
meson.build
View File

@ -2779,7 +2779,7 @@ config_host_data.set('CONFIG_SLIRP', slirp.found())
genh += configure_file(output: 'config-host.h', configuration: config_host_data)
hxtool = find_program('scripts/hxtool')
shaderinclude = find_program('scripts/shaderinclude.pl')
shaderinclude = find_program('scripts/shaderinclude.py')
qapi_gen = find_program('scripts/qapi-gen.py')
qapi_gen_depends = [ meson.current_source_dir() / 'scripts/qapi/__init__.py',
meson.current_source_dir() / 'scripts/qapi/commands.py',

16
scripts/shaderinclude.pl
View File

@ -1,16 +0,0 @@
#!/usr/bin/env perl
use strict;
use warnings;
my $file = shift;
open FILE, "<", $file or die "open $file: $!";
my $name = $file;
$name =~ s|.*/||;
$name =~ s/[-.]/_/g;
print "static GLchar ${name}_src[] =\n";
while (<FILE>) {
chomp;
printf " \"%s\\n\"\n", $_;
}
print " \"\\n\";\n";
close FILE;

26
scripts/shaderinclude.py Normal file
View File

@ -0,0 +1,26 @@
#!/usr/bin/env python3
#
# Copyright (C) 2023 Red Hat, Inc.
#
# SPDX-License-Identifier: GPL-2.0-or-later
import sys
import os
def main(args):
file_path = args[1]
basename = os.path.basename(file_path)
varname = basename.replace('-', '_').replace('.', '_')
with os.fdopen(sys.stdout.fileno(), "wt", closefd=False, newline='\n') as stdout:
with open(file_path, "r", encoding='utf-8') as file:
print(f'static GLchar {varname}_src[] =', file=stdout)
for line in file:
line = line.rstrip()
print(f' "{line}\\n"', file=stdout)
print(' "\\n";', file=stdout)
if __name__ == '__main__':
sys.exit(main(sys.argv))