build: automatically create windows exports file
Subsystems (2)
PATCH 1/1 build: automatically create windows exports file
Rather than having a separate version.map file for linux/BSD and an exports definition file for windows for each library, generate the latter from the former automatically at build time.
--- buildtools/map_to_def.py | 40 ++++++++++++++++++++++++ buildtools/meson.build | 12 ++++--- buildtools/pmdinfogen/meson.build | 7 ++++- lib/librte_kvargs/rte_kvargs_exports.def | 7 ----- lib/meson.build | 14 ++++++--- meson.build | 2 +- 6 files changed, 64 insertions(+), 18 deletions(-) create mode 100644 buildtools/map_to_def.py delete mode 100644 lib/librte_kvargs/rte_kvargs_exports.def
buildtools/map_to_def.py new file +40 -0
@@ -0,0 +1,40 @@ +#!/usr/bin/env python +# SPDX-License-Identifier: BSD-3-Clause +# Copyright(c) 2019 Intel Corporation + +from __future__ import print_function +import sys +from os.path import dirname, basename, join, exists + + +def is_function_line(ln): + return ln.startswith('\t') and ln.endswith(';\n') and ":" not in ln + + +def main(args): + if not args[1].endswith('version.map') or \ + not args[2].endswith('exports.def'): + return 1 + +# special case, allow override if an def file already exists alongside map file + override_file = join(dirname(args[1]), basename(args[2])) + if exists(override_file): + with open(override_file) as f_in: + functions = f_in.readlines() + +# generate def file from map file. +# This works taking indented lines only which end with a ";" and which don't +# have a colon in them, i.e. the lines defining functions only. + else: + with open(args[1]) as f_in: + functions = [ln[:-2] + '\n' for ln in sorted(f_in.readlines()) + if is_function_line(ln)] + functions = ["EXPORTS\n"] + functions + + with open(args[2], 'w') as f_out: + f_out.writelines(functions) + return 0 + + +if __name__ == "__main__": + sys.exit(main(sys.argv))
buildtools/meson.build +8 -4
@@ -1,10 +1,14 @@ # SPDX-License-Identifier: BSD-3-Clause # Copyright(c) 2017-2019 Intel Corporation -if host_machine.system() == 'windows' - subdir_done() -endif - subdir('pmdinfogen') pmdinfo = find_program('gen-pmdinfo-cfile.sh') + +# set up map-to-def script using python, either built-in or external +python3 = import('python').find_installation(required: false) +if python3.found() + map_to_def_cmd = [python3, files('map_to_def.py')] +else + map_to_def_cmd = ['meson', 'runpython', files('map_to_def.py')] +endif
buildtools/pmdinfogen/meson.build +6 -1
@@ -1,7 +1,12 @@ # SPDX-License-Identifier: BSD-3-Clause # Copyright(c) 2017 Intel Corporation -pmdinfogen_inc = eal_inc +if host_machine.system() == 'windows' + subdir_done() +endif + +pmdinfogen_inc = [global_inc] +pmdinfogen_inc += include_directories('../../lib/librte_eal/common/include') pmdinfogen_inc += include_directories('../../lib/librte_pci') pmdinfogen = executable('pmdinfogen', 'pmdinfogen.c',
lib/librte_kvargs/rte_kvargs_exports.def deleted +0 -7
@@ -1,7 +0,0 @@ -EXPORTS - rte_kvargs_count - rte_kvargs_free - rte_kvargs_parse - rte_kvargs_process - rte_kvargs_parse_delim - rte_kvargs_strcmp
lib/meson.build +9 -5
@@ -121,15 +121,19 @@ foreach l:libraries objs += static_lib.extract_all_objects(recursive: false) version_map = '@0@/@1@/rte_@2@_version.map'.format( meson.current_source_dir(), dir_name, name) - exports = [] implib = dir_name + '.dll.a' + + def_file = custom_target(name + '_def', + command: [map_to_def_cmd, '@INPUT@', '@OUTPUT@'], + input: version_map, + output: 'rte_@0@_exports.def'.format(name)) if host_machine.system() == 'windows' - exports = '@0@/@1@/rte_@2@_exports.def'.format( - meson.current_source_dir(), dir_name, name) - lk_args = ['-Wl,/def:' + exports, '-Wl,/implib:lib\\' + implib] + lk_args = ['-Wl,/def:' + def_file.full_path(), + '-Wl,/implib:lib\\' + implib] else lk_args = ['-Wl,--version-script=' + version_map] endif + shared_lib = shared_library(libname, sources, objects: objs,
@@ -137,7 +141,7 @@ foreach l:libraries dependencies: shared_deps, include_directories: includes, link_args: lk_args, - link_depends: [version_map, exports], + link_depends: [version_map, def_file], version: lib_version, soversion: so_version, install: true)
meson.build +1 -1
@@ -31,8 +31,8 @@ global_inc = include_directories('.', 'config', subdir('config') # build libs and drivers -subdir('lib') subdir('buildtools') +subdir('lib') subdir('drivers') # build binaries and installable tools
Signature · 1 line
2.17.0
Quoted 6 lines · Bruce Richardson
Rather than having a separate version.map file for linux/BSD and an exports definition file for windows for each library, generate the latter from the former automatically at build time.
Signed-off-by Bruce Richardson <[email protected]>
Signature · 1 line
Anand Rawat
13/04/2019 00:56, Anand Rawat:
Quoted 8 lines · Bruce Richardson
Quoted 5 lines
Rather than having a separate version.map file for linux/BSD and an exports definition file for windows for each library, generate the latter from the former automatically at build time.
Signed-off-by Bruce Richardson <[email protected]>Acked-by Anand Rawat <[email protected]>
Please apply it in the draft repo for Windows so we can have more feedbacks.
Quoted 6 lines · Thomas Monjalon
13/04/2019 00:56, Anand Rawat:
Quoted 5 lines · Bruce Richardson
Quoted 4 lines
Rather than having a separate version.map file for linux/BSD and an exports definition file for windows for each library, generate the latter from the former automatically at build time.
Quoted 6 lines
Quoted 3 lines
Quoted 1 line
Signed-off-by Bruce Richardson <[email protected]>Acked-by Anand Rawat <[email protected]>Please apply it in the draft repo for Windows so we can have more feedbacks.
Ping on this. Has it already been applied to the draft repo, or is something blocking it?
/Bruce
Thomas Monjalon
Applied12/04/2019 10:29, Bruce Richardson:
Quoted 5 lines
Rather than having a separate version.map file for linux/BSD and an exports definition file for windows for each library, generate the latter from the former automatically at build time.
Signed-off-by Bruce Richardson <[email protected]>
For an unknown reason, this patch was not tested in the Windows draft repo, but I choose to merge in master.
Applied, thanks