[v2,3/4] buildtools: support object file extraction for Windows
Checks
Commit Message
clang archiver tool is llvm-ar on Windows and ar on other platforms.
MinGW always uses ar. Replace shell script (Unix-only) that calls ar
with a Python script (OS-independent) that calls an appropriate archiver
tool selected at configuration time. Move the logic not to generate
empty sources into pmdinfogen.
Signed-off-by: Dmitry Kozlyuk <dmitry.kozliuk@gmail.com>
---
buildtools/gen-pmdinfo-cfile.py | 19 +++++++++++++++++++
buildtools/gen-pmdinfo-cfile.sh | 14 --------------
buildtools/meson.build | 10 ++++++++--
buildtools/pmdinfogen.py | 7 +++++++
4 files changed, 34 insertions(+), 16 deletions(-)
create mode 100644 buildtools/gen-pmdinfo-cfile.py
delete mode 100755 buildtools/gen-pmdinfo-cfile.sh
Comments
08/01/2021 03:47, Dmitry Kozlyuk:
> --- /dev/null
> +++ b/buildtools/gen-pmdinfo-cfile.py
[...]
> +with tempfile.TemporaryDirectory() as temp:
> + proc = subprocess.run(
> + # Don't use "ar p", because its output is corrupted on Windows.
> + [ar, "xv", os.path.abspath(archive)], capture_output=True, check=True, cwd=temp
> + )
Not sure where is this temp file.
Please can you make sure it created inside the build directory?
It can be a follow-up patch, thanks.
new file mode 100644
@@ -0,0 +1,19 @@
+#!/usr/bin/env python3
+# SPDX-License-Identifier: BSD-3-Clause
+# Copyright (c) 2020 Dmitry Kozlyuk <dmitry.kozliuk@gmail.com>
+
+import os
+import subprocess
+import sys
+import tempfile
+
+_, ar, archive, output, *pmdinfogen = sys.argv
+with tempfile.TemporaryDirectory() as temp:
+ proc = subprocess.run(
+ # Don't use "ar p", because its output is corrupted on Windows.
+ [ar, "xv", os.path.abspath(archive)], capture_output=True, check=True, cwd=temp
+ )
+ lines = proc.stdout.decode().splitlines()
+ names = [line[len("x - ") :] for line in lines]
+ paths = [os.path.join(temp, name) for name in names]
+ subprocess.run(pmdinfogen + paths + [output], check=True)
deleted file mode 100755
@@ -1,14 +0,0 @@
-#! /bin/sh
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright(c) 2017 Intel Corporation
-
-arfile=$1
-output=$2
-shift 2
-pmdinfogen=$*
-
-# The generated file must not be empty if compiled in pedantic mode
-echo 'static __attribute__((unused)) const char *generator = "'$0'";' > $output
-for ofile in `ar t $arfile` ; do
- ar p $arfile $ofile | $pmdinfogen - - >> $output
-done
@@ -2,7 +2,6 @@
# Copyright(c) 2017-2019 Intel Corporation
pkgconf = find_program('pkg-config', 'pkgconf', required: false)
-pmdinfo = find_program('gen-pmdinfo-cfile.sh')
list_dir_globs = find_program('list-dir-globs.py')
check_symbols = find_program('check-symbols.sh')
ldflags_ibverbs_static = find_program('options-ibverbs-static.sh')
@@ -18,11 +17,18 @@ endif
map_to_win_cmd = py3 + files('map_to_win.py')
sphinx_wrapper = py3 + files('call-sphinx-build.py')
-# select object file format
+# select library and object file format
+pmdinfo = py3 + files('gen-pmdinfo-cfile.py')
pmdinfogen = py3 + files('pmdinfogen.py')
if host_machine.system() == 'windows'
+ if cc.get_id() == 'gcc'
+ pmdinfo += 'ar'
+ else
+ pmdinfo += 'llvm-ar'
+ endif
pmdinfogen += 'coff'
else
+ pmdinfo += 'ar'
pmdinfogen += 'elf'
endif
@@ -233,6 +233,12 @@ def open_output(path):
return open(path, "w")
+def write_header(output):
+ output.write(
+ "static __attribute__((unused)) const char *generator = \"%s\";\n" % sys.argv[0]
+ )
+
+
def main():
args = parse_args()
if args.input.count('-') > 1:
@@ -241,6 +247,7 @@ def main():
raise Exception("elftools module not found")
output = open_output(args.output)
+ write_header(output)
for path in args.input:
image = load_image(args.format, path)
drivers = load_drivers(image)