diff options
author | Michael Dickens <michael.dickens@ettus.com> | 2019-11-26 13:39:31 -0500 |
---|---|---|
committer | Brent Stapleton <brent.stapleton@ettus.com> | 2020-01-15 14:06:10 -0800 |
commit | 427b564a743acc3c645bda1007d9d41405397cf2 (patch) | |
tree | 2658affa0fcac1d85a245ff0a2015ce79259e764 /host/lib | |
parent | 56361424b027b55b9c8a32ed9fe84423d01acbef (diff) | |
download | uhd-427b564a743acc3c645bda1007d9d41405397cf2.tar.gz uhd-427b564a743acc3c645bda1007d9d41405397cf2.tar.bz2 uhd-427b564a743acc3c645bda1007d9d41405397cf2.zip |
nirio: use `realpath` instead of `relpath`
The latter causes issues with some builds using `/tmp` as the build directory.
Ref: https://github.com/EttusResearch/uhddev/commit/9517de45709adaea8b574011573a565007149d5d
This commit changed these from `abspath` to `relpath` for Windows needs.
Trying `realpath` as an alternative to both of those.
Diffstat (limited to 'host/lib')
-rwxr-xr-x | host/lib/transport/nirio/lvbitx/process-lvbitx.py | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/host/lib/transport/nirio/lvbitx/process-lvbitx.py b/host/lib/transport/nirio/lvbitx/process-lvbitx.py index 5a4f0afa3..dfa94bb59 100755 --- a/host/lib/transport/nirio/lvbitx/process-lvbitx.py +++ b/host/lib/transport/nirio/lvbitx/process-lvbitx.py @@ -29,14 +29,14 @@ if (len(args) < 1): sys.exit(1) lvbitx_filename = args[0] -input_filename = os.path.relpath(lvbitx_filename) -autogen_src_path = os.path.relpath(options.output_src_path) if (options.output_src_path is not None) else os.path.dirname(input_filename) +input_filename = os.path.realpath(lvbitx_filename) +autogen_src_path = os.path.realpath(options.output_src_path) if (options.output_src_path is not None) else os.path.dirname(input_filename) class_name = os.path.splitext(os.path.basename(input_filename))[0] if (not os.path.isfile(input_filename)): print('ERROR: FPGA File ' + input_filename + ' could not be accessed or is not a file.') sys.exit(1) -if (options.merge_bin is not None and not os.path.isfile(os.path.relpath(options.merge_bin))): +if (options.merge_bin is not None and not os.path.isfile(os.path.realpath(options.merge_bin))): print('ERROR: FPGA Bin File ' + options.merge_bin + ' could not be accessed or is not a file.') sys.exit(1) if (not os.path.exists(autogen_src_path)): @@ -161,7 +161,7 @@ codegen_transform['in_fifo_list'] = in_fifo_list # Merge bitstream into LVBITX if (options.merge_bin is not None): - with open(os.path.relpath(options.merge_bin), 'rb') as bin_file: + with open(os.path.realpath(options.merge_bin), 'rb') as bin_file: bitstream = bin_file.read() bitstream_md5 = hashlib.md5(bitstream).hexdigest() bitstream_b64 = base64.b64encode(bitstream) @@ -189,12 +189,12 @@ if (options.output_lvbitx_path is not None): tree.write(os.path.join(options.output_lvbitx_path, class_name + '_fpga.lvbitx'), encoding="utf-8", xml_declaration=True, default_namespace=None, method="xml") # Save HPP and CPP -with open(os.path.join(os.path.dirname(os.path.relpath(__file__)), 'template_lvbitx.hpp'), 'r') as template_file: +with open(os.path.join(os.path.dirname(os.path.realpath(__file__)), 'template_lvbitx.hpp'), 'r') as template_file: template_string = template_file.read() with open(os.path.join(autogen_src_path, class_name + '_lvbitx.hpp'), 'w') as source_file: source_file.write(template_string.format(**codegen_transform)) -with open(os.path.join(os.path.dirname(os.path.relpath(__file__)), 'template_lvbitx.cpp'), 'r') as template_file: +with open(os.path.join(os.path.dirname(os.path.realpath(__file__)), 'template_lvbitx.cpp'), 'r') as template_file: template_string = template_file.read() with open(os.path.join(autogen_src_path, class_name + '_lvbitx.cpp'), 'w') as source_file: source_file.write(template_string.format(**codegen_transform)) |