grg/checkm8_tool
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Make headerize and librarize scripts more reliable with arguments

Browse Source
This commit is contained in:
Gregor Haas
2020-01-13 21:48:06 -05:00
parent 199d67d293
commit 39a932090b
2 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
c8_libpayload/scripts/headerize.py
View File

@@ -9,13 +9,13 @@ if __name__ == '__main__':
lib_names = [] lib_names = []
hdr_dir = os.path.abspath(sys.argv[-1]) hdr_dir = os.path.abspath(sys.argv[-1])
if os.path.isdir(sys.argv[1]): for libarg in sys.argv[1:-1]:
lib_folder = os.path.abspath(sys.argv[1]) if os.path.isdir(libarg):
for lib_fname in os.listdir(lib_folder): lib_folder = os.path.abspath(libarg)
lib_names.append(lib_folder + '/' + lib_fname) for lib_fname in os.listdir(lib_folder):
else: lib_names.append(lib_folder + '/' + lib_fname)
for n in sys.argv[1:-1]: else:
lib_names.append(os.path.abspath(n)) lib_names.append(os.path.abspath(libarg))
header_lines = ['#ifndef CHECKM8_TOOL_LIBPAYLOAD_H\n', header_lines = ['#ifndef CHECKM8_TOOL_LIBPAYLOAD_H\n',
'#define CHECKM8_TOOL_LIBPAYLOAD_H\n', '#define CHECKM8_TOOL_LIBPAYLOAD_H\n',

14
c8_libpayload/scripts/librarize.py
View File

@@ -12,13 +12,13 @@ if __name__ == '__main__':
bin_names = [] bin_names = []
lib_dir = os.path.abspath(sys.argv[-1]) lib_dir = os.path.abspath(sys.argv[-1])
if os.path.isdir(sys.argv[1]): for binarg in sys.argv[1:-1]:
bin_folder = os.path.abspath(sys.argv[1]) if os.path.isdir(binarg):
for bin_fname in os.listdir(bin_folder): bin_folder = os.path.abspath(binarg)
bin_names.append(bin_folder + '/' + bin_fname) for bin_fname in os.listdir(bin_folder):
else: bin_names.append(bin_folder + '/' + bin_fname)
for n in sys.argv[1:-1]: else:
bin_names.append(os.path.abspath(n)) bin_names.append(os.path.abspath(binarg))
source_lines = defaultdict(list) source_lines = defaultdict(list)
for n in bin_names: for n in bin_names: