[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v2 1/5] build-sys: fix crlf-ending C code
From: |
marcandre . lureau |
Subject: |
[PATCH v2 1/5] build-sys: fix crlf-ending C code |
Date: |
Mon, 9 Jan 2023 22:14:43 +0400 |
From: Marc-André Lureau <marcandre.lureau@redhat.com>
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>
---
meson.build | 2 +-
scripts/shaderinclude.pl | 16 ----------------
scripts/shaderinclude.py | 26 ++++++++++++++++++++++++++
3 files changed, 27 insertions(+), 17 deletions(-)
delete mode 100644 scripts/shaderinclude.pl
create mode 100755 scripts/shaderinclude.py
diff --git a/meson.build b/meson.build
index 175517eafd..b3c6db8343 100644
--- a/meson.build
+++ b/meson.build
@@ -2781,7 +2781,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',
diff --git a/scripts/shaderinclude.pl b/scripts/shaderinclude.pl
deleted file mode 100644
index cd3bb40b12..0000000000
--- a/scripts/shaderinclude.pl
+++ /dev/null
@@ -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;
diff --git a/scripts/shaderinclude.py b/scripts/shaderinclude.py
new file mode 100755
index 0000000000..ab2aade2cd
--- /dev/null
+++ b/scripts/shaderinclude.py
@@ -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))
--
2.39.0